Skip to content

Commit 6e35697

Browse files
committed
Disable serial instantiations for CUDA/OpenMP-enabled builds
1 parent 1091425 commit 6e35697

1 file changed

Lines changed: 7 additions & 1 deletion

File tree

CMakeLists.txt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -666,6 +666,11 @@ if (ENABLE_TRILINOS)
666666
set( TRILINOS_CXX_COMPILER ${CMAKE_CURRENT_BINARY_DIR}/trilinos/src/trilinos/packages/kokkos/bin/nvcc_wrapper )
667667
endif()
668668

669+
set( TRILINOS_ENABLE_SERIAL ON )
670+
if( ENABLE_OPENMP OR ENABLE_CUDA )
671+
set( TRILINOS_ENABLE_SERIAL OFF )
672+
endif()
673+
669674
ExternalProject_Add( trilinos
670675
PREFIX ${PROJECT_BINARY_DIR}/trilinos
671676
URL ${TRILINOS_URL}
@@ -721,14 +726,15 @@ if (ENABLE_TRILINOS)
721726
-D KOKKOS_ENABLE_CUDA_LAMBDA:BOOL=${ENABLE_CUDA}
722727
-D KOKKOS_ENABLE_CUDA_UVM:BOOL=${ENABLE_CUDA}
723728
-D Tpetra_ENABLE_CUDA:BOOL=${ENABLE_CUDA}
724-
-D Tpetra_INST_SERIAL:BOOL=ON
729+
-D Tpetra_INST_SERIAL:BOOL=${TRILINOS_ENABLE_SERIAL}
725730
-D Tpetra_INST_INT_LONG_LONG:BOOL=ON
726731
-D Tpetra_INST_INT_INT:BOOL=OFF
727732
-D Tpetra_INST_DOUBLE:BOOL=ON
728733
-D Tpetra_INST_COMPLEX_DOUBLE:BOOL=OFF
729734
-D Belos_ENABLE_Tpetra:BOOL=ON
730735
-D Belos_ENABLE_Epetra:BOOL=OFF
731736
-D Belos_ENABLE_Xpetra:BOOL=OFF
737+
-D Ifpack2_ENABLE_ThyraTpetraAdapters:BOOL=OFF
732738
${TRILINOS_EXTRA_ARGS}
733739
)
734740

0 commit comments

Comments
 (0)