From 8242bb8030fa028ab8b25ebeb8b3f1ea601a3a86 Mon Sep 17 00:00:00 2001 From: foreman Date: Mon, 9 Sep 2019 16:53:40 -0400 Subject: [PATCH] P4 to Git Change 1995735 by kzhuravl@kzhuravl-spot-ocl on 2019/09/09 16:41:36 SWDEV-200937 - use consistent name for comgr - Linux: libamd_comgr.so , libamd_comgr32.so - Windows: amd_comgr.dll, amd_comgr32.dll Review: http://ocltc.amd.com/reviews/r/17952/ Testing: http://ocltc:8111/viewModification.html?modId=125795&personal=true&init=1&tab=vcsModificationBuilds Affected files ... ... //depot/stg/opencl/drivers/opencl/api/hip/build/Makefile.hip#19 edit ... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/build/Makefile.api#186 edit ... //depot/stg/opencl/drivers/opencl/make/comgr.git/lib/comgr/build/Makefile.comgr#4 edit ... //depot/stg/opencl/drivers/opencl/packages/pkgdefs#10 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/comgrctx.cpp#5 edit --- rocclr/runtime/device/comgrctx.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rocclr/runtime/device/comgrctx.cpp b/rocclr/runtime/device/comgrctx.cpp index 6edcfc1725..384237b29e 100644 --- a/rocclr/runtime/device/comgrctx.cpp +++ b/rocclr/runtime/device/comgrctx.cpp @@ -15,8 +15,8 @@ bool Comgr::LoadLib() { #if defined(COMGR_DYN_DLL) LogInfo("Loading COMGR library."); static const char* ComgrLibName = - LP64_SWITCH(WINDOWS_SWITCH("amdcomgr.dll", "libamdcomgr32.so"), - WINDOWS_SWITCH("amdcomgr64.dll", "libamdcomgr64.so")); + LP64_SWITCH(WINDOWS_SWITCH("amd_comgr32.dll", "libamd_comgr32.so"), + WINDOWS_SWITCH("amd_comgr.dll", "libamd_comgr.so")); cep_.handle = Os::loadLibrary(ComgrLibName); if (nullptr == cep_.handle) { return false;