Skip to content

Commit 8f75535

Browse files
committed
Fix some errors that didn't work with blt 0.7.0
1 parent 9fc8734 commit 8f75535

File tree

6 files changed

+9
-2
lines changed

6 files changed

+9
-2
lines changed

cmake/thirdparty/SetupSAMRAIThirdParty.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ if (ENABLE_RAJA OR RAJA_DIR)
3737
endif ()
3838

3939
if (ENABLE_HIP)
40-
list (APPEND raja_depends hip)
40+
list (APPEND raja_depends blt::hip)
4141
endif ()
4242

4343
if (ENABLE_OPENMP)

host-configs/toss_4_x86_64_ib_cray/amdclang-rocm-6.2.1-gfx90a.cmake

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
set(ENABLE_MPI On CACHE BOOL "")
66
set(CMAKE_C_COMPILER "/usr/tce/packages/rocmcc-tce/rocmcc-6.2.1/bin/amdclang" CACHE PATH "")
77
set(CMAKE_CXX_COMPILER "/usr/tce/packages/rocmcc-tce/rocmcc-6.2.1/bin/amdclang++" CACHE PATH "")
8+
set(CMAKE_HIP_COMPILER "/usr/tce/packages/rocmcc-tce/rocmcc-6.2.1/bin/amdclang++" CACHE PATH "")
89
set(CMAKE_Fortran_COMPILER "/usr/tce/packages/rocmcc-tce/rocmcc-6.2.1/bin/amdflang" CACHE PATH "")
910
set(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING "")
1011
set(ENABLE_OPENMP Off CACHE BOOL "")

host-configs/toss_4_x86_64_ib_cray/amdclang-rocm-6.2.1-gfx942.cmake

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
set(ENABLE_MPI On CACHE BOOL "")
66
set(CMAKE_C_COMPILER "/usr/tce/packages/rocmcc-tce/rocmcc-6.2.1/bin/amdclang" CACHE PATH "")
77
set(CMAKE_CXX_COMPILER "/usr/tce/packages/rocmcc-tce/rocmcc-6.2.1/bin/amdclang++" CACHE PATH "")
8+
set(CMAKE_HIP_COMPILER "/usr/tce/packages/rocmcc-tce/rocmcc-6.2.1/bin/amdclang++" CACHE PATH "")
89
set(CMAKE_Fortran_COMPILER "/usr/tce/packages/rocmcc-tce/rocmcc-6.2.1/bin/amdflang" CACHE PATH "")
910
set(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING "")
1011
set(ENABLE_OPENMP Off CACHE BOOL "")

source/test/applications/ConvDiff/CMakeLists.txt

+2
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ target_include_directories(
4848

4949
set_target_properties(convdiff PROPERTIES LINKER_LANGUAGE CXX)
5050

51+
target_compile_definitions(convdiff PRIVATE TESTING=1)
52+
5153
file (GLOB test_inputs ${CMAKE_CURRENT_SOURCE_DIR}/test_inputs/*.input)
5254
file (GLOB test_baselines ${CMAKE_CURRENT_SOURCE_DIR}/test_inputs/*boxes*)
5355

source/test/applications/Euler/CMakeLists.txt

+2
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@ target_include_directories( euler
6565

6666
set_target_properties(euler PROPERTIES LINKER_LANGUAGE CXX)
6767

68+
target_compile_definitions(euler PRIVATE TESTING=1)
69+
6870
file (GLOB test_inputs ${CMAKE_CURRENT_SOURCE_DIR}/test_inputs/*.input)
6971
file (GLOB test_baselines ${CMAKE_CURRENT_SOURCE_DIR}/test_inputs/*boxes*)
7072

source/test/applications/LinAdv/CMakeLists.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,15 @@ if (ENABLE_HIP)
4545
set(linadv_depends ${linadv_depends} blt::hip)
4646
endif ()
4747

48-
4948
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DTESTING=1")
5049

5150
blt_add_executable(
5251
NAME linadv
5352
SOURCES ${linadv_sources}
5453
DEPENDS_ON ${linadv_depends})
5554

55+
target_compile_definitions(linadv PRIVATE TESTING=1)
56+
5657
target_include_directories( linadv
5758
PUBLIC ${PROJECT_SOURCE_DIR}/source/test/applications/LinAdv)
5859

0 commit comments

Comments
 (0)