Test

Author: tcclevenger

.github/actions/test-all-eamxx/action.yml

@@ -41,6 +41,13 @@ inputs:
     description: 'Semicolon-separated list of key=value pairs for CMake to pass to test-all-eamxx'
     required: false
     default: ''
+  kokkos_develop:
+    description: 'Whether or not this is a test using Kokkos develop branch'
+    required: false
+    default: 'false'
+    valid_values:
+      - 'true'
+      - 'false'
 
 runs:
   using: "composite"
@@ -72,12 +79,16 @@ runs:
     - name: Print build specs
       run: |
         echo "Testing EAMxx standalone, for the following configuration:"
-        echo "  build type   : ${{ inputs.build_type }}"
-        echo "  machine      : ${{ inputs.machine }}"
-        echo "  generate     : ${{ inputs.generate }}"
-        echo "  submit       : ${{ inputs.submit }}"
-        echo "  cmake-configs: ${{ inputs.cmake-configs }}"
+        echo "  build type    : ${{ inputs.build_type }}"
+        echo "  machine       : ${{ inputs.machine }}"
+        echo "  generate      : ${{ inputs.generate }}"
+        echo "  submit        : ${{ inputs.submit }}"
+        echo "  cmake-configs : ${{ inputs.cmake-configs }}"
+        echo "  kokkos develop: ${{ inputs.kokkos_develop }}"
       shell: sh
+    - name: Checkout Kokkos develop branch
+      if: ${{inputs.kokkos_develop}}
+      uses: ./.github/actions/update-to-kokkos-develop
     - name: Run test-all-eamxx
       working-directory: components/eamxx
       run: |
@@ -98,6 +109,11 @@ runs:
           cmd+=" -c $config"
         done
 
+        # Add additional id for CDASH submit if this is a kokkos-develop test
+        if [ "${{ inputs.kokkos_develop }}" = "true" ]; then
+          cmd+=" --additional-id kokkos_develop"
+        fi
+
         # Print the full command, then run it
         echo "test-all-eamxx call: $cmd"
         $cmd

.github/actions/update-to-kokkos-develop/action.yml

@@ -19,5 +19,4 @@ runs:
         echo "set(CMAKE_CXX_STANDARD 20 CACHE STRING \"\" FORCE)" >> $cmake_file
         echo "set(Kokkos_ENABLE_IMPL_VIEW_LEGACY ON CACHE BOOL \"\" FORCE)" >> $cmake_file
         echo "set(Kokkos_ENABLE_DEPRECATED_CODE_4 ON CACHE BOOL \"\" FORCE)" >> $cmake_file
-        cat $cmake_file
       shell: sh

.github/workflows/eamxx-sa-testing.yml

@@ -89,8 +89,6 @@ jobs:
           submodules: recursive
       - name: Show action trigger
         uses: ./.github/actions/show-workflow-trigger
-      - name: Checkout Kokkos develop branch
-        uses: ./.github/actions/update-to-kokkos-develop
       - name: Run tests
         uses: ./.github/actions/test-all-eamxx
         with:
@@ -100,6 +98,7 @@ jobs:
           submit: ${{ env.submit }}
           cmake-configs: Kokkos_ENABLE_OPENMP=ON
           ekat: ${{ env.ekat }}
+          kokkos_develop: ${{ env.kokkos_dev_test }}
   gcc-cuda:
     if: |
       ${{
@@ -114,12 +113,12 @@ jobs:
       fail-fast: false
       matrix:
         test:
-          #- build_type: sp
-          #  SK: OFF
+          - build_type: sp
+            SK: OFF
           - build_type: dbg
             SK: ON
-          #- build_type: opt
-          #  SK: OFF
+          - build_type: opt
+            SK: OFF
     name: gcc-cuda / ${{ matrix.test.build_type }}
     steps:
       - name: Check out the repository
@@ -159,8 +158,6 @@ jobs:
                   exit 1
                   ;;
           esac
-      - name: Checkout Kokkos develop branch
-        uses: ./.github/actions/update-to-kokkos-develop
       - name: Run tests
         uses: ./.github/actions/test-all-eamxx
         with:
@@ -170,3 +167,4 @@ jobs:
           submit: ${{ env.submit }}
           cmake-configs: Kokkos_ARCH_HOPPER90=${{ env.Hopper }};Kokkos_ARCH_AMPERE80=${{ env.Ampere }};Kokkos_ARCH_VOLTA70=${{ env.Volta }};CMAKE_CUDA_ARCHITECTURES=${{ env.CUDA_ARCH }};SCREAM_SMALL_KERNELS=${{ matrix.test.SK }}
           ekat: ${{ env.ekat }}
+          kokkos_develop: ${{ env.kokkos_dev_test }}

components/eamxx/scripts/test-all-eamxx

@@ -113,6 +113,9 @@ OR
     choices_doc = ", ".join(["'{}' ({})".format(k, v) for k, v in get_test_name_dict().items()])
     parser.add_argument("-t", "--test", dest="tests", action="append", default=[],
                         help=f"Only run specific test configurations, choices={choices_doc}")
+    parser.add_argument("--additional-id", default="",
+                        help="Adds an aditional identifier to the test name in BUILD_NAME_MOD, "
+                             "format: BUILD_NAME_MOD=str(test)+\"_\"+additional-id.")
 
     parser.add_argument("-l", "--local", action="store_true",
                         help="Allow to not specify a machine name, and have test-all-eamxx to look"

components/eamxx/scripts/test_all_eamxx.py

@@ -32,7 +32,8 @@ def __init__(self, cxx_compiler=None, f90_compiler=None, c_compiler=None,
                  local=False, root_dir=None, work_dir=None,
                  quick_rerun=False,quick_rerun_failed=False,
                  make_parallel_level=0, ctest_parallel_level=0,
-                 extra_verbose=False, limit_test_regex=None, test_level="at", test_size=None):
+                 extra_verbose=False, limit_test_regex=None, test_level="at", test_size=None,
+                 additional_id=""):
     ###########################################################################
 
         # When using scripts-tests, we can't pass "-l" to test-all-eamxx,
@@ -61,6 +62,7 @@ def __init__(self, cxx_compiler=None, f90_compiler=None, c_compiler=None,
         self._test_level              = test_level
         self._test_size               = test_size
         self._generate                = generate
+        self._additional_id           = additional_id
 
         if self._quick_rerun_failed:
             self._quick_rerun = True
@@ -474,7 +476,8 @@ def generate_ctest_config(self, cmake_config, extra_configs, test):
         result += f"-DBUILD_WORK_DIR={work_dir} "
 
         build_name_mod = str(test)
-        result += f"-DBUILD_NAME_MOD={build_name_mod} "
+        testid = "_" + self._additional_id if self._additional_id != "" else ""
+        result += f"-DBUILD_NAME_MOD={build_name_mod}{testid} "
 
         if self._limit_test_regex:
             result += f"-DINCLUDE_REGEX={self._limit_test_regex} "