Merge pull request #7154 from cgcgcg/fixGaleriMuelu

MueLu: Remove use of undefined MueLu_ENABLE_Galeri
trilinos · Apr 12, 2020 · dd741db · dd741db
2 parents 89c8276 + 2b6d624
commit dd741db
Show file tree

Hide file tree

Showing 56 changed files with 600 additions and 416 deletions.
diff --git a/packages/muelu/doc/Tutorial/src/CMakeLists.txt b/packages/muelu/doc/Tutorial/src/CMakeLists.txt
@@ -6,15 +6,13 @@ ASSERT_DEFINED(
   ${PACKAGE_NAME}_ENABLE_AztecOO
   ${PACKAGE_NAME}_ENABLE_Epetra
   ${PACKAGE_NAME}_ENABLE_EpetraExt
-  ${PACKAGE_NAME}_ENABLE_Galeri
   ${PACKAGE_NAME}_ENABLE_Ifpack
   )
 
 IF (${PACKAGE_NAME}_ENABLE_Amesos       AND
     ${PACKAGE_NAME}_ENABLE_AztecOO      AND
     ${PACKAGE_NAME}_ENABLE_Epetra       AND
     ${PACKAGE_NAME}_ENABLE_EpetraExt    AND
-    ${PACKAGE_NAME}_ENABLE_Galeri       AND
     ${PACKAGE_NAME}_ENABLE_Ifpack
    )
   TRIBITS_ADD_EXECUTABLE(

diff --git a/packages/muelu/example/ParameterList/CMakeLists.txt b/packages/muelu/example/ParameterList/CMakeLists.txt
@@ -1,7 +1,7 @@
 INCLUDE(XpetraAddTest)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 
-IF (${PACKAGE_NAME}_ENABLE_Galeri)
+
 
 #
 #
@@ -31,7 +31,7 @@ ENDIF()
 #
 
 IF(${PACKAGE_NAME}_ENABLE_Tpetra AND ${PACKAGE_NAME}_ENABLE_Ifpack2 AND ${PACKAGE_NAME}_ENABLE_Amesos2)
-#  XPETRA_ADD_TEST_TPETRA(MLParameterList 1-4)
+  #  XPETRA_ADD_TEST_TPETRA(MLParameterList 1-4)
 ENDIF()
 
 IF(${PACKAGE_NAME}_ENABLE_Epetra AND ${PACKAGE_NAME}_ENABLE_EpetraExt AND ${PACKAGE_NAME}_ENABLE_Ifpack AND ${PACKAGE_NAME}_ENABLE_Amesos)
@@ -46,6 +46,5 @@ IF(${PACKAGE_NAME}_ENABLE_Epetra AND ${PACKAGE_NAME}_ENABLE_EpetraExt AND ${PACK
     )
 ENDIF()
 
-ENDIF()
 
 # TODO: add a test with the --xml option
diff --git a/packages/muelu/example/advanced/blockcrs/CMakeLists.txt b/packages/muelu/example/advanced/blockcrs/CMakeLists.txt
@@ -5,13 +5,13 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../../test/unit_tests)
 # Executables
 #
 
-IF(${PACKAGE_NAME}_ENABLE_Tpetra AND ${PACKAGE_NAME}_ENABLE_Belos AND ${PACKAGE_NAME}_ENABLE_Ifpack2 AND ${PACKAGE_NAME}_ENABLE_Amesos2 AND ${PACKAGE_NAME}_ENABLE_Galeri)
+IF(${PACKAGE_NAME}_ENABLE_Tpetra AND ${PACKAGE_NAME}_ENABLE_Belos AND ${PACKAGE_NAME}_ENABLE_Ifpack2 AND ${PACKAGE_NAME}_ENABLE_Amesos2)
 
-    TRIBITS_ADD_EXECUTABLE(
-      BlockCrs
-      SOURCES BlockCrs.cpp
-      COMM serial mpi
-      )
+  TRIBITS_ADD_EXECUTABLE(
+    BlockCrs
+    SOURCES BlockCrs.cpp
+    COMM serial mpi
+    )
 
 ENDIF()
 
@@ -20,7 +20,6 @@ ENDIF()
 #
 
 INCLUDE(XpetraAddTest)
-IF(${PACKAGE_NAME}_ENABLE_Tpetra AND ${PACKAGE_NAME}_ENABLE_Belos AND ${PACKAGE_NAME}_ENABLE_Ifpack2 AND ${PACKAGE_NAME}_ENABLE_Amesos2 AND ${PACKAGE_NAME}_ENABLE_Galeri)
+IF(${PACKAGE_NAME}_ENABLE_Tpetra AND ${PACKAGE_NAME}_ENABLE_Belos AND ${PACKAGE_NAME}_ENABLE_Ifpack2 AND ${PACKAGE_NAME}_ENABLE_Amesos2)
   XPETRA_ADD_TEST_TPETRA(BlockCrs 4)
 ENDIF()
-
diff --git a/packages/muelu/example/advanced/levelwrap/CMakeLists.txt b/packages/muelu/example/advanced/levelwrap/CMakeLists.txt
@@ -8,14 +8,13 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../../test/unit_tests)
 IF((${PACKAGE_NAME}_ENABLE_Tpetra  AND ${PACKAGE_NAME}_ENABLE_Ifpack2 AND ${PACKAGE_NAME}_ENABLE_Amesos2) OR
     (${PACKAGE_NAME}_ENABLE_Epetra AND ${PACKAGE_NAME}_ENABLE_EpetraExt AND ${PACKAGE_NAME}_ENABLE_Ifpack  AND ${PACKAGE_NAME}_ENABLE_Amesos))
 
