Skip to content

Commit

Permalink
Merge Pull Request #8911 from brian-kelley/Trilinos/MiniEMTestName
Browse files Browse the repository at this point in the history
Automatically Merged using Trilinos Pull Request AutoTester
PR Title: MiniEM: add test-name param to BlockPrec
PR Author: brian-kelley
  • Loading branch information
trilinos-autotester authored Mar 22, 2021
2 parents 6a2a5ae + e39a8aa commit 66da8ac
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion packages/panzer/mini-em/example/BlockPrec/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ TRIBITS_ADD_TEST(
TRIBITS_ADD_TEST(
BlockPrec
NAME "MiniEM-BlockPrec_RefMaxwell_Performance_16_reuse"
ARGS "--stacked-timer --solver=MueLu-RefMaxwell --numTimeSteps=20 --linAlgebra=Tpetra --inputFile=maxwell-large.xml --resetSolver"
ARGS "--stacked-timer --solver=MueLu-RefMaxwell --numTimeSteps=20 --linAlgebra=Tpetra --inputFile=maxwell-large.xml --resetSolver --test-name=\"MiniEM 3D RefMaxwell Reuse\""
COMM mpi
NUM_MPI_PROCS 16
CATEGORIES PERFORMANCE
Expand Down
4 changes: 3 additions & 1 deletion packages/panzer/mini-em/example/BlockPrec/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ int main_(Teuchos::CommandLineProcessor &clp, int argc,char * argv[])

Teuchos::RCP<Teuchos::StackedTimer> stacked_timer;
bool use_stacked_timer;
std::string test_name = "MiniEM 3D RefMaxwell";

{
// defaults for command-line options
Expand Down Expand Up @@ -179,6 +180,7 @@ int main_(Teuchos::CommandLineProcessor &clp, int argc,char * argv[])
clp.setOption("resetSolver","no-resetSolver",&resetSolver,"update the solver in every timestep");
clp.setOption("doSolveTimings","no-doSolveTimings",&doSolveTimings,"repeat the first solve \"numTimeSteps\" times");
clp.setOption("stacked-timer","no-stacked-timer",&use_stacked_timer,"Run with or without stacked timer output");
clp.setOption("test-name", &test_name, "Name of test (for Watchr output)");

// parse command-line argument
clp.recogniseAllOptions(true);
Expand Down Expand Up @@ -732,7 +734,7 @@ int main_(Teuchos::CommandLineProcessor &clp, int argc,char * argv[])
Teuchos::StackedTimer::OutputOptions options;
options.output_fraction = options.output_histogram = options.output_minmax = true;
stacked_timer->report(*out, comm, options);
auto xmlOut = stacked_timer->reportWatchrXML(std::string("MiniEM 3D RefMaxwell ") + std::to_string(comm->getSize()) + " ranks", comm);
auto xmlOut = stacked_timer->reportWatchrXML(test_name + ' ' + std::to_string(comm->getSize()) + " ranks", comm);
if(xmlOut.length())
std::cout << "\nAlso created Watchr performance report " << xmlOut << '\n';
} else
Expand Down

0 comments on commit 66da8ac

Please sign in to comment.