diff --git a/packages/shylu/shylu_dd/frosch/CMakeLists.txt b/packages/shylu/shylu_dd/frosch/CMakeLists.txt index 57311763e0b4..a3426c38fb04 100644 --- a/packages/shylu/shylu_dd/frosch/CMakeLists.txt +++ b/packages/shylu/shylu_dd/frosch/CMakeLists.txt @@ -1,8 +1,11 @@ TRIBITS_SUBPACKAGE(FROSch) -IF (${PROJECT_NAME}_ENABLE_ShyLU_DDFROSch AND NOT (Xpetra_ENABLE_Epetra AND Amesos2_ENABLE_Epetra)) +IF(NOT (Xpetra_ENABLE_Epetra AND Amesos2_ENABLE_Epetra)) + message(STATUS "ShyLU's Epetra is being DISABLED") SET(HAVE_SHYLU_DDFROSCH_EPETRA OFF) + SET(HAVE_SHYLU_DDFROSCH_EPETRAEXT OFF) ELSE() + message(STATUS "ShyLU's Epetra is being ENABLED") SET(HAVE_SHYLU_DDFROSCH_EPETRA ON) ENDIF() diff --git a/packages/shylu/shylu_dd/frosch/test/CMakeLists.txt b/packages/shylu/shylu_dd/frosch/test/CMakeLists.txt index d811bdc7c25e..dbf5dd5e26e5 100644 --- a/packages/shylu/shylu_dd/frosch/test/CMakeLists.txt +++ b/packages/shylu/shylu_dd/frosch/test/CMakeLists.txt @@ -14,7 +14,7 @@ ADD_SUBDIRECTORIES( ) ENDIF() -IF(ShyLU_DDFROSch_ENABLE_Belos AND KOKKOS_ENABLE_SERIAL AND ShyLU_DDFROSch_ENABLE_Stratimikos AND ShyLU_DDFROSch_ENABLE_Thyra AND HAVE_AMESOS2_EPETRA AND ShyLU_DDFROSch_ENABLE_EpetraExt AND ShyLU_DDFROSch_ENABLE_HDF5) +IF(ShyLU_DDFROSch_ENABLE_Belos AND KOKKOS_ENABLE_SERIAL AND ShyLU_DDFROSch_ENABLE_Stratimikos AND ShyLU_DDFROSch_ENABLE_Thyra AND HAVE_AMESOS2_EPETRA AND HAVE_SHYLU_DDFROSCH_EPETRAEXT AND ShyLU_DDFROSch_ENABLE_HDF5) ADD_SUBDIRECTORIES( Thyra_Xpetra_Stokes_HDF5 ) diff --git a/packages/shylu/shylu_dd/frosch/test/InterfacePartitionOfUnity/CMakeLists.txt b/packages/shylu/shylu_dd/frosch/test/InterfacePartitionOfUnity/CMakeLists.txt index 2ae3bc2028e9..ff1ce8a245c6 100644 --- a/packages/shylu/shylu_dd/frosch/test/InterfacePartitionOfUnity/CMakeLists.txt +++ b/packages/shylu/shylu_dd/frosch/test/InterfacePartitionOfUnity/CMakeLists.txt @@ -10,7 +10,7 @@ TRIBITS_COPY_FILES_TO_BINARY_DIR(IPOUCopyFiles EXEDEPS interfacepartitionofunity ) -IF(ShyLU_DDFROSch_ENABLE_Epetra AND NOT Tpetra_DefaultNode STREQUAL "Kokkos::Compat::KokkosCudaWrapperNode") +IF(HAVE_SHYLU_DDFROSCH_EPETRA AND NOT Tpetra_DefaultNode STREQUAL "Kokkos::Compat::KokkosCudaWrapperNode") TRIBITS_ADD_TEST( interfacepartitionofunity NAME test_interfacepartitionofunity_DIM2_EPETRA diff --git a/packages/shylu/shylu_dd/frosch/test/InterfaceSets/CMakeLists.txt b/packages/shylu/shylu_dd/frosch/test/InterfaceSets/CMakeLists.txt index a778912bc7c8..eae29e6b7e1c 100644 --- a/packages/shylu/shylu_dd/frosch/test/InterfaceSets/CMakeLists.txt +++ b/packages/shylu/shylu_dd/frosch/test/InterfaceSets/CMakeLists.txt @@ -3,7 +3,7 @@ TRIBITS_ADD_EXECUTABLE( SOURCES main.cpp ) -IF(ShyLU_DDFROSch_ENABLE_Epetra AND NOT Tpetra_DefaultNode STREQUAL "Kokkos::Compat::KokkosCudaWrapperNode") +IF(HAVE_SHYLU_DDFROSCH_EPETRA AND NOT Tpetra_DefaultNode STREQUAL "Kokkos::Compat::KokkosCudaWrapperNode") ############################ # Communication Strategy 0 # ############################ diff --git a/packages/shylu/shylu_dd/frosch/test/LocalPartitionOfUnityBasis/CMakeLists.txt b/packages/shylu/shylu_dd/frosch/test/LocalPartitionOfUnityBasis/CMakeLists.txt index 351cdb6e5256..080beabca538 100644 --- a/packages/shylu/shylu_dd/frosch/test/LocalPartitionOfUnityBasis/CMakeLists.txt +++ b/packages/shylu/shylu_dd/frosch/test/LocalPartitionOfUnityBasis/CMakeLists.txt @@ -10,7 +10,7 @@ TRIBITS_COPY_FILES_TO_BINARY_DIR(LocalPOUCopyFiles EXEDEPS localpartitionofunitybasis ) -IF(ShyLU_DDFROSch_ENABLE_Epetra AND NOT Tpetra_DefaultNode STREQUAL "Kokkos::Compat::KokkosCudaWrapperNode") +IF(HAVE_SHYLU_DDFROSCH_EPETRA AND NOT Tpetra_DefaultNode STREQUAL "Kokkos::Compat::KokkosCudaWrapperNode") TRIBITS_ADD_TEST( localpartitionofunitybasis NAME test_localpartitionofunitybasis_EPETRA diff --git a/packages/shylu/shylu_dd/frosch/test/Overlap/CMakeLists.txt b/packages/shylu/shylu_dd/frosch/test/Overlap/CMakeLists.txt index a72dde3da466..511fdab663c8 100644 --- a/packages/shylu/shylu_dd/frosch/test/Overlap/CMakeLists.txt +++ b/packages/shylu/shylu_dd/frosch/test/Overlap/CMakeLists.txt @@ -11,7 +11,7 @@ ParameterLists # Overlap Determination Graph # ############################### ## Epetra -IF(ShyLU_DDFROSch_ENABLE_Epetra AND NOT Tpetra_DefaultNode STREQUAL "Kokkos::Compat::KokkosCudaWrapperNode") +IF(HAVE_SHYLU_DDFROSCH_EPETRA AND NOT Tpetra_DefaultNode STREQUAL "Kokkos::Compat::KokkosCudaWrapperNode") TRIBITS_ADD_TEST( overlap NAME test_overlap_Graph_DIM2_DPN1_EPETRA @@ -82,7 +82,7 @@ NUM_MPI_PROCS 8 # Overlap Determination Matrix # ################################ ## Epetra -IF(ShyLU_DDFROSch_ENABLE_Epetra AND NOT Tpetra_DefaultNode STREQUAL "Kokkos::Compat::KokkosCudaWrapperNode") +IF(HAVE_SHYLU_DDFROSCH_EPETRA AND NOT Tpetra_DefaultNode STREQUAL "Kokkos::Compat::KokkosCudaWrapperNode") TRIBITS_ADD_TEST( overlap NAME test_overlap_Matrix_DIM2_DPN1_EPETRA @@ -153,7 +153,7 @@ NUM_MPI_PROCS 8 # Overlap Determination Old # ############################# ## Epetra -IF(ShyLU_DDFROSch_ENABLE_Epetra AND NOT Tpetra_DefaultNode STREQUAL "Kokkos::Compat::KokkosCudaWrapperNode") +IF(HAVE_SHYLU_DDFROSCH_EPETRA AND NOT Tpetra_DefaultNode STREQUAL "Kokkos::Compat::KokkosCudaWrapperNode") TRIBITS_ADD_TEST( overlap NAME test_overlap_Old_DIM2_DPN1_EPETRA diff --git a/packages/shylu/shylu_dd/frosch/test/Thyra_Xpetra_Elasticity/CMakeLists.txt b/packages/shylu/shylu_dd/frosch/test/Thyra_Xpetra_Elasticity/CMakeLists.txt index 9140b21be56b..cf8a12f83be1 100644 --- a/packages/shylu/shylu_dd/frosch/test/Thyra_Xpetra_Elasticity/CMakeLists.txt +++ b/packages/shylu/shylu_dd/frosch/test/Thyra_Xpetra_Elasticity/CMakeLists.txt @@ -11,7 +11,7 @@ ParameterLists # GDSWPreconditioner # ###################### ## Epetra -IF(ShyLU_DDFROSch_ENABLE_Epetra AND NOT Tpetra_DefaultNode STREQUAL "Kokkos::Compat::KokkosCudaWrapperNode") +IF(HAVE_SHYLU_DDFROSCH_EPETRA AND NOT Tpetra_DefaultNode STREQUAL "Kokkos::Compat::KokkosCudaWrapperNode") TRIBITS_ADD_TEST( thyra_xpetra_elasticity NAME test_thyra_xpetra_elasticity_GDSWP_DIM2_EPETRA @@ -50,7 +50,7 @@ NUM_MPI_PROCS 8 # RGDSWPreconditioner # ####################### ## Epetra -IF(ShyLU_DDFROSch_ENABLE_Epetra AND NOT Tpetra_DefaultNode STREQUAL "Kokkos::Compat::KokkosCudaWrapperNode") +IF(HAVE_SHYLU_DDFROSCH_EPETRA AND NOT Tpetra_DefaultNode STREQUAL "Kokkos::Compat::KokkosCudaWrapperNode") TRIBITS_ADD_TEST( thyra_xpetra_elasticity NAME test_thyra_xpetra_elasticity_RGDSWP_DIM2_EPETRA @@ -89,7 +89,7 @@ NUM_MPI_PROCS 8 # TwoLevelPreconditioner_GDSW # ############################### ## Epetra -IF(ShyLU_DDFROSch_ENABLE_Epetra AND NOT Tpetra_DefaultNode STREQUAL "Kokkos::Compat::KokkosCudaWrapperNode") +IF(HAVE_SHYLU_DDFROSCH_EPETRA AND NOT Tpetra_DefaultNode STREQUAL "Kokkos::Compat::KokkosCudaWrapperNode") TRIBITS_ADD_TEST( thyra_xpetra_elasticity NAME test_thyra_xpetra_elasticity_TLP_GDSW_DIM2_EPETRA @@ -128,7 +128,7 @@ NUM_MPI_PROCS 8 # TwoLevelPreconditioner_RGDSW # ################################ ## Epetra -IF(ShyLU_DDFROSch_ENABLE_Epetra AND NOT Tpetra_DefaultNode STREQUAL "Kokkos::Compat::KokkosCudaWrapperNode") +IF(HAVE_SHYLU_DDFROSCH_EPETRA AND NOT Tpetra_DefaultNode STREQUAL "Kokkos::Compat::KokkosCudaWrapperNode") TRIBITS_ADD_TEST( thyra_xpetra_elasticity NAME test_thyra_xpetra_elasticity_TLP_RGDSW_DIM2_EPETRA @@ -167,7 +167,7 @@ NUM_MPI_PROCS 8 # TwoLevelPreconditioner_IPOUHarmonic_GDSW # ############################################ ## Epetra -IF(ShyLU_DDFROSch_ENABLE_Epetra AND NOT Tpetra_DefaultNode STREQUAL "Kokkos::Compat::KokkosCudaWrapperNode") +IF(HAVE_SHYLU_DDFROSCH_EPETRA AND NOT Tpetra_DefaultNode STREQUAL "Kokkos::Compat::KokkosCudaWrapperNode") TRIBITS_ADD_TEST( thyra_xpetra_elasticity NAME test_thyra_xpetra_elasticity_TLP_IPOUHarmonic_GDSW_DIM2_EPETRA @@ -206,7 +206,7 @@ NUM_MPI_PROCS 8 # TwoLevelPreconditioner_IPOUHarmonic_RGDSW # ############################################# ## Epetra -IF(ShyLU_DDFROSch_ENABLE_Epetra AND NOT Tpetra_DefaultNode STREQUAL "Kokkos::Compat::KokkosCudaWrapperNode") +IF(HAVE_SHYLU_DDFROSCH_EPETRA AND NOT Tpetra_DefaultNode STREQUAL "Kokkos::Compat::KokkosCudaWrapperNode") TRIBITS_ADD_TEST( thyra_xpetra_elasticity NAME test_thyra_xpetra_elasticity_TLP_IPOUHarmonic_RGDSW_DIM2_EPETRA diff --git a/packages/shylu/shylu_dd/frosch/test/Thyra_Xpetra_Laplace/CMakeLists.txt b/packages/shylu/shylu_dd/frosch/test/Thyra_Xpetra_Laplace/CMakeLists.txt index 331b856a61ca..29288a47c253 100644 --- a/packages/shylu/shylu_dd/frosch/test/Thyra_Xpetra_Laplace/CMakeLists.txt +++ b/packages/shylu/shylu_dd/frosch/test/Thyra_Xpetra_Laplace/CMakeLists.txt @@ -13,7 +13,7 @@ MESSAGE(STATUS "FROSch tests running with Tpetra_DefaultNode type ${Tpetra_Defau # GDSWPreconditioner # ###################### ## Epetra -IF(ShyLU_DDFROSch_ENABLE_Epetra AND NOT Tpetra_DefaultNode STREQUAL "Kokkos::Compat::KokkosCudaWrapperNode") +IF(HAVE_SHYLU_DDFROSCH_EPETRA AND NOT Tpetra_DefaultNode STREQUAL "Kokkos::Compat::KokkosCudaWrapperNode") TRIBITS_ADD_TEST( thyra_xpetra_laplace NAME test_thyra_xpetra_laplace_GDSWP_DIM2_DPN1_ORD0_EPETRA @@ -116,7 +116,7 @@ NUM_MPI_PROCS 8 # RGDSWPreconditioner # ####################### ## Epetra -IF(ShyLU_DDFROSch_ENABLE_Epetra AND NOT Tpetra_DefaultNode STREQUAL "Kokkos::Compat::KokkosCudaWrapperNode") +IF(HAVE_SHYLU_DDFROSCH_EPETRA AND NOT Tpetra_DefaultNode STREQUAL "Kokkos::Compat::KokkosCudaWrapperNode") TRIBITS_ADD_TEST( thyra_xpetra_laplace NAME test_thyra_xpetra_laplace_RGDSWP_DIM2_DPN1_ORD0_EPETRA @@ -219,7 +219,7 @@ NUM_MPI_PROCS 8 # TwoLevelPreconditioner_GDSW # ############################### ## Epetra -IF(ShyLU_DDFROSch_ENABLE_Epetra AND NOT Tpetra_DefaultNode STREQUAL "Kokkos::Compat::KokkosCudaWrapperNode") +IF(HAVE_SHYLU_DDFROSCH_EPETRA AND NOT Tpetra_DefaultNode STREQUAL "Kokkos::Compat::KokkosCudaWrapperNode") TRIBITS_ADD_TEST( thyra_xpetra_laplace NAME test_thyra_xpetra_laplace_TLP_GDSW_DIM2_DPN1_ORD0_EPETRA @@ -278,7 +278,7 @@ COMM mpi NUM_MPI_PROCS 8 ) -ENDIF() # IF(ShyLU_DDFROSch_ENABLE_Epetra AND NOT Tpetra_DefaultNode STREQUAL "Kokkos::Compat::KokkosCudaWrapperNode") +ENDIF() # IF(HAVE_SHYLU_DDFROSCH_EPETRA AND NOT Tpetra_DefaultNode STREQUAL "Kokkos::Compat::KokkosCudaWrapperNode") ## Tpetra TRIBITS_ADD_TEST( @@ -343,7 +343,7 @@ NUM_MPI_PROCS 8 # TwoLevelPreconditioner_RGDSW # ################################ ## Epetra -IF(ShyLU_DDFROSch_ENABLE_Epetra AND NOT Tpetra_DefaultNode STREQUAL "Kokkos::Compat::KokkosCudaWrapperNode") +IF(HAVE_SHYLU_DDFROSCH_EPETRA AND NOT Tpetra_DefaultNode STREQUAL "Kokkos::Compat::KokkosCudaWrapperNode") TRIBITS_ADD_TEST( thyra_xpetra_laplace NAME test_thyra_xpetra_laplace_TLP_RGDSW_DIM2_DPN1_ORD0_EPETRA @@ -446,7 +446,7 @@ NUM_MPI_PROCS 8 # TwoLevelPreconditioner_IPOUHarmonic_GDSW # ############################################ ## Epetra -IF(ShyLU_DDFROSch_ENABLE_Epetra AND NOT Tpetra_DefaultNode STREQUAL "Kokkos::Compat::KokkosCudaWrapperNode") +IF(HAVE_SHYLU_DDFROSCH_EPETRA AND NOT Tpetra_DefaultNode STREQUAL "Kokkos::Compat::KokkosCudaWrapperNode") TRIBITS_ADD_TEST( thyra_xpetra_laplace NAME test_thyra_xpetra_laplace_TLP_IPOUHarmonic_GDSW_DIM2_DPN1_ORD0_EPETRA @@ -549,7 +549,7 @@ NUM_MPI_PROCS 8 # TwoLevelPreconditioner_IPOUHarmonic_RGDSW # ############################################# ## Epetra -IF(ShyLU_DDFROSch_ENABLE_Epetra AND NOT Tpetra_DefaultNode STREQUAL "Kokkos::Compat::KokkosCudaWrapperNode") +IF(HAVE_SHYLU_DDFROSCH_EPETRA AND NOT Tpetra_DefaultNode STREQUAL "Kokkos::Compat::KokkosCudaWrapperNode") TRIBITS_ADD_TEST( thyra_xpetra_laplace NAME test_thyra_xpetra_laplace_TLP_IPOUHarmonic_RGDSW_DIM2_DPN1_ORD0_EPETRA @@ -655,7 +655,7 @@ NUM_MPI_PROCS 8 ## Number of Blocks = 2 ## Epetra -IF(ShyLU_DDFROSch_ENABLE_Epetra AND NOT Tpetra_DefaultNode STREQUAL "Kokkos::Compat::KokkosCudaWrapperNode") +IF(HAVE_SHYLU_DDFROSCH_EPETRA AND NOT Tpetra_DefaultNode STREQUAL "Kokkos::Compat::KokkosCudaWrapperNode") TRIBITS_ADD_TEST( thyra_xpetra_laplace NAME test_thyra_xpetra_laplace_TLBP_NB2_GDSW_DIM2_DPN1_ORD0_EPETRA @@ -789,7 +789,7 @@ NUM_MPI_PROCS 8 ## Number of Blocks = 3 ## Epetra -IF(ShyLU_DDFROSch_ENABLE_Epetra AND NOT Tpetra_DefaultNode STREQUAL "Kokkos::Compat::KokkosCudaWrapperNode") +IF(HAVE_SHYLU_DDFROSCH_EPETRA AND NOT Tpetra_DefaultNode STREQUAL "Kokkos::Compat::KokkosCudaWrapperNode") TRIBITS_ADD_TEST( thyra_xpetra_laplace NAME test_thyra_xpetra_laplace_TLBP_NB3_GDSW_DIM2_DPN1_ORD0_EPETRA @@ -924,7 +924,7 @@ NUM_MPI_PROCS 8 # 1 MPI-Rank (GDSW) # ##################### ## Epetra -IF(ShyLU_DDFROSch_ENABLE_Epetra AND NOT Tpetra_DefaultNode STREQUAL "Kokkos::Compat::KokkosCudaWrapperNode") +IF(HAVE_SHYLU_DDFROSCH_EPETRA AND NOT Tpetra_DefaultNode STREQUAL "Kokkos::Compat::KokkosCudaWrapperNode") TRIBITS_ADD_TEST( thyra_xpetra_laplace NAME test_thyra_xpetra_laplace_one_rank_TLP_GDSW_DIM2_EPETRA @@ -963,7 +963,7 @@ NUM_MPI_PROCS 1 # 1 MPI-Rank (RGDSW) # ###################### ## Epetra -IF(ShyLU_DDFROSch_ENABLE_Epetra AND NOT Tpetra_DefaultNode STREQUAL "Kokkos::Compat::KokkosCudaWrapperNode") +IF(HAVE_SHYLU_DDFROSCH_EPETRA AND NOT Tpetra_DefaultNode STREQUAL "Kokkos::Compat::KokkosCudaWrapperNode") TRIBITS_ADD_TEST( thyra_xpetra_laplace NAME test_thyra_xpetra_laplace_one_rank_TLP_RGDSW_DIM2_EPETRA @@ -1002,7 +1002,7 @@ NUM_MPI_PROCS 1 # 1 MPI-Rank (IPOU) # ##################### ## Epetra -IF(ShyLU_DDFROSch_ENABLE_Epetra AND NOT Tpetra_DefaultNode STREQUAL "Kokkos::Compat::KokkosCudaWrapperNode") +IF(HAVE_SHYLU_DDFROSCH_EPETRA AND NOT Tpetra_DefaultNode STREQUAL "Kokkos::Compat::KokkosCudaWrapperNode") TRIBITS_ADD_TEST( thyra_xpetra_laplace NAME test_thyra_xpetra_laplace_one_rank_TLP_IPOU_DIM2_EPETRA