From 79d60f276e1cf93dbb30960a568474bf7a4de26d Mon Sep 17 00:00:00 2001 From: Chris Siefert Date: Thu, 18 Apr 2024 11:29:47 -0600 Subject: [PATCH] Tpetra: Mods for perf tracking on amber/roci --- .../test/PerformanceCGSolve/CMakeLists.txt | 38 ++++++++++++++++++- .../test/PerformanceCGSolve/cg_solve_file.cpp | 5 +++ 2 files changed, 42 insertions(+), 1 deletion(-) diff --git a/packages/tpetra/core/test/PerformanceCGSolve/CMakeLists.txt b/packages/tpetra/core/test/PerformanceCGSolve/CMakeLists.txt index 27b6f90df68b..145d821ea4be 100644 --- 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 index 554748047727..3011db577316 100644 --- 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 = "< x (new vec_type (A->getDomainMap ()));