AI/rocm-systems
2
0
Forkuj 0
Kod Zgłoszenia Oczekujące zmiany Actions Packages Projekty Wydania Wiki Aktywność

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

Przeglądaj źródła 
Related changes for HIP installation in /opt/rocm
Setting HIP_PATH and ROCM_PATH
Setting INTERFACE directories

Depends-On: If70b61020fa3ee85bf49171c842837da05191a48
Change-Id: I30adccf7e6241dae12270156602d4b033ea99d93
This commit is contained in:
ROCm CI Service Account
2022-03-18 04:05:13 +05:30
zatwierdzone przez GitHub
rodzic fe08dc841f
commit a296100da7
3 zmienionych plików z 40 dodań i 12 usunięć
Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files
cmake/FindHIP.cmake
+21 -4
Wyświetl plik
@@ -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()