SWDEV-327563 - Windows: enable deviceLib catch tests (#2642)
Change-Id: I10094c31d0f51c311618ecdc193e7411316d00ef
[ROCm/hip commit: 117ec319ae]
This commit is contained in:
zatwierdzone przez
GitHub
rodzic
e92502c471
commit
5725d45c5a
@@ -30,6 +30,20 @@ if(NOT DEFINED HIP_PATH)
|
||||
endif()
|
||||
message(STATUS "HIP Path: ${HIP_PATH}")
|
||||
|
||||
# Set ROCM Path
|
||||
if(NOT DEFINED ROCM_PATH)
|
||||
if(DEFINED ENV{ROCM_PATH})
|
||||
set(ROCM_PATH $ENV{ROCM_PATH} CACHE STRING "ROCM Path")
|
||||
else()
|
||||
cmake_path(GET HIP_PATH PARENT_PATH ROCM_PATH)
|
||||
if (NOT EXISTS "${ROCM_PATH}/bin/rocm_agent_enumerator")
|
||||
set(ROCM_PATH "/opt/rocm/")
|
||||
endif()
|
||||
endif()
|
||||
endif()
|
||||
message(STATUS "ROCM Path: ${ROCM_PATH}")
|
||||
|
||||
|
||||
if(UNIX)
|
||||
set(CMAKE_CXX_COMPILER "${HIP_PATH}/bin/hipcc")
|
||||
set(CMAKE_C_COMPILER "${HIP_PATH}/bin/hipcc")
|
||||
|
||||
@@ -21,8 +21,9 @@
|
||||
# build fails in windows
|
||||
if (UNIX)
|
||||
add_subdirectory(rtc)
|
||||
add_subdirectory(deviceLib)
|
||||
endif()
|
||||
|
||||
add_subdirectory(deviceLib)
|
||||
add_subdirectory(graph)
|
||||
add_subdirectory(memory)
|
||||
add_subdirectory(stream)
|
||||
|
||||
@@ -50,7 +50,13 @@ set(AMD_ARCH_SPEC_TEST_SRC
|
||||
)
|
||||
|
||||
if(HIP_PLATFORM MATCHES "amd")
|
||||
string(FIND ${OFFLOAD_ARCH_STR} "gfx90a" ARCH_CHECK)
|
||||
if (DEFINED OFFLOAD_ARCH_STR)
|
||||
string(FIND ${OFFLOAD_ARCH_STR} "gfx90a" ARCH_CHECK)
|
||||
elseif(DEFINED $ENV{HCC_AMDGPU_TARGET})
|
||||
string(FIND $ENV{HCC_AMDGPU_TARGET} "gfx90a" ARCH_CHECK)
|
||||
else()
|
||||
set(ARCH_CHECK -1)
|
||||
endif()
|
||||
set(TEST_SRC ${TEST_SRC} ${AMD_TEST_SRC})
|
||||
set_source_files_properties(floatTM.cc PROPERTIES COMPILE_FLAGS -std=c++17)
|
||||
if(${ARCH_CHECK} GREATER_EQUAL 0)
|
||||
@@ -70,7 +76,8 @@ if(${ARCH_CHECK} GREATER_EQUAL 0)
|
||||
endif()
|
||||
hip_add_exe_to_target(NAME UnitDeviceTests
|
||||
TEST_SRC ${TEST_SRC}
|
||||
TEST_TARGET_NAME build_tests)
|
||||
TEST_TARGET_NAME build_tests
|
||||
LINKER_LIBS hiprtc)
|
||||
elseif(HIP_PLATFORM MATCHES "nvidia")
|
||||
hip_add_exe_to_target(NAME UnitDeviceTests
|
||||
TEST_SRC ${TEST_SRC}
|
||||
|
||||
Reference in New Issue
Block a user