Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ShyLU_DDFrosch: fix Epetra enable logic in test cmake #6060

Merged
merged 1 commit into from
Oct 8, 2019
Merged

ShyLU_DDFrosch: fix Epetra enable logic in test cmake #6060

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion packages/shylu/shylu_dd/frosch/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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()

Expand Down
2 changes: 1 addition & 1 deletion packages/shylu/shylu_dd/frosch/test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
Expand Down
2 changes: 1 addition & 1 deletion packages/shylu/shylu_dd/frosch/test/InterfacePartitionOfUnity/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion packages/shylu/shylu_dd/frosch/test/InterfaceSets/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 #
############################
Expand Down
2 changes: 1 addition & 1 deletion packages/shylu/shylu_dd/frosch/test/LocalPartitionOfUnityBasis/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions packages/shylu/shylu_dd/frosch/test/Overlap/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions packages/shylu/shylu_dd/frosch/test/Thyra_Xpetra_Elasticity/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
24 changes: 12 additions & 12 deletions packages/shylu/shylu_dd/frosch/test/Thyra_Xpetra_Laplace/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down