Merge pull request #464 from PrincetonUniversity/issue-398

Issue 398 - Implement dynamic testing

Author: lsawade

.jenkins/gnu_compiler_checks.gvy

@@ -25,7 +25,7 @@ pipeline{
                     }
                     axis{
                         name 'HostSpace'
-                        values 'SERIAL;-DKokkos_ENABLE_SERIAL=ON -DKokkos_ENABLE_ATOMICS_BYPASS=ON;-n 1', 'OPENMP;-DKokkos_ENABLE_OPENMP=ON;-n 10'
+                        values 'SERIAL;-DKokkos_ENABLE_SERIAL=ON -DKokkos_ENABLE_ATOMICS_BYPASS=ON;-n 1', 'OPENMP;-DKokkos_ENABLE_OPENMP=ON;-n 1 -c 10'
                     }
                 }
                 stages {

.jenkins/intel_compiler_checks.gvy

@@ -21,7 +21,7 @@ pipeline{
                     }
                     axis{
                         name 'HostSpace'
-                        values 'SERIAL;-DKokkos_ENABLE_SERIAL=ON -DKokkos_ENABLE_ATOMICS_BYPASS=ON;-n 1', 'OPENMP;-DKokkos_ENABLE_OPENMP=ON;-n 10'
+                        values 'SERIAL;-DKokkos_ENABLE_SERIAL=ON -DKokkos_ENABLE_ATOMICS_BYPASS=ON;-n 1', 'OPENMP;-DKokkos_ENABLE_OPENMP=ON;-n 1 -c 10'
                     }
                     axis{
                         name 'SIMD'

.jenkins/nvidia_compiler_checks.gvy

@@ -21,7 +21,7 @@ pipeline{
                     }
                     axis{
                         name 'HostSpace'
-                        values 'SERIAL;-DKokkos_ENABLE_SERIAL=ON;-n 1', 'OPENMP;-DKokkos_ENABLE_OPENMP=ON;-n 10'
+                        values 'SERIAL;-DKokkos_ENABLE_SERIAL=ON;-n 1', 'OPENMP;-DKokkos_ENABLE_OPENMP=ON; -n 1 -c 10'
                     }
                     axis{
                         name 'DeviceSpace'

CMakePresets.json

@@ -1,26 +1,43 @@
 {
   "version": 6,
   "configurePresets": [
+    {
+      "name": "release",
+      "displayName": "Default Release -- SIMD enabled",
+      "binaryDir": "build/release",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Release",
+        "BUILD_TESTS": "ON",
+        "ENABLE_SIMD": "ON",
+        "Kokkos_ARCH_NATIVE": "ON",
+        "Kokkos_ENABLE_AGGRESSIVE_VECTORIZATION": "ON",
+        "Kokkos_ENABLE_ATOMICS_BYPASS": "ON"
+      }
+    },
     {
       "name": "debug",
-      "displayName": "Debug (Serial)",
+      "displayName": "Default Debug -- SIMD enabled",
       "binaryDir": "build/debug",
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "Debug",
         "BUILD_TESTS": "ON",
-        "ENABLE_SIMD": "OFF",
+        "ENABLE_SIMD": "ON",
         "Kokkos_ARCH_NATIVE": "ON",
         "Kokkos_ENABLE_AGGRESSIVE_VECTORIZATION": "ON",
         "Kokkos_ENABLE_ATOMICS_BYPASS": "ON"
       }
     }
   ],
   "buildPresets": [
+    {
+      "name": "release",
+      "configurePreset": "release",
+      "targets": ["all"]
+    },
     {
       "name": "debug",
       "configurePreset": "debug",
-      "targets": ["all"],
-      "jobs": 8
+      "targets": ["all"]
     }
   ]
 }

fortran/meshfem3d/generate_databases/save_parameters.f90

@@ -5,7 +5,7 @@ subroutine save_parameters()
   use shared_parameters, only: LOCAL_PATH, MAX_STRING_LEN
 
   use generate_databases_par, only: &
-    IOUT, myrank, &
+    IOUT, myrank, sizeprocs, &
     NDIM, NSPEC_AB, NGLOB_AB, &
     NGLLX, NGLLY, NGLLZ, nfaces_surface, num_neighbors_all, NGLLSQUARE, &
     nspec2D_xmin, nspec2D_xmin, nspec2D_ymin, nspec2D_ymin, &
@@ -69,6 +69,7 @@ subroutine save_parameters()
       WRITE(IOUT) NGLLY
       WRITE(IOUT) NGLLZ
       WRITE(IOUT) NGLLSQUARE
+      WRITE(IOUT) sizeprocs
 
       ! Write test parameter
       itest = 9997

include/mesh/mesh.hpp

@@ -108,6 +108,7 @@ template <> struct mesh<specfem::dimension::type::dim3> {
   // Struct to store all the mesh parameter
   specfem::mesh::parameters<dimension> parameters;
 
+  //
   // int npgeo; ///< Total number of spectral element control nodes
   // int nspec; ///< Total number of spectral elements
   // int nproc; ///< Total number of processors

include/mesh/parameters/parameters.hpp

@@ -101,6 +101,7 @@ template <> struct parameters<specfem::dimension::type::dim3> {
   int nglly;      ///< Number of GLL points in y
   int ngllz;      ///< Number of GLL points in z
   int ngllsquare; ///< Number of GLL points in square
+  int nproc;      ///< Number of processors
 
   // Integer Parameters: Elements/Nodes
   int nspec;           ///< Number of spectral elements (SEs)

src/IO/mesh/impl/fortran/dim3/read_parameters.cpp

@@ -73,13 +73,15 @@ specfem::IO::mesh::impl::fortran::dim3::read_mesh_parameters(
   int ngly;
   int ngllz;
   int ngllsquare;
+  int nproc;
 
   // Read parameters
   specfem::IO::fortran_read_line(stream, &ndim);
   specfem::IO::fortran_read_line(stream, &ngllx);
   specfem::IO::fortran_read_line(stream, &ngly);
   specfem::IO::fortran_read_line(stream, &ngllz);
   specfem::IO::fortran_read_line(stream, &ngllsquare);
+  specfem::IO::fortran_read_line(stream, &nproc);
 
 #ifndef NDEBUG
   // Print the read parameters
@@ -88,6 +90,7 @@ specfem::IO::mesh::impl::fortran::dim3::read_mesh_parameters(
   std::cout << "ngly:................." << ngly << std::endl;
   std::cout << "ngllz:................" << ngllz << std::endl;
   std::cout << "ngllsquare:..........." << ngllsquare << std::endl;
+  std::cout << "nproc:................" << nproc << std::endl;
 #endif
 
   // Read test parameter

tests/unit-tests/CMakeLists.txt

@@ -18,6 +18,12 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/tests/unit-tests)
 
 include_directories(.)
 
+set(TEST_DIR ${CMAKE_CURRENT_SOURCE_DIR})
+
+# Some of the writing test need to write somewhere and we don't want that
+# to be in the source directory
+set(TEST_OUTPUT_DIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
+
 enable_testing()
 
 add_library(
@@ -58,6 +64,7 @@ add_executable(
   gll_tests
   gll/gll_tests.cpp
 )
+
 target_link_libraries(
   gll_tests
   gtest_main
@@ -203,6 +210,7 @@ add_executable(
   assembly/sources/sources.cpp
 )
 
+target_compile_definitions(assembly_tests PRIVATE TEST_OUTPUT_DIR=${TEST_OUTPUT_DIR})
 
 target_link_libraries(
   assembly_tests
@@ -423,22 +431,22 @@ target_link_libraries(
 # Link to gtest only if MPI is enabled
 if (NOT MPI_PARALLEL)
   include(GoogleTest)
-  gtest_discover_tests(gll_tests)
-  gtest_discover_tests(lagrange_tests)
-  gtest_discover_tests(fortranio_test)
-  gtest_discover_tests(IO_tests)
-  gtest_discover_tests(mesh_tests)
-  gtest_discover_tests(compute_partial_derivatives_tests)
-  # gtest_discover_tests(compute_elastic_tests)
-  # # gtest_discover_tests(compute_acoustic_tests)
-  # gtest_discover_tests(compute_coupled_interfaces_tests)
-  gtest_discover_tests(compute_tests)
-  gtest_discover_tests(assembly_tests)
-  gtest_discover_tests(policies)
-  gtest_discover_tests(locate_point)
-  gtest_discover_tests(interpolate_function)
-  gtest_discover_tests(rmass_inverse_tests)
-  gtest_discover_tests(displacement_newmark_tests)
+  gtest_discover_tests(gll_tests WORKING_DIRECTORY ${TEST_DIR})
+  gtest_discover_tests(lagrange_tests WORKING_DIRECTORY ${TEST_DIR})
+  gtest_discover_tests(fortranio_test WORKING_DIRECTORY ${TEST_DIR})
+  gtest_discover_tests(IO_tests WORKING_DIRECTORY ${TEST_DIR})
+  gtest_discover_tests(mesh_tests WORKING_DIRECTORY ${TEST_DIR})
+  gtest_discover_tests(compute_partial_derivatives_tests WORKING_DIRECTORY ${TEST_DIR})
+  # gtest_discover_tests(compute_elastic_tests WORKING_DIRECTORY ${TEST_DIR})
+  # # gtest_discover_tests(compute_acoustic_tests WORKING_DIRECTORY ${TEST_DIR})
+  # gtest_discover_tests(compute_coupled_interfaces_tests WORKING_DIRECTORY ${TEST_DIR})
+  gtest_discover_tests(compute_tests WORKING_DIRECTORY ${TEST_DIR})
+  gtest_discover_tests(assembly_tests WORKING_DIRECTORY ${TEST_DIR})
+  gtest_discover_tests(policies WORKING_DIRECTORY ${TEST_DIR})
+  gtest_discover_tests(locate_point WORKING_DIRECTORY ${TEST_DIR})
+  gtest_discover_tests(interpolate_function WORKING_DIRECTORY ${TEST_DIR})
+  gtest_discover_tests(rmass_inverse_tests WORKING_DIRECTORY ${TEST_DIR})
+  gtest_discover_tests(displacement_newmark_tests WORKING_DIRECTORY ${TEST_DIR})
   # gtest_discover_tests(seismogram_elastic_tests)
   # gtest_discover_tests(seismogram_acoustic_tests)
 endif(NOT MPI_PARALLEL)

tests/unit-tests/IO/sources/test_read_sources.cpp

@@ -12,8 +12,7 @@ TEST(IO_TESTS, read_sources) {
    *  This test checks whether a moment tensor source is read correctly
    */
 
-  std::string sources_file =
-      "../../../tests/unit-tests/IO/sources/data/single_moment_tensor.yml";
+  std::string sources_file = "IO/sources/data/single_moment_tensor.yml";
 
   YAML::Node databases;
   databases["sources"] = sources_file;