From a46240638826c495ea01a0285aa9e2bc91c8ccbe Mon Sep 17 00:00:00 2001 From: AravindanC Date: Tue, 27 Feb 2024 08:43:40 -0800 Subject: [PATCH] SWDEV-354543 Remove explicit install permission, Enhanced comments Change-Id: Ie7a3b5b026666d65056e426eb7fa9c184a46eb07 [ROCm/rocm-core commit: c9058d2442442598b683563ae298d9c621f9125f] --- projects/rocm-core/CMakeLists.txt | 1 - projects/rocm-core/rocm_getpath.cpp | 5 +++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/projects/rocm-core/CMakeLists.txt b/projects/rocm-core/CMakeLists.txt index 35ec1229e3..e00ab5bc44 100644 --- a/projects/rocm-core/CMakeLists.txt +++ b/projects/rocm-core/CMakeLists.txt @@ -123,7 +123,6 @@ endif() file ( WRITE "${CMAKE_CURRENT_BINARY_DIR}/version" "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}-${BUILD_ID}\n" ) install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/version DESTINATION .info COMPONENT runtime ) install ( TARGETS ${CORE_TARGET} DESTINATION ${CMAKE_INSTALL_LIBDIR} - PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE COMPONENT ${COMP_TYPE} ) install ( FILES ${BUILD_DIR}/rocm_version.h ${BUILD_DIR}/rocm_getpath.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/rocm-core diff --git a/projects/rocm-core/rocm_getpath.cpp b/projects/rocm-core/rocm_getpath.cpp index 52f2fdcdee..d314c6a225 100644 --- a/projects/rocm-core/rocm_getpath.cpp +++ b/projects/rocm-core/rocm_getpath.cpp @@ -99,6 +99,8 @@ static int getROCmBase(char *buf) char libFileName[LIBRARY_FILENAME_BUFSZ]; char *end=NULL; + // Check Environment Variable is set for ROCM + // install base path, then use it directly. if ((envStr = getenv("ROCM_PATH"))) { /* User space override, essentially just copied through as long as it is not too long */ len = strlen(envStr); @@ -119,6 +121,9 @@ static int getROCmBase(char *buf) } } + // If Environment Variable is not set + // use dl APIs to get target lib path + // and get rocm base install path using the lib Path. sprintf(libFileName, "lib%s.so", TARGET_LIBRARY_NAME); void *handle=dlopen(libFileName,RTLD_NOW); if (!handle){