Skip to content

Commit 3bbfb20

Browse files
committed
Remove deprecated Cabana variables
1 parent a93c2fc commit 3bbfb20

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

advanced_examples/01_parallel_for/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
if( Cabana_ENABLE_Cuda )
1+
if( Kokkos_ENABLE_CUDA )
22
if("${CMAKE_Fortran_COMPILER_ID}" STREQUAL "PGI")
33
add_definitions(-DSIMD_SIZE=1 -DVEC_LEN=32 -DUSE_GPU=1)
44
set(MPI_Fortran_COMPILE_FLAGS "-r -ta=tesla:cuda9.0 -Minfo=accel -Mcuda=cuda9.0")

advanced_examples/02_push/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
if( Cabana_ENABLE_Cuda )
1+
if( Kokkos_ENABLE_CUDA )
22
if("${CMAKE_Fortran_COMPILER_ID}" STREQUAL "PGI")
33
add_definitions(-DSIMD_SIZE=1 -DVEC_LEN=32 -DUSE_GPU=1)
44
set(MPI_Fortran_COMPILE_FLAGS "-r -ta=tesla:cuda9.0 -Minfo=accel -Mcuda=cuda9.0")

advanced_examples/03_scatter/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
if( Cabana_ENABLE_Cuda )
1+
if( Kokkos_ENABLE_CUDA )
22
if("${CMAKE_Fortran_COMPILER_ID}" STREQUAL "PGI")
33
add_definitions(-DSIMD_SIZE=1 -DVEC_LEN=32 -DUSE_GPU=1)
44
set(MPI_Fortran_COMPILE_FLAGS "-r -ta=tesla:cuda9.0 -Minfo=accel -Mcuda=cuda9.0")

advanced_examples/04_unmanaged_aosoa/CMakeLists.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,29 +8,29 @@ link_directories(${MPI_Fortran_LIBRARIES})
88

99
message(${CMAKE_Fortran_COMPILER_ID})
1010
if (("${CMAKE_Fortran_COMPILER_ID}" STREQUAL "PGI") AND ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "PGI"))
11-
if( Cabana_ENABLE_Cuda )
11+
if( Kokkos_ENABLE_CUDA )
1212
target_compile_definitions(ForParallelForUnmanaged PUBLIC -DUSE_GPU=1)
1313
set(CMAKE_Fortran_FLAGS "-ta=tesla:cuda9.0 -Minfo=accel -Mcuda=cuda9.0")
1414
set(CMAKE_CXX_FLAGS "--relocatable-device-code=true")
15-
elseif( Cabana_ENABLE_OpenMP )
15+
elseif( Kokkos_ENABLE_OPENMP )
1616
target_compile_definitions(ForParallelForUnmanaged PUBLIC -DUSE_GPU=0)
1717
set(CMAKE_Fortran_FLAGS "-ta=multicore -mp")
18-
elseif( Cabana_ENABLE_Serial )
18+
elseif( Kokkos_ENABLE_SERIAL )
1919
target_compile_definitions(ForParallelForUnmanaged PUBLIC -DUSE_GPU=0)
2020
set(CMAKE_Fortran_FLAGS "-ta=host")
2121
endif()
2222

2323
set(CMAKE_EXE_LINKER_FLAGS "-pgc++libs")
2424
else()
25-
if( Cabana_ENABLE_Cuda )
25+
if( Kokkos_ENABLE_CUDA )
2626
message("Only PGI is supported for compiling fortran cuda code. Right now
2727
we only accept building with PGI for both CXX and Fortran to avoid mixing
2828
compiler families.\n Skip.")
2929
return()
30-
elseif( Cabana_ENABLE_OpenMP )
30+
elseif( Kokkos_ENABLE_OPENMP )
3131
target_compile_definitions(ForParallelForUnmanaged PUBLIC -DUSE_GPU=0)
3232
set(CMAKE_Fortran_FLAGS "-fopenmp")
33-
elseif( Cabana_ENABLE_Serial )
33+
elseif( Kokkos_ENABLE_SERIAL )
3434
target_compile_definitions(ForParallelForUnmanaged PUBLIC -DUSE_GPU=0)
3535
endif()
3636
endif()

0 commit comments

Comments
 (0)