From 5c02b98a26d4fbd538ee29af69e264bb732d68db Mon Sep 17 00:00:00 2001 From: Christian Glusa Date: Wed, 1 Apr 2020 15:13:08 -0600 Subject: [PATCH 1/3] MiniEM: Don't use kokkos refactor code path The new cut based aggregation has not yet been kokkosified. --- .../panzer/mini-em/example/BlockPrec/solverMueLuRefMaxwell.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/panzer/mini-em/example/BlockPrec/solverMueLuRefMaxwell.xml b/packages/panzer/mini-em/example/BlockPrec/solverMueLuRefMaxwell.xml index 1de395d0a26d..78f8831f04d2 100644 --- a/packages/panzer/mini-em/example/BlockPrec/solverMueLuRefMaxwell.xml +++ b/packages/panzer/mini-em/example/BlockPrec/solverMueLuRefMaxwell.xml @@ -145,6 +145,7 @@ + @@ -192,6 +193,7 @@ + @@ -245,6 +247,7 @@ + From cba550d08de9fa59ceee76c328a086750f390f17 Mon Sep 17 00:00:00 2001 From: Chris Siefert Date: Wed, 1 Apr 2020 15:17:05 -0600 Subject: [PATCH 2/3] TrilinosCouplings: Adding coordinate dump option to Tpetra Poisson example --- .../IntrepidPoisson_Pamgen_Tpetra_main.cpp | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/packages/trilinoscouplings/examples/scaling/IntrepidPoisson_Pamgen_Tpetra_main.cpp b/packages/trilinoscouplings/examples/scaling/IntrepidPoisson_Pamgen_Tpetra_main.cpp index 41e51a56981e..90ceb10b7e79 100644 --- a/packages/trilinoscouplings/examples/scaling/IntrepidPoisson_Pamgen_Tpetra_main.cpp +++ b/packages/trilinoscouplings/examples/scaling/IntrepidPoisson_Pamgen_Tpetra_main.cpp @@ -180,6 +180,12 @@ main (int argc, char *argv[]) cmdp.setOption ("matrixFilename", &matrixFilename, "If nonempty, dump the " "generated matrix to that file in MatrixMarket format."); + // If coordsFilename is nonempty, dump the coords to that file + // in MatrixMarket format. + std::string coordsFilename; + cmdp.setOption ("coordsFilename", &coordsFilename, "If nonempty, dump the " + "generated coordinates to that file in MatrixMarket format."); + // If rowMapFilename is nonempty, dump the matrix's row Map to // that file in MatrixMarket format. std::string rowMapFilename; @@ -191,8 +197,8 @@ main (int argc, char *argv[]) bool exitAfterAssembly = false; cmdp.setOption ("exitAfterAssembly", "dontExitAfterAssembly", &exitAfterAssembly, "If true, exit after building the " - "sparse matrix and dense right-hand side vector. If either" - " --matrixFilename or --rowMapFilename are nonempty strings" + "sparse matrix and dense right-hand side vector. If " + " --matrixFilename --coordsFilename or --rowMapFilename are nonempty strings" ", dump the matrix resp. row Map to their respective files " "before exiting."); @@ -202,9 +208,7 @@ main (int argc, char *argv[]) &exitAfterPrecond, "If true, exit after building the " "preconditioner."); - - // If matrixFilename is nonempty, dump the matrix to that file - // in MatrixMarket format. + // Number of rebuilds of the MueLu hierarchy int numMueluRebuilds=0; cmdp.setOption ("rebuild", &numMueluRebuilds, "Number of times to rebuild the MueLu hierarchy."); @@ -280,6 +284,9 @@ main (int argc, char *argv[]) if (matrixFilename != "") { writer_type::writeSparseFile (matrixFilename, A); } + if (coordsFilename != "") { + writer_type::writeDenseFile (coordsFilename, coords); + } if (rowMapFilename != "") { writer_type::writeMapFile (rowMapFilename, * (A->getRowMap ())); } From b66774225001c0214f20f08eb9d6d73bbe35ceef Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Wed, 1 Apr 2020 18:01:42 -0600 Subject: [PATCH 3/3] cts1, tlcc2: Switch from Ninja to Unix Makefiles (#7094, ATDV-328) For some reason, this seems to fix the compiler check on CTS-1 and TLCC-2 systems. Something happened between testing day 2020-03-27 and 2020-03-28 to break this. This is just a stop-gap measure to address this until we can see how to fix the configure with the Ninja generator. --- cmake/std/atdm/common/toss3/environment_new.sh | 2 +- cmake/std/atdm/common/toss3/environment_tlcc2.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/std/atdm/common/toss3/environment_new.sh b/cmake/std/atdm/common/toss3/environment_new.sh index 7577f41c60fc..e0cbd02ab66c 100755 --- a/cmake/std/atdm/common/toss3/environment_new.sh +++ b/cmake/std/atdm/common/toss3/environment_new.sh @@ -9,7 +9,7 @@ echo "Using $ATDM_CONFIG_SYSTEM_NAME toss3 compiler stack $ATDM_CONFIG_COMPILER to build $ATDM_CONFIG_BUILD_TYPE code with Kokkos node type $ATDM_CONFIG_NODE_TYPE" export ATDM_CONFIG_ENABLE_SPARC_SETTINGS=ON -export ATDM_CONFIG_USE_NINJA=ON +export ATDM_CONFIG_USE_NINJA=OFF export ATDM_CONFIG_BUILD_COUNT=8 # export ATDM_CONFIG_CMAKE_JOB_POOL_LINK=2 # NOTE: Above, currently setting CMAKE_JOB_POOL_LINK results in a build diff --git a/cmake/std/atdm/common/toss3/environment_tlcc2.sh b/cmake/std/atdm/common/toss3/environment_tlcc2.sh index 702b638c7c78..484ffa80c7f3 100755 --- a/cmake/std/atdm/common/toss3/environment_tlcc2.sh +++ b/cmake/std/atdm/common/toss3/environment_tlcc2.sh @@ -12,7 +12,7 @@ fi echo "Using toss3 compiler stack $ATDM_CONFIG_COMPILER to build $ATDM_CONFIG_BUILD_TYPE code with Kokkos node type $ATDM_CONFIG_NODE_TYPE" -export ATDM_CONFIG_USE_NINJA=ON +export ATDM_CONFIG_USE_NINJA=OFF export ATDM_CONFIG_BUILD_COUNT=8 # export ATDM_CONFIG_CMAKE_JOB_POOL_LINK=2 # NOTE: Above, currently setting CMAKE_JOB_POOL_LINK results in a build