Merge pull request #106 from lanl/rberger/add_venado

Add Venado testing

.gitlab-ci.yml

@@ -53,24 +53,52 @@ prereq_offline_deps:
 
 openmpi_gcc:
   extends: [.ascgit_job, .darwin_job, .darwin_regular_job, .build_and_test]
+  needs:
+   - prereq_offline_deps
   variables:
     SPACK_ENV_NAME: openmpi-gcc
     SUBMIT_TO_CDASH: "${ENABLE_CDASH}"
 
 openmpi_cuda_gcc_volta:
   extends: [.ascgit_job, .darwin_job, .darwin_regular_job, .build_and_test]
+  needs:
+   - prereq_offline_deps
   variables:
     SPACK_ENV_NAME: openmpi-cuda-gcc-volta
     SCHEDULER_PARAMETERS: "-N 1 --qos=debug -p volta-x86 -C cpu_family:haswell --time=02:00:00"
     SUBMIT_TO_CDASH: "${ENABLE_CDASH}"
 
 openmpi_cuda_gcc_ampere:
   extends: [.ascgit_job, .darwin_job, .darwin_regular_job, .build_and_test]
+  needs:
+   - prereq_offline_deps
   variables:
     SPACK_ENV_NAME: openmpi-cuda-gcc-ampere
     SCHEDULER_PARAMETERS: "-N 1 --qos=debug -p shared-gpu-ampere"
     SUBMIT_TO_CDASH: "${ENABLE_CDASH}"
 
+venado_craympich_cuda_gracehopper_gcc:
+  extends: [.ascgit_job, .venado_job, .venado_regular_job, .build_and_test]
+  needs:
+   - prereq_offline_deps
+  variables:
+    SPACK_ENV_NAME: craympich-cuda-gracehopper-gcc
+    SUBMIT_TO_CDASH: false
+    BUILD_WITH_CTEST: "${ENABLE_CDASH}"
+    SUBMIT_ON_ERROR: false          # Venado nodes don't have network access, don't try to send from compute node
+    SUBMIT_AFTER: "${ENABLE_CDASH}" # after_script runs on a network connected system
+
+venado_craympich_cuda_gracehopper_nvhpc:
+  extends: [.ascgit_job, .venado_job, .venado_regular_job, .build_and_test]
+  needs:
+   - prereq_offline_deps
+  variables:
+    SPACK_ENV_NAME: craympich-cuda-gracehopper-nvhpc
+    SUBMIT_TO_CDASH: false
+    BUILD_WITH_CTEST: "${ENABLE_CDASH}"
+    SUBMIT_ON_ERROR: false          # Venado nodes don't have network access, don't try to send from compute node
+    SUBMIT_AFTER: "${ENABLE_CDASH}" # after_script runs on a network connected system
+
 rzansel_spectrummpi_cuda_volta_gcc:
   extends: [.ascgit_job, .rzansel_job, .rzansel_regular_job, .build_and_test]
   needs:

CMakeLists.txt

@@ -119,6 +119,11 @@ if(SPINER_USE_HDF)
   target_compile_definitions(spiner INTERFACE SPINER_USE_HDF)
 endif()
 
+if(SPINER_BUILD_TESTS)
+  message(STATUS "\nConfiguring tests")
+  add_subdirectory(test)
+endif()
+
 spiner_content_populate(NAMESPACE spinerDeps)
 
 # We don't know about this until HDF5 is populated, so we need to delay until
@@ -143,11 +148,6 @@ target_link_libraries(spiner INTERFACE ${spinerDeps_POPULATED_TARGETS}
 target_include_directories(
   spiner INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
                    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
-# Option imported from `CTest`
-if(SPINER_BUILD_TESTS)
-  message(STATUS "\nConfiguring tests")
-  add_subdirectory(test)
-endif()
 
 # ----------------------------------------------------------------------------#
 # Generate config settings

cmake/content.cmake

@@ -104,7 +104,7 @@ macro(spiner_content_declare pkg_name)
   # return some info
 
   list(APPEND ${fp_NAMESPACE}_DECLARED_EXTERNAL_CONTENT ${pkg_name})
-  set(${fp_NAMESPACE}_DECLARED_EXTERNAL_${pkg_CAP}_COMPONETS ${fp_COMPONENTS})
+  set(${fp_NAMESPACE}_DECLARED_EXTERNAL_${pkg_CAP}_COMPONENTS ${fp_COMPONENTS})
   set(${fp_NAMESPACE}_DECLARED_EXTERNAL_${pkg_CAP}_ENABLEOPTS ${fp_ENABLE_OPTS})
   set(${fp_NAMESPACE}_DECLARED_EXTERNAL_${pkg_CAP}_PRIORS ${fp_PRIORS})
 
@@ -144,7 +144,7 @@ macro(spiner_content_populate)
       if(NOT CMAKE_VERSION VERSION_GREATER_EQUAL "3.24.0")
         find_package(
           ${pkg_name}
-          COMPONENTS ${${fp_NAMESPACE}_DECLARED_EXTERNAL_${pkg_CAP}_COMPONETS}
+          COMPONENTS ${${fp_NAMESPACE}_DECLARED_EXTERNAL_${pkg_CAP}_COMPONENTS}
           QUIET)
         if(${pkg_name}_FOUND)
           message(VERBOSE "${pkg_name} located with `find_package`"