Tpetra: Mods for perf tracking on amber/roci

trilinos · Apr 18, 2024 · 79d60f2 · 79d60f2
1 parent a28cd86
commit 79d60f2
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 1 deletion.
diff --git a/packages/tpetra/core/test/PerformanceCGSolve/CMakeLists.txt b/packages/tpetra/core/test/PerformanceCGSolve/CMakeLists.txt
@@ -47,7 +47,6 @@ IF (Tpetra_INST_DOUBLE)
     )
 
     TRIBITS_ADD_TEST(
-
       Performance-CGSolve
       NAME Performance_StrongScaling_CGSolve
       ARGS "--size=200"
@@ -69,6 +68,43 @@ IF (Tpetra_INST_DOUBLE)
       CATEGORIES PERFORMANCE
     )
 
+    TRIBITS_ADD_TEST(
+      Performance-CGSolve
+      NAME Performance_StrongScaling_CGSolve
+      ARGS "--size=200"
+      COMM mpi
+      NUM_MPI_PROCS 25
+      STANDARD_PASS_OUTPUT
+      RUN_SERIAL
+      CATEGORIES PERFORMANCE
+    )
+
+    # For big machines
+
+    TRIBITS_ADD_TEST(
+      Performance-CGSolve
+      NAME Performance_StrongScaling_CGSolve
+      ARGS "--size=200"
+      COMM mpi
+      NUM_MPI_PROCS 81
+      STANDARD_PASS_OUTPUT
+      RUN_SERIAL
+      CATEGORIES PERFORMANCE
+    )
+
+    TRIBITS_ADD_TEST(
+      Performance-CGSolve
+      NAME Performance_StrongScaling_CGSolve
+      ARGS "--size=200"
+      COMM mpi
+      NUM_MPI_PROCS 100
+      STANDARD_PASS_OUTPUT
+      RUN_SERIAL
+      CATEGORIES PERFORMANCE
+    )
+
+
+
     IF (Tpetra_ENABLE_CUDA)
         MESSAGE(STATUS "Tpetra: Performance-CGSolve CUDA_LAUNCH_BLOCKING test ENABLED")
 

diff --git a/packages/tpetra/core/test/PerformanceCGSolve/cg_solve_file.cpp b/packages/tpetra/core/test/PerformanceCGSolve/cg_solve_file.cpp
@@ -258,6 +258,11 @@ int run()
     b = gen_type::generate_miniFE_vector (nsize, map->getComm ());
   }
 
+  // Output the problem size
+  Tpetra::global_size_t ng = map->getGlobalNumElements();  
+  if(!myRank)
+    std::cout<<"Global matrix size = "<<ng<<std::endl;
+
   // The vector x on input is the initial guess for the CG solve.
   // On output, it is the approximate solution.
   RCP<vec_type> x (new vec_type (A->getDomainMap ()));