-  IF(${PACKAGE_NAME}_ENABLE_Galeri)
 
-    TRIBITS_ADD_EXECUTABLE(
-      LevelWrap
-      SOURCES LevelWrap.cpp
-      COMM serial mpi
-      )
-  ENDIF()
+
+  TRIBITS_ADD_EXECUTABLE(
+    LevelWrap
+    SOURCES LevelWrap.cpp
+    COMM serial mpi
+    )
 
 ENDIF()
 
@@ -25,9 +24,9 @@ ENDIF()
 
 INCLUDE(XpetraAddTest)
 
-IF (${PACKAGE_NAME}_ENABLE_Tpetra AND ${PACKAGE_NAME}_ENABLE_Ifpack2 AND ${PACKAGE_NAME}_ENABLE_Amesos2 AND ${PACKAGE_NAME}_ENABLE_Galeri)
+IF (${PACKAGE_NAME}_ENABLE_Tpetra AND ${PACKAGE_NAME}_ENABLE_Ifpack2 AND ${PACKAGE_NAME}_ENABLE_Amesos2)
   XPETRA_ADD_TEST_TPETRA(LevelWrap 4)
 ENDIF()
-IF (${PACKAGE_NAME}_ENABLE_Epetra AND ${PACKAGE_NAME}_ENABLE_Ifpack  AND ${PACKAGE_NAME}_ENABLE_Amesos AND ${PACKAGE_NAME}_ENABLE_Galeri)
+IF (${PACKAGE_NAME}_ENABLE_Epetra AND ${PACKAGE_NAME}_ENABLE_Ifpack  AND ${PACKAGE_NAME}_ENABLE_Amesos)
   XPETRA_ADD_TEST_EPETRA(LevelWrap 4)
 ENDIF()
diff --git a/packages/muelu/example/advanced/memory/CMakeLists.txt b/packages/muelu/example/advanced/memory/CMakeLists.txt
@@ -1,21 +1,21 @@
 
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 
-IF (${PACKAGE_NAME}_ENABLE_Tpetra AND ${PACKAGE_NAME}_ENABLE_Galeri)
+IF (${PACKAGE_NAME}_ENABLE_Tpetra)
   TRIBITS_ADD_EXECUTABLE_AND_TEST(
     MatrixDriver
     SOURCES MueLu_MatrixDriver.cpp
     )
 ENDIF()
 
-IF (${PACKAGE_NAME}_ENABLE_Epetra AND ${PACKAGE_NAME}_ENABLE_Galeri)
+IF (${PACKAGE_NAME}_ENABLE_Epetra)
   TRIBITS_ADD_EXECUTABLE_AND_TEST(
     Epetra1DLaplace
     SOURCES Epetra1DLaplace.cpp MueLu_MemoryProfiler.cpp
     )
 ENDIF()
 
