From 5ed4fa6c2868605c65211978db95550a81755f43 Mon Sep 17 00:00:00 2001 From: Freddy Paul Date: Mon, 27 Sep 2021 07:29:56 -0700 Subject: [PATCH] SWDEV-304500 - OpenCL tests are failed for Ubuntu 20.04.3 As part of the stack unification some of the application using opencl seem to depend on libopencl.so provided from thirdparty providers. For libopencl.so from thirdparty provider to find libamdocl.so ldconfig path to {opencl install path}/lib is required Change-Id: I8e12e463209a44177ee433644c75ef0781f1da2f [ROCm/clr commit: b4b83e274e5ba43a51d181658f9240d7bfc097f7] --- projects/clr/opencl/packaging/rocm-opencl.postinst | 2 +- projects/clr/opencl/packaging/rocm-opencl.rpm_post | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/clr/opencl/packaging/rocm-opencl.postinst b/projects/clr/opencl/packaging/rocm-opencl.postinst index b76ed1a888..c304ac4a28 100644 --- a/projects/clr/opencl/packaging/rocm-opencl.postinst +++ b/projects/clr/opencl/packaging/rocm-opencl.postinst @@ -6,7 +6,7 @@ INSTALL_PATH=@CPACK_PACKAGING_INSTALL_PREFIX@ ROCM_LIBPATH=@ROCM_PATH@/lib do_ldconfig() { - echo ${ROCM_LIBPATH} > /etc/ld.so.conf.d/x86_64-rocm-opencl.conf && ldconfig + echo ${INSTALL_PATH}/lib > /etc/ld.so.conf.d/x86_64-rocm-opencl.conf && ldconfig mkdir -p /etc/OpenCL/vendors && (echo libamdocl64.so > /etc/OpenCL/vendors/@OPENCL_AMD_ICD_FILE@) } diff --git a/projects/clr/opencl/packaging/rocm-opencl.rpm_post b/projects/clr/opencl/packaging/rocm-opencl.rpm_post index b9a98fb932..250b248403 100644 --- a/projects/clr/opencl/packaging/rocm-opencl.rpm_post +++ b/projects/clr/opencl/packaging/rocm-opencl.rpm_post @@ -1,7 +1,7 @@ INSTALL_PATH=@CPACK_PACKAGING_INSTALL_PREFIX@ ROCM_LIBPATH=@ROCM_PATH@/lib -echo ${ROCM_LIBPATH} > /etc/ld.so.conf.d/x86_64-rocm-opencl.conf && ldconfig +echo ${INSTALL_PATH}/lib > /etc/ld.so.conf.d/x86_64-rocm-opencl.conf && ldconfig mkdir -p /etc/OpenCL/vendors && (echo libamdocl64.so > /etc/OpenCL/vendors/@OPENCL_AMD_ICD_FILE@) mkdir -p ${ROCM_LIBPATH}