AI/rocm-systems
2
0
Garpu 0
Kode Masalah Tarik Permintaan Actions Packages Projects Rilis Wiki Kegiatan

SWDEV-354905 - prioritize -DROCM_PATH over env{ROCM_PATH} in hip tests (#3055)

Telusuri Sumber 
Change-Id: I943bc705641ceccda95b409d13b4e757c4e5ab23


[ROCm/hip commit: a9e9d9f996]
This commit is contained in:
ROCm CI Service Account
2022-11-05 05:44:41 +05:30
committed by GitHub
orang tua 473ad7a867
melakukan 988d616c1e
1 mengubah file dengan 5 tambahan dan 2 penghapusan
Download Patch File Download Diff File Expand all files Collapse all files
projects/hip/tests/catch/CMakeLists.txt
+5 -2
Melihat File
@@ -57,13 +57,16 @@ else()
# Set both compilers else windows cmake complains of mismatch # Set both compilers else windows cmake complains of mismatch
cmake_path(SET CMAKE_CXX_COMPILER "${HIP_PATH}/bin/hipcc.bat") cmake_path(SET CMAKE_CXX_COMPILER "${HIP_PATH}/bin/hipcc.bat")
cmake_path(SET CMAKE_C_COMPILER "${HIP_PATH}/bin/hipcc.bat") cmake_path(SET CMAKE_C_COMPILER "${HIP_PATH}/bin/hipcc.bat")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --rocm-path=${ROCM_PATH}")
set(HIPCONFIG_EXECUTABLE "${HIP_PATH}/bin/hipconfig.bat") set(HIPCONFIG_EXECUTABLE "${HIP_PATH}/bin/hipconfig.bat")
execute_process(COMMAND ${HIPCONFIG_EXECUTABLE} --version execute_process(COMMAND ${HIPCONFIG_EXECUTABLE} --version
OUTPUT_VARIABLE HIP_VERSION OUTPUT_VARIABLE HIP_VERSION
OUTPUT_STRIP_TRAILING_WHITESPACE) OUTPUT_STRIP_TRAILING_WHITESPACE)
endif() endif()
# enforce c++17 for all tests if(HIP_PLATFORM STREQUAL "amd")
# prioritize -DROCM_PATH over env{ROCM_PATH} for amd platform only
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --rocm-path=${ROCM_PATH}")
endif()
# enforce c++17
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++17") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++17")
string(REPLACE "." ";" VERSION_LIST ${HIP_VERSION}) string(REPLACE "." ";" VERSION_LIST ${HIP_VERSION})