-IF (${PACKAGE_NAME}_ENABLE_Tpetra AND ${PACKAGE_NAME}_ENABLE_Galeri)
+IF (${PACKAGE_NAME}_ENABLE_Tpetra)
   TRIBITS_ADD_EXECUTABLE_AND_TEST(
     Tpetra1DLaplace
     SOURCES Tpetra1DLaplace.cpp MueLu_MemoryProfiler.cpp

diff --git a/packages/muelu/example/advanced/multiplesolve/CMakeLists.txt b/packages/muelu/example/advanced/multiplesolve/CMakeLists.txt
@@ -8,25 +8,24 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../../test/unit_tests)
 IF((${PACKAGE_NAME}_ENABLE_Tpetra  AND ${PACKAGE_NAME}_ENABLE_Ifpack2 AND ${PACKAGE_NAME}_ENABLE_Amesos2) OR
     (${PACKAGE_NAME}_ENABLE_Epetra AND ${PACKAGE_NAME}_ENABLE_EpetraExt AND ${PACKAGE_NAME}_ENABLE_Ifpack  AND ${PACKAGE_NAME}_ENABLE_Amesos))
 
-  IF(${PACKAGE_NAME}_ENABLE_Galeri)
-    TRIBITS_ADD_EXECUTABLE(
-      FixedMatrixPattern
-      SOURCES FixedMatrixPattern.cpp
-      COMM serial mpi
-      )
 
-    TRIBITS_ADD_EXECUTABLE(
-      StandardReuse
-      SOURCES StandardReuse.cpp
-      COMM serial mpi
-      )
+  TRIBITS_ADD_EXECUTABLE(
+    FixedMatrixPattern
+    SOURCES FixedMatrixPattern.cpp
+    COMM serial mpi
+    )
+
+  TRIBITS_ADD_EXECUTABLE(
+    StandardReuse
+    SOURCES StandardReuse.cpp
+    COMM serial mpi
+    )
 
-    TRIBITS_ADD_EXECUTABLE(
-      ReuseSequence
-      SOURCES ReuseSequence.cpp
-      COMM serial mpi
-      )
-  ENDIF()
+  TRIBITS_ADD_EXECUTABLE(
+    ReuseSequence
+    SOURCES ReuseSequence.cpp
+    COMM serial mpi
+    )
 
 ENDIF()
 
