From ada1208679f4e8cbf71ded38cee6b3c5d707ef36 Mon Sep 17 00:00:00 2001 From: foreman Date: Thu, 6 Apr 2017 18:29:35 -0400 Subject: [PATCH] P4 to Git Change 1395358 by gandryey@gera-w8 on 2017/04/06 18:05:03 SWDEV-118182 - OpenCL runtime picks up wrong DLL if AMD APP SDK is installed - Add driver store path to the dll name Affected files ... ... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudevice.cpp#565 edit [ROCm/clr commit: 8a7b55e9d22c810148398ed572d45d3b8697c739] --- projects/clr/rocclr/runtime/device/gpu/gpudevice.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/projects/clr/rocclr/runtime/device/gpu/gpudevice.cpp b/projects/clr/rocclr/runtime/device/gpu/gpudevice.cpp index b061ae9df2..bd5f285c2c 100644 --- a/projects/clr/rocclr/runtime/device/gpu/gpudevice.cpp +++ b/projects/clr/rocclr/runtime/device/gpu/gpudevice.cpp @@ -183,6 +183,7 @@ NullDevice::create(CALtarget target) if (NULL == compiler_) { #if !defined(ATI_OS_LINUX) char CompilerLibrary[220] = ""; + strcpy_s(CompilerLibrary, calAttr.driverStore); strcat_s(CompilerLibrary, "amdocl12cl" LP64_SWITCH("", "64") ".dll"); #endif const char *library = getenv("COMPILER_LIBRARY"); @@ -977,6 +978,7 @@ Device::create(CALuint ordinal, CALuint numOfDevices) if (NULL == compiler_) { #if !defined(ATI_OS_LINUX) char CompilerLibrary[220] = ""; + strcpy_s(CompilerLibrary, getAttribs().driverStore); strcat_s(CompilerLibrary, "amdocl12cl" LP64_SWITCH("", "64") ".dll"); #endif