From 3f8a07e4603fdbc4cb57ab23726811fc78bf3501 Mon Sep 17 00:00:00 2001 From: Pruthvi Madugundu Date: Tue, 17 Sep 2019 18:11:50 -0400 Subject: [PATCH] support installtion of multiple ROCM version Changes to resolve 1) Multiple rocm release installation support 2) Multiple rocm shared lib conflicts Change-Id: I792feb36cdf4516d108f1ef71abe0c87522f018a Signed-off-by: Pruthvi Madugundu Signed-off-by: Freddy Paul --- CMakeLists.txt | 6 +++++- tests/kfdtest/CMakeLists.txt | 13 ++++++++++--- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3e4b5b3b38..e324c08a11 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -61,7 +61,11 @@ set ( BUILD_VERSION_PATCH ${VERSION_PATCH} ) set ( LIB_VERSION_MAJOR 1) set ( LIB_VERSION_MINOR 0) -set ( LIB_VERSION_PATCH 6) +if (${ROCM_PATCH_VERSION}) + set ( LIB_VERSION_PATCH ${ROCM_PATCH_VERSION} ) +else () + set ( LIB_VERSION_PATCH 6) +endif () set ( LIB_VERSION_STRING "${LIB_VERSION_MAJOR}.${LIB_VERSION_MINOR}.${LIB_VERSION_PATCH}" ) if ( DEFINED VERSION_BUILD AND NOT ${VERSION_BUILD} STREQUAL "" ) diff --git a/tests/kfdtest/CMakeLists.txt b/tests/kfdtest/CMakeLists.txt index 3d56abf132..0fddb38617 100644 --- a/tests/kfdtest/CMakeLists.txt +++ b/tests/kfdtest/CMakeLists.txt @@ -52,10 +52,17 @@ if( DEFINED ENV{LIBHSAKMT_PATH} ) set ( LIBHSAKMT_PATH $ENV{LIBHSAKMT_PATH} ) message ( "LIBHSAKMT_PATH environment variable is set" ) else() - set ( ENV{PKG_CONFIG_PATH} /opt/rocm/libhsakmt/ ) - pkg_check_modules(HSAKMT libhsakmt) + if ( ${ROCM_INSTALL_PATH} ) + set ( ENV{PKG_CONFIG_PATH} ${ROCM_INSTALL_PATH} ) + pkg_check_modules(HSAKMT libhsakmt) + else() + set ( ENV{PKG_CONFIG_PATH} /opt/rocm/libhsakmt/ ) + pkg_check_modules(HSAKMT libhsakmt) + endif() if( NOT HSAKMT_FOUND ) - set ( LIBHSAKMT_PATH $ENV{OUT_DIR} ) + set ( ENV{PKG_CONFIG_PATH} /opt/rocm/libhsakmt/ ) + pkg_check_modules(HSAKMT libhsakmt) + set ( LIBHSAKMT_PATH $ENV{OUT_DIR} ) endif() endif()