@@ -41,7 +40,7 @@ TRIBITS_COPY_FILES_TO_BINARY_DIR(ReuseSequence_cp
 
 INCLUDE(XpetraAddTest)
 
-IF (${PACKAGE_NAME}_ENABLE_Tpetra AND ${PACKAGE_NAME}_ENABLE_Ifpack2 AND ${PACKAGE_NAME}_ENABLE_Amesos2 AND ${PACKAGE_NAME}_ENABLE_Galeri)
+IF (${PACKAGE_NAME}_ENABLE_Tpetra AND ${PACKAGE_NAME}_ENABLE_Ifpack2 AND ${PACKAGE_NAME}_ENABLE_Amesos2)
   XPETRA_ADD_TEST_TPETRA(FixedMatrixPattern 4)
   XPETRA_ADD_TEST_TPETRA(StandardReuse 4)
   TRIBITS_ADD_TEST(
@@ -52,7 +51,7 @@ IF (${PACKAGE_NAME}_ENABLE_Tpetra AND ${PACKAGE_NAME}_ENABLE_Ifpack2 AND ${PACKA
     COMM serial mpi
     )
 ENDIF()
-IF (${PACKAGE_NAME}_ENABLE_Epetra AND ${PACKAGE_NAME}_ENABLE_Ifpack  AND ${PACKAGE_NAME}_ENABLE_Amesos AND ${PACKAGE_NAME}_ENABLE_Galeri)
+IF (${PACKAGE_NAME}_ENABLE_Epetra AND ${PACKAGE_NAME}_ENABLE_Ifpack  AND ${PACKAGE_NAME}_ENABLE_Amesos)
   XPETRA_ADD_TEST_EPETRA(FixedMatrixPattern 4)
   XPETRA_ADD_TEST_EPETRA(StandardReuse 4)
   TRIBITS_ADD_TEST(

diff --git a/packages/muelu/example/advanced/separatesetups/CMakeLists.txt b/packages/muelu/example/advanced/separatesetups/CMakeLists.txt
@@ -1,10 +1,9 @@
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../../test/unit_tests)
 
-IF (${PACKAGE_NAME}_ENABLE_Galeri)
-  TRIBITS_ADD_EXECUTABLE(
-    SeparateSetups
-    SOURCES SeparateSetups.cpp
-    COMM serial mpi
-    )
-ENDIF()
+
+TRIBITS_ADD_EXECUTABLE(
+  SeparateSetups
+  SOURCES SeparateSetups.cpp
+  COMM serial mpi
+  )
diff --git a/packages/muelu/example/basic/CMakeLists.txt b/packages/muelu/example/basic/CMakeLists.txt
@@ -15,76 +15,75 @@ IF (${PACKAGE_NAME}_ENABLE_Epetra AND ${PACKAGE_NAME}_ENABLE_EpetraExt AND ${PAC
   SET(${PACKAGE_NAME}_HAVE_EPETRA_SOLVER_STACK YES)
 ENDIF()
 
-IF (${PACKAGE_NAME}_ENABLE_Galeri)
 
-  IF (${PACKAGE_NAME}_HAVE_TPETRA_SOLVER_STACK)
-    TRIBITS_ADD_EXECUTABLE(
-      Simple
-      SOURCES Simple.cpp
-      COMM serial mpi
-      )
 
-    TRIBITS_ADD_TEST(
-        Simple
-        NAME "SimpleTpetra"
-        ARGS "--linAlgebra=Tpetra --xml=simple.xml"
-        NUM_MPI_PROCS 4
-        COMM mpi # HAVE_MPI required
-        )
-
-      TRIBITS_ADD_TEST(
-        Simple
-        NAME "SimpleTpetraYaml"
-        ARGS "--linAlgebra=Tpetra --yaml=simple.yaml"
-        NUM_MPI_PROCS 4
-        COMM mpi # HAVE_MPI required
-        )
-
-    TRIBITS_COPY_FILES_TO_BINARY_DIR(Simple_cp
-      SOURCE_FILES simple.xml simple.yaml
-      )
+IF (${PACKAGE_NAME}_HAVE_TPETRA_SOLVER_STACK)
+  TRIBITS_ADD_EXECUTABLE(
+    Simple
+    SOURCES Simple.cpp
+    COMM serial mpi
+    )
+
+  TRIBITS_ADD_TEST(
+    Simple
+    NAME "SimpleTpetra"
+    ARGS "--linAlgebra=Tpetra --xml=simple.xml"
+    NUM_MPI_PROCS 4
+    COMM mpi # HAVE_MPI required
+    )
+
+  TRIBITS_ADD_TEST(
+    Simple
+    NAME "SimpleTpetraYaml"
+    ARGS "--linAlgebra=Tpetra --yaml=simple.yaml"
+    NUM_MPI_PROCS 4
+    COMM mpi # HAVE_MPI required
+    )
+
+  TRIBITS_COPY_FILES_TO_BINARY_DIR(Simple_cp
+    SOURCE_FILES simple.xml simple.yaml
+    )
 
-  ENDIF()
+ENDIF()
 
-  #
-  # Stratimikos example
-  #
-  IF(${PACKAGE_NAME}_ENABLE_Stratimikos)
+#
+# Stratimikos example
+#
+IF(${PACKAGE_NAME}_ENABLE_Stratimikos)
 
-    # build executable
-    TRIBITS_ADD_EXECUTABLE(
-      Stratimikos
-      SOURCES Stratimikos.cpp
-      COMM serial mpi
-      )
+  # build executable
+  TRIBITS_ADD_EXECUTABLE(
+    Stratimikos
+    SOURCES Stratimikos.cpp
+    COMM serial mpi
+    )
 
-    TRIBITS_COPY_FILES_TO_BINARY_DIR(advanced_stratimikos_cp
-      SOURCE_FILES stratimikos_ParameterList.xml stratimikos_ParameterList.yaml stratimikos_ParameterList2.xml
-      )
+  TRIBITS_COPY_FILES_TO_BINARY_DIR(advanced_stratimikos_cp
+    SOURCE_FILES stratimikos_ParameterList.xml stratimikos_ParameterList.yaml stratimikos_ParameterList2.xml
+    )
 
-    IF (${PACKAGE_NAME}_HAVE_EPETRA_SOLVER_STACK)
+  IF (${PACKAGE_NAME}_HAVE_EPETRA_SOLVER_STACK)
 
-      TRIBITS_ADD_TEST(
-        Stratimikos
-        NAME Stratimikos
-        ARGS "--xml=stratimikos_ParameterList2.xml --linAlgebra=Epetra"
-        NUM_MPI_PROCS 4
-        COMM serial mpi
-        )
-
-    ENDIF()
+    TRIBITS_ADD_TEST(
+      Stratimikos
+      NAME Stratimikos
+      ARGS "--xml=stratimikos_ParameterList2.xml --linAlgebra=Epetra"
+      NUM_MPI_PROCS 4
+      COMM serial mpi
+      )
 
-    IF (${PACKAGE_NAME}_HAVE_TPETRA_SOLVER_STACK)
+  ENDIF()
 
-      TRIBITS_ADD_TEST(
-        Stratimikos
-        NAME Stratimikos
-        ARGS "--xml=stratimikos_ParameterList2.xml --linAlgebra=Tpetra"
-        NUM_MPI_PROCS 4
-        COMM serial mpi
-        )
+  IF (${PACKAGE_NAME}_HAVE_TPETRA_SOLVER_STACK)
 
-    ENDIF()
+    TRIBITS_ADD_TEST(
+      Stratimikos
+      NAME Stratimikos
+      ARGS "--xml=stratimikos_ParameterList2.xml --linAlgebra=Tpetra"
+      NUM_MPI_PROCS 4
+      COMM serial mpi
+      )
 
   ENDIF()
+
 ENDIF()
diff --git a/packages/muelu/research/tawiesn/aria/CMakeLists.txt b/packages/muelu/research/tawiesn/aria/CMakeLists.txt
@@ -1,7 +1,7 @@
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 
 
-IF (${PACKAGE_NAME}_ENABLE_Galeri)
+
 
   IF ((${PACKAGE_NAME}_ENABLE_Tpetra AND ${PACKAGE_NAME}_ENABLE_Ifpack2 AND ${PACKAGE_NAME}_ENABLE_Amesos2) OR
       (${PACKAGE_NAME}_ENABLE_Epetra AND ${PACKAGE_NAME}_ENABLE_Ifpack  AND ${PACKAGE_NAME}_ENABLE_Amesos))
@@ -17,5 +17,3 @@ IF (${PACKAGE_NAME}_ENABLE_Galeri)
     #   )
 
   ENDIF()
-
-ENDIF() # Galeri
diff --git a/packages/muelu/research/tawiesn/crada/CMakeLists.txt b/packages/muelu/research/tawiesn/crada/CMakeLists.txt
@@ -2,7 +2,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../../test/unit_tests)
 
 
-IF (${PACKAGE_NAME}_ENABLE_Galeri)
+
 
   IF ((${PACKAGE_NAME}_ENABLE_Tpetra AND ${PACKAGE_NAME}_ENABLE_Ifpack2 AND ${PACKAGE_NAME}_ENABLE_Amesos2) OR
       (${PACKAGE_NAME}_ENABLE_Epetra AND ${PACKAGE_NAME}_ENABLE_Ifpack  AND ${PACKAGE_NAME}_ENABLE_Amesos))
@@ -18,5 +18,3 @@ IF (${PACKAGE_NAME}_ENABLE_Galeri)
     #   )
 
   ENDIF()
-
-ENDIF() # Galeri
diff --git a/packages/muelu/src/Interface/MueLu_ParameterListInterpreter_def.hpp b/packages/muelu/src/Interface/MueLu_ParameterListInterpreter_def.hpp
@@ -2241,7 +2241,7 @@ namespace MueLu {
           groupList.remove("group");
 
           bool setKokkosRefactor = false;
-          bool kokkosRefactor;
+          bool kokkosRefactor = useKokkos_;
           if (groupList.isParameter("use kokkos refactor")) {
             kokkosRefactor = groupList.get<bool>("use kokkos refactor");
             groupList.remove("use kokkos refactor");

diff --git a/packages/muelu/test/blockedtransfer/CMakeLists.txt b/packages/muelu/test/blockedtransfer/CMakeLists.txt
@@ -7,8 +7,6 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Smoothers)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../gallery)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../adapters/belos)
 
-IF (${PACKAGE_NAME}_ENABLE_Galeri)
-
 TRIBITS_ADD_EXECUTABLE(
     BlockedTransfer
     SOURCES BlockedTransfer.cpp
@@ -37,8 +35,6 @@ IF (${PACKAGE_NAME}_ENABLE_Tpetra AND ${PACKAGE_NAME}_ENABLE_Ifpack2)
 
 ENDIF()
 
-ENDIF() # Galeri
-
 # first ensure that these cmake boolean variables are defined
 #ASSERT_DEFINED(
 #  ${PACKAGE_NAME}_ENABLE_Epetra