P4 to Git Change 1720181 by gandryey@gera-w8 on 2018/12/13 16:49:07

SWDEV-79445 - COMGR update
	- Use full names for dll/lib load, since not all paths in loadLibrary() can recognize short names.

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/comgrctx.cpp#2 edit


[ROCm/clr commit: 4220039a82]

projects/clr/rocclr/runtime/device/comgrctx.cpp

@@ -12,7 +12,9 @@ bool Comgr::is_ready_ = false;
 
 bool Comgr::LoadLib() {
 #if defined(COMGR_DYN_DLL)
-  static const char* ComgrLibName = LP64_SWITCH(WINDOWS_SWITCH("amdcomgr", "amdcomgr32"), "amdcomgr64");
+  static const char* ComgrLibName =
+    LP64_SWITCH(WINDOWS_SWITCH("amdcomgr.dll", "libamdcomgr32.so"),
+                WINDOWS_SWITCH("amdcomgr64.dll", "libamdcomgr64.so"));
   cep_.handle = Os::loadLibrary(ComgrLibName);
   if (nullptr == cep_.handle) {
     return false;