AI/rocm-systems
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SWDEV-346857 - Removed hard coded path /opt/rocm (#2839)

Browse Source 
As per the requirements in SWDEV-287540 ,config files should not have hard coded path /opt/rocm.
Removed the same
Also handled the case where ROCM_PATH is defined and not set in ENV. Earlier this condition was getting handled in default case

Change-Id: I9b28c4208175be61bc7c90c1fe2885fd299c5536


[ROCm/hip commit: 357186bf9e]
This commit is contained in:
ROCm CI Service Account
2022-08-03 23:45:15 +05:30
committed by GitHub
parent 9d242d1f8f
commit d65246a08e
2 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/hip/cmake/FindHIP.cmake
+8 -9
View File
@@ -63,7 +63,6 @@ if(NOT APPLE)
"$ENV{ROCM_PATH}/hip"
ENV HIP_PATH
${_IMPORT_PREFIX}
/opt/rocm/hip
DOC "HIP installed location"
NO_DEFAULT_PATH
)
@@ -86,8 +85,6 @@ if(NOT APPLE)
"${HIP_ROOT_DIR}"
ENV ROCM_PATH
ENV HIP_PATH
/opt/rocm
/opt/rocm/hip
PATH_SUFFIXES bin
NO_DEFAULT_PATH
)
@@ -104,8 +101,6 @@ if(NOT APPLE)
"${HIP_ROOT_DIR}"
ENV ROCM_PATH
ENV HIP_PATH
/opt/rocm
/opt/rocm/hip
PATH_SUFFIXES bin
NO_DEFAULT_PATH
)
@@ -128,8 +123,6 @@ if(NOT APPLE)
"${HIP_ROOT_DIR}"
ENV ROCM_PATH
ENV HIP_PATH
/opt/rocm
/opt/rocm/hip
PATH_SUFFIXES bin
NO_DEFAULT_PATH
)
@@ -253,8 +246,11 @@ elseif("${HIP_COMPILER}" STREQUAL "clang")
else()
set(HIP_CLANG_PATH "${HIP_PATH}/../llvm/bin")
endif()
# Handle the case where ROCM_PATH is defined and not set in ENV
elseif(DEFINED ROCM_PATH)
set(HIP_CLANG_PATH "${ROCM_PATH}/llvm/bin")
else()
set(HIP_CLANG_PATH "/opt/rocm/llvm/bin")
message(FATAL_ERROR "Unable to find the clang compiler path. Set ROCM_PATH or HIP_PATH in env ")
endif()
endif()
#Number of parallel jobs by default is 1
@@ -680,8 +676,11 @@ macro(HIP_ADD_EXECUTABLE hip_target)
else()
set(HIP_CLANG_PATH "${HIP_PATH}/../llvm/bin")
endif()
# Handle the case where ROCM_PATH is defined and not set in ENV
elseif(DEFINED ROCM_PATH)
set(HIP_CLANG_PATH "${ROCM_PATH}/llvm/bin")
else()
set(HIP_CLANG_PATH "/opt/rocm/llvm/bin")
message(FATAL_ERROR "Unable to find the clang compiler path. Set ROCM_PATH or HIP_PATH in env")
endif()
endif()
set(CMAKE_HIP_LINK_EXECUTABLE "${HIP_HIPCC_CMAKE_LINKER_HELPER} ${HIP_CLANG_PATH} ${HIP_CLANG_PARALLEL_BUILD_LINK_OPTIONS} <FLAGS> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>")