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

MueLu: add test guards if no direct solver #10967

Closed
wants to merge 1 commit into from
Closed

MueLu: add test guards if no direct solver #10967

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
27 changes: 15 additions & 12 deletions packages/muelu/test/maxwell/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,14 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../adapters/belos)
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../unit_tests)


TRIBITS_ADD_EXECUTABLE_AND_TEST(
IF (${PACKAGE_NAME}_ENABLE_Amesos2)
TRIBITS_ADD_EXECUTABLE_AND_TEST(
ReitzingerPFactory
SOURCES ReitzingerPFactory.cpp
ARGS ""
COMM serial mpi
)

ENDIF()


IF (${PACKAGE_NAME}_ENABLE_Belos AND ${PACKAGE_NAME}_ENABLE_Kokkos_Refactor)
Expand All @@ -32,16 +33,18 @@ IF (${PACKAGE_NAME}_ENABLE_Belos AND ${PACKAGE_NAME}_ENABLE_Kokkos_Refactor)

IF (${PACKAGE_NAME}_ENABLE_Tpetra)

TRIBITS_ADD_TEST(
Maxwell3D
NAME "Maxwell3D-Tpetra"
ARGS "--linAlgebra=Tpetra --reuse --xml=Maxwell.xml"
ARGS "--linAlgebra=Tpetra --reuse --xml=Maxwell2.xml"
ARGS "--linAlgebra=Tpetra --precType=MueLu-Maxwell1 --xml=Maxwell_Reitzinger.xml"
ARGS "--linAlgebra=Tpetra --precType=MueLu-Maxwell1 --xml=Maxwell_Reitzinger_repart.xml"
COMM serial mpi
NUM_MPI_PROCS 4
)
IF (${PACKAGE_NAME}_ENABLE_Amesos2)
TRIBITS_ADD_TEST(
Maxwell3D
NAME "Maxwell3D-Tpetra"
ARGS "--linAlgebra=Tpetra --reuse --xml=Maxwell.xml"
ARGS "--linAlgebra=Tpetra --reuse --xml=Maxwell2.xml"
ARGS "--linAlgebra=Tpetra --precType=MueLu-Maxwell1 --xml=Maxwell_Reitzinger.xml"
ARGS "--linAlgebra=Tpetra --precType=MueLu-Maxwell1 --xml=Maxwell_Reitzinger_repart.xml"
COMM serial mpi
NUM_MPI_PROCS 4
)
ENDIF()

IF (${PACKAGE_NAME}_ENABLE_ML AND ${PACKAGE_NAME}_ENABLE_Epetra)
TRIBITS_ADD_TEST(
Expand Down
12 changes: 12 additions & 0 deletions packages/muelu/test/unit_tests/Hierarchy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,9 @@ namespace MueLuTests {
*/
MUELU_TESTING_SET_OSTREAM;
MUELU_TESTING_LIMIT_SCOPE(Scalar,GlobalOrdinal,Node);
# if !defined(HAVE_MUELU_AMESOS2)
MUELU_TESTING_DO_NOT_TEST(Xpetra::UseTpetra, "Amesos2");
# endif
out << "version: " << MueLu::Version() << std::endl;

typedef typename Teuchos::ScalarTraits<SC>::magnitudeType real_type;
Expand Down Expand Up @@ -718,6 +721,9 @@ namespace MueLuTests {
# include <MueLu_UseShortNames.hpp>
MUELU_TESTING_SET_OSTREAM;
MUELU_TESTING_LIMIT_SCOPE(Scalar,GlobalOrdinal,Node);
# if !defined(HAVE_MUELU_AMESOS2)
MUELU_TESTING_DO_NOT_TEST(Xpetra::UseTpetra, "Amesos2");
# endif


RCP<const Teuchos::Comm<int> > comm = TestHelpers::Parameters::getDefaultComm();
Expand Down Expand Up @@ -793,6 +799,9 @@ namespace MueLuTests {
# include <MueLu_UseShortNames.hpp>
MUELU_TESTING_SET_OSTREAM;
MUELU_TESTING_LIMIT_SCOPE(Scalar,GlobalOrdinal,Node);
# if !defined(HAVE_MUELU_AMESOS2)
MUELU_TESTING_DO_NOT_TEST(Xpetra::UseTpetra, "Amesos2");
# endif


RCP<const Teuchos::Comm<int> > comm = TestHelpers::Parameters::getDefaultComm();
Expand Down Expand Up @@ -1543,6 +1552,9 @@ namespace MueLuTests {
MUELU_TESTING_SET_OSTREAM;
Teuchos::RCP<Teuchos::FancyOStream> allOut = Teuchos::rcp(new Teuchos::FancyOStream(Teuchos::rcpFromRef(std::cout)));
MUELU_TESTING_LIMIT_SCOPE(Scalar,GlobalOrdinal,Node);
# if !defined(HAVE_MUELU_AMESOS2)
MUELU_TESTING_DO_NOT_TEST(Xpetra::UseTpetra, "Amesos2");
# endif
using TST = Teuchos::ScalarTraits<Scalar>;
using magnitude_type = typename Teuchos::ScalarTraits<Scalar>::magnitudeType;
using TMT = Teuchos::ScalarTraits<magnitude_type>;
Expand Down
3 changes: 3 additions & 0 deletions packages/muelu/test/unit_tests/ParameterList/ParameterListInterpreter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,9 @@ TEUCHOS_UNIT_TEST_TEMPLATE_4_DECL(ParameterListInterpreter, PointCrs_vs_BlockCrs
# include <MueLu_UseShortNames.hpp>
MUELU_TESTING_SET_OSTREAM;
MUELU_TESTING_LIMIT_SCOPE(Scalar,GlobalOrdinal,Node);
# if !defined(HAVE_MUELU_AMESOS2)
MUELU_TESTING_DO_NOT_TEST(Xpetra::UseTpetra, "Amesos2");
# endif
#if defined(HAVE_MUELU_TPETRA)
MUELU_TEST_ONLY_FOR(Xpetra::UseTpetra) {
Teuchos::ParameterList matrixParams;
Expand Down
18 changes: 18 additions & 0 deletions packages/muelu/test/unit_tests/RAPShiftFactory.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,9 @@ namespace MueLuTests {
# include "MueLu_UseShortNames.hpp"
MUELU_TESTING_SET_OSTREAM;
MUELU_TESTING_LIMIT_SCOPE(Scalar,GlobalOrdinal,Node);
# if !defined(HAVE_MUELU_AMESOS2)
MUELU_TESTING_DO_NOT_TEST(Xpetra::UseTpetra, "Amesos2");
# endif
out << "version: " << MueLu::Version() << std::endl;
typedef Scalar SC;
typedef GlobalOrdinal GO;
Expand Down Expand Up @@ -392,6 +395,9 @@ namespace MueLuTests {
# include "MueLu_UseShortNames.hpp"
MUELU_TESTING_SET_OSTREAM;
MUELU_TESTING_LIMIT_SCOPE(Scalar,GlobalOrdinal,Node);
# if !defined(HAVE_MUELU_AMESOS2)
MUELU_TESTING_DO_NOT_TEST(Xpetra::UseTpetra, "Amesos2");
# endif
out << "version: " << MueLu::Version() << std::endl;
typedef Scalar SC;
typedef GlobalOrdinal GO;
Expand Down Expand Up @@ -469,6 +475,9 @@ namespace MueLuTests {
# include "MueLu_UseShortNames.hpp"
MUELU_TESTING_SET_OSTREAM;
MUELU_TESTING_LIMIT_SCOPE(Scalar,GlobalOrdinal,Node);
# if !defined(HAVE_MUELU_AMESOS2)
MUELU_TESTING_DO_NOT_TEST(Xpetra::UseTpetra, "Amesos2");
# endif
out << "version: " << MueLu::Version() << std::endl;
typedef Scalar SC;
typedef GlobalOrdinal GO;
Expand Down Expand Up @@ -557,6 +566,9 @@ namespace MueLuTests {
# include "MueLu_UseShortNames.hpp"
MUELU_TESTING_SET_OSTREAM;
MUELU_TESTING_LIMIT_SCOPE(Scalar,GlobalOrdinal,Node);
# if !defined(HAVE_MUELU_AMESOS2)
MUELU_TESTING_DO_NOT_TEST(Xpetra::UseTpetra, "Amesos2");
# endif
out << "version: " << MueLu::Version() << std::endl;
typedef Scalar SC;
typedef GlobalOrdinal GO;
Expand Down Expand Up @@ -646,6 +658,9 @@ namespace MueLuTests {
# include "MueLu_UseShortNames.hpp"
MUELU_TESTING_SET_OSTREAM;
MUELU_TESTING_LIMIT_SCOPE(Scalar,GlobalOrdinal,Node);
# if !defined(HAVE_MUELU_AMESOS2)
MUELU_TESTING_DO_NOT_TEST(Xpetra::UseTpetra, "Amesos2");
# endif
out << "version: " << MueLu::Version() << std::endl;
typedef Scalar SC;
typedef GlobalOrdinal GO;
Expand Down Expand Up @@ -735,6 +750,9 @@ namespace MueLuTests {
# include "MueLu_UseShortNames.hpp"
MUELU_TESTING_SET_OSTREAM;
MUELU_TESTING_LIMIT_SCOPE(Scalar,GlobalOrdinal,Node);
# if !defined(HAVE_MUELU_AMESOS2)
MUELU_TESTING_DO_NOT_TEST(Xpetra::UseTpetra, "Amesos2");
# endif
out << "version: " << MueLu::Version() << std::endl;
typedef Scalar SC;
typedef GlobalOrdinal GO;
Expand Down
2 changes: 1 addition & 1 deletion packages/muelu/test/vardofpernode/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ TRIBITS_COPY_FILES_TO_BINARY_DIR(VarDofDriver_cp
7ProcLinear0 7ProcLinear1 7ProcLinear2 7ProcLinear3 7ProcLinear4 7ProcLinear5 7ProcLinear6 7dofPresent0 7dofPresent1 7dofPresent2 7dofPresent3 7dofPresent4 7dofPresent5 7dofPresent6 7proc0 7proc1 7proc2 7proc3 7proc4 7proc5 7proc6
)

IF (${PACKAGE_NAME}_ENABLE_Belos)
IF (${PACKAGE_NAME}_ENABLE_Belos AND ${PACKAGE_NAME}_ENABLE_Amesos2)
TRIBITS_ADD_TEST(
VarDofDriver
NAME "VarDofDriver"
Expand Down