Adds run_benchmarks CMake target and adapt existing test to be a benchmark

scripts/llnl/build_devtools.py

@@ -18,8 +18,6 @@
 
 from argparse import ArgumentParser
 
-import os
-
 
 def parse_args():
     "Parses args from command line"

scripts/llnl/common_build_functions.py

@@ -676,6 +676,10 @@ def get_shared_libs_dir():
     return pjoin(get_shared_base_dir(), "libs", get_project_name())
 
 
+def get_shared_spot_dir():
+    return pjoin(get_shared_base_dir(), "califiles")
+
+
 def get_uberenv_path():
     return pjoin(get_script_dir(), "../uberenv/uberenv.py")
 

src/serac/infrastructure/tests/profiling.cpp

@@ -47,6 +47,8 @@ TEST(Profiling, MeshRefinement)
     pmesh->UniformRefinement();
   }
 
+  // Add metadata
+  SERAC_SET_METADATA("test", "profiling");
   SERAC_SET_METADATA("mesh_file", mesh_file.c_str());
   SERAC_SET_METADATA("number_mesh_elements", pmesh->GetNE());
 

src/serac/physics/benchmarks/CMakeLists.txt

@@ -6,14 +6,26 @@
 
 set(benchmark_depends serac_physics)
 
-blt_add_executable(NAME benchmark_thermal
-                   SOURCES benchmark_thermal.cpp
-                   DEPENDS_ON ${benchmark_depends}
-                   OUTPUT_DIR ${PROJECT_BINARY_DIR}/benchmarks
-                   FOLDER serac/benchmarks)
+set(benchmark_targets
+    benchmark_functional
+    benchmark_solid_nonlinear_solve
+    benchmark_thermal
+    )
 
-blt_add_executable(NAME benchmark_functional
-                   SOURCES benchmark_functional.cpp
-                   DEPENDS_ON ${benchmark_depends}
-                   OUTPUT_DIR ${PROJECT_BINARY_DIR}/benchmarks
-                   FOLDER serac/benchmarks)
+# Create executable for each benchmark
+foreach(benchmark ${benchmark_targets})
+    blt_add_executable(NAME ${benchmark}
+                       SOURCES ${benchmark}.cpp
+                       DEPENDS_ON ${benchmark_depends}
+                       OUTPUT_DIR ${PROJECT_BINARY_DIR}/benchmarks
+                       FOLDER serac/benchmarks
+                       )
+
+    # Add benchmarks with various task counts
+    foreach(task_count 1 4 16)
+        blt_add_benchmark(NAME ${benchmark}_${task_count}_task_count
+                          COMMAND ${benchmark}
+                          NUM_MPI_TASKS ${task_count}
+                          )
+    endforeach()
+endforeach()

src/serac/physics/benchmarks/benchmark_functional.cpp

@@ -86,6 +86,9 @@ int main(int argc, char* argv[])
   // Initialize profiling
   serac::profiling::initialize();
 
+  // Add metadata
+  SERAC_SET_METADATA("test", "functional");
+
   SERAC_MARK_BEGIN("scalar H1");
 
   SERAC_MARK_BEGIN("dimension 2, order 1");

src/serac/physics/tests/solid_nonlinear_solve.cpp → src/serac/physics/benchmarks/benchmark_solid_nonlinear_solve.cpp

@@ -14,7 +14,6 @@
 #include <algorithm>
 
 #include "axom/slic/core/SimpleLogger.hpp"
-#include <gtest/gtest.h>
 #include "mfem.hpp"
 
 #include "serac/physics/materials/liquid_crystal_elastomer.hpp"
@@ -48,10 +47,7 @@ enum NonlinSolve
   TRUSTREGION
 };
 
