SWDEV-291455 - File Reorganization with backward compatibility (#2555)

Related changes for HIP installation in /opt/rocm
Setting HIP_PATH and ROCM_PATH
Setting INTERFACE directories

Depends-On: If70b61020fa3ee85bf49171c842837da05191a48
Change-Id: I30adccf7e6241dae12270156602d4b033ea99d93
Цей коміт міститься в:
ROCm CI Service Account authored and GitHub committed 2022-03-17 15:35:13 -07:00
1 джерело fe08dc841f
коміт a296100da7
3 files changed
+40 -12

No files matched your search

+21 -4
Переглянути файл
@@ -59,6 +59,7 @@ if(NOT APPLE)
HIP_ROOT_DIR
NAMES bin/hipconfig
PATHS
"$ENV{ROCM_PATH}"
"$ENV{ROCM_PATH}/hip"
ENV HIP_PATH
${_IMPORT_PREFIX}
@@ -241,9 +242,17 @@ elseif("${HIP_COMPILER}" STREQUAL "clang")
elseif(DEFINED ENV{ROCM_PATH})
set(HIP_CLANG_PATH "$ENV{ROCM_PATH}/llvm/bin")
elseif(DEFINED ENV{HIP_PATH})
set(HIP_CLANG_PATH "$ENV{HIP_PATH}/../llvm/bin")
if(EXISTS "$ENV{HIP_PATH}/llvm/bin") #File Reorg backward compatibility
set(HIP_CLANG_PATH "$ENV{HIP_PATH}/llvm/bin")
else()
set(HIP_CLANG_PATH "$ENV{HIP_PATH}/../llvm/bin")
endif()
elseif(DEFINED HIP_PATH)
set(HIP_CLANG_PATH "${HIP_PATH}/../llvm/bin")
if(EXISTS "${HIP_PATH}/llvm/bin") #File Reorg backward compatibility
set(HIP_CLANG_PATH "${HIP_PATH}/llvm/bin")
else()
set(HIP_CLANG_PATH "${HIP_PATH}/../llvm/bin")
endif()
else()
set(HIP_CLANG_PATH "/opt/rocm/llvm/bin")
endif()
@@ -660,9 +669,17 @@ macro(HIP_ADD_EXECUTABLE hip_target)
elseif(DEFINED ENV{ROCM_PATH})
set(HIP_CLANG_PATH "$ENV{ROCM_PATH}/llvm/bin")
elseif(DEFINED ENV{HIP_PATH})
set(HIP_CLANG_PATH "$ENV{HIP_PATH}/../llvm/bin")
if(EXISTS "$ENV{HIP_PATH}/llvm/bin") #file reorg backward compatibility
set(HIP_CLANG_PATH "$ENV{HIP_PATH}/llvm/bin")
else()
set(HIP_CLANG_PATH "$ENV{HIP_PATH}/../llvm/bin")
endif()
elseif(DEFINED HIP_PATH)
set(HIP_CLANG_PATH "${HIP_PATH}/../llvm/bin")
if(EXISTS "${HIP_PATH}/llvm/bin") #file reorg backward compatibility
set(HIP_CLANG_PATH "${HIP_PATH}/llvm/bin")
else()
set(HIP_CLANG_PATH "${HIP_PATH}/../llvm/bin")
endif()
else()
set(HIP_CLANG_PATH "/opt/rocm/llvm/bin")
endif()