-NonlinSolve nonlinSolve = NonlinSolve::TRUSTREGION;
-Prec        prec        = Prec::JACOBI;
-
-auto get_opts(int max_iters, double abs_tol = 1e-9)
+auto get_opts(NonlinSolve nonlinSolve, Prec prec, int max_iters, double abs_tol = 1e-9)
 {
   serac::NonlinearSolverOptions nonlinear_options{
       .nonlin_solver = NonlinearSolver::TrustRegion,
@@ -160,7 +156,7 @@ auto get_opts(int max_iters, double abs_tol = 1e-9)
 #include <ostream>
 #include <fstream>
 
-void functional_solid_test_euler()
+void functional_solid_test_euler(NonlinSolve nonlinSolve, Prec prec)
 {
   // initialize serac
   axom::sidre::DataStore datastore;
@@ -192,7 +188,7 @@ void functional_solid_test_euler()
   // solid mechanics
   using seracSolidType = serac::SolidMechanics<ORDER, DIM, serac::Parameters<>>;
 
-  auto [nonlinear_options, linear_options] = get_opts(3 * Nx * Ny * Nz, 1e-9);
+  auto [nonlinear_options, linear_options] = get_opts(nonlinSolve, prec, 3 * Nx * Ny * Nz, 1e-9);
 
   auto seracSolid = std::make_unique<seracSolidType>(
       nonlinear_options, linear_options, serac::solid_mechanics::default_quasistatic_options,
@@ -224,7 +220,7 @@ void functional_solid_test_euler()
   }
 }
 
-void functional_solid_test_nonlinear_buckle(double loadMagnitude)
+void functional_solid_test_nonlinear_buckle(NonlinSolve nonlinSolve, Prec prec, double loadMagnitude)
 {
   // initialize serac
   axom::sidre::DataStore datastore;
@@ -258,7 +254,7 @@ void functional_solid_test_nonlinear_buckle(double loadMagnitude)
   // solid mechanics
   using seracSolidType = serac::SolidMechanics<ORDER, DIM, serac::Parameters<>>;
 
-  auto [nonlinear_options, linear_options] = get_opts(3 * Nx * Ny * Nz, 1e-11);
+  auto [nonlinear_options, linear_options] = get_opts(nonlinSolve, prec, 3 * Nx * Ny * Nz, 1e-11);
 
   auto seracSolid = std::make_unique<seracSolidType>(
       nonlinear_options, linear_options, serac::solid_mechanics::default_quasistatic_options,
@@ -280,30 +276,33 @@ void functional_solid_test_nonlinear_buckle(double loadMagnitude)
   seracSolid->outputStateToDisk("paraview_buckle_easy");
 }
 
-TEST(SolidMechanics, nonlinear_solve_buckle_easy) { functional_solid_test_nonlinear_buckle(5e-10); }
-// TEST(SolidMechanics, nonlinear_solve_buckle_medium) { functional_solid_test_nonlinear_buckle(4e-4); }
-// TEST(SolidMechanics, nonlinear_solve_buckle_hard) { functional_solid_test_nonlinear_buckle(3e-2); }
-// TEST(SolidMechanics, nonlinear_solve_euler) { functional_solid_test_euler(); }
-
 int main(int argc, char* argv[])
 {
-  axom::CLI::App app{"Nonlinear problems"};
-  // app.add_option("-p", mesh_path, "Path to mesh files")->check(axom::CLI::ExistingDirectory);
-  app.add_option("--nonlinear-solver", nonlinSolve, "Nonlinear solver", true);
-  app.add_option("--preconditioner", prec, "Preconditioner", true);
-  app.set_help_flag("--help");
-  app.allow_extras()->parse(argc, argv);
-
-  ::testing::InitGoogleTest(&argc, argv);
-
   serac::initialize(argc, argv);
 
   SERAC_SET_METADATA("test", "solid_nonlinear_solve");
-  SERAC_SET_METADATA("nonlinear solver", std::to_string(nonlinSolve));
-  SERAC_SET_METADATA("preconditioner", std::to_string(prec));
 
-  int result = RUN_ALL_TESTS();
-  serac::exitGracefully(result);
+  // TODO add commandline options. if there set, run with those options only. otherwise, run the options below:
+
+  SERAC_MARK_BEGIN("Jacobi Preconditioner");
+  functional_solid_test_nonlinear_buckle(NonlinSolve::NEWTON, Prec::JACOBI, 5e-10);
+  SERAC_MARK_END("Jacobi Preconditioner");
+
+  SERAC_MARK_BEGIN("Multigrid Preconditioner");
+  functional_solid_test_nonlinear_buckle(NonlinSolve::NEWTON, Prec::MULTIGRID, 5e-10);
+  SERAC_MARK_END("Multigrid Preconditioner");
+
+  SERAC_MARK_BEGIN("Petsc Multigrid Preconditioner");
+  functional_solid_test_nonlinear_buckle(NonlinSolve::NEWTON, Prec::PETSC_MULTIGRID, 5e-10);
+  SERAC_MARK_END("Petsc Multigrid Preconditioner");
+
+  // functional_solid_test_nonlinear_buckle(4e-4);
+  // functional_solid_test_nonlinear_buckle(3e-2);
+  // functional_solid_test_euler();
+
+  serac::profiling::finalize();
+
+  MPI_Finalize();
 
-  return result;
+  return 0;
 }

src/serac/physics/tests/CMakeLists.txt

@@ -39,7 +39,6 @@ set(physics_parallel_test_sources
     dynamic_thermal_adjoint.cpp
     solid_reaction_adjoint.cpp
     thermal_nonlinear_solve.cpp
-    solid_nonlinear_solve.cpp
     )
 blt_list_append(TO physics_parallel_test_sources ELEMENTS contact_patch.cpp contact_beam.cpp IF TRIBOL_FOUND)