Merge branch 'LLNL:develop' into develop

TauferLab · Nov 1, 2024 · 1372e09 · 1372e09
2 parents edd0b9d + 436d28e
commit 1372e09
Show file tree

Hide file tree

Showing 204 changed files with 2,805 additions and 1,069 deletions.
diff --git a/.github/workflows/bin/license b/.github/workflows/bin/license
@@ -57,12 +57,12 @@ def list_files(root):
 SPDX_MISMATCH, GENERAL_MISMATCH, COPYRIGHT_YEAR_MISMATCH = range(1, 4)
 
 #: Latest year that copyright applies. UPDATE THIS when bumping copyright.
-latest_year = 2023
+latest_year = "202[34]"
 strict_date = r"Copyright %s" % latest_year
 
 #: regexes for valid license lines at tops of files
 license_line_regexes = [
-    r"Copyright (%d|[0-9]{4}) Lawrence Livermore National Security, LLC and other"
+    r"Copyright (%s|[0-9]{4}) Lawrence Livermore National Security, LLC and other"
     % latest_year,
     r"Benchpark Project Developers. See the top-level COPYRIGHT file for details.",
     r"SPDX-License-Identifier: Apache-2.0",

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -23,7 +23,7 @@ jobs:
       license: ${{ steps.filter.outputs.license }}
 
     steps:
-      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # @v2
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # @v2
         if: ${{ github.event_name == 'push' }}
         with:
           fetch-depth: 0

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -7,10 +7,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
+      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
 
     - name: Setup Python
-      uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3
+      uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b
       with:
         python-version: '3.11'
         cache: 'pip'

diff --git a/.github/workflows/license.yml b/.github/workflows/license.yml
@@ -6,10 +6,10 @@ jobs:
   verify-license:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
 
       - name: Set up Python 3.11
-        uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3
+        uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b
         with:
           python-version: '3.11'
           cache: 'pip'

diff --git a/.github/workflows/run.yml b/.github/workflows/run.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Benchpark
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
 
       - name: Add needed Python libs
         run: |
@@ -94,7 +94,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Benchpark
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
 
       - name: Add needed Python libs
         run: |
@@ -112,7 +112,7 @@ jobs:
 
       - name: Dry run dynamic amg2023-openmp on Dane with allocation modifier
         run: |
-          ./bin/benchpark experiment init --dest=amg2023-openmp amg2023 programming_model=openmp
+          ./bin/benchpark experiment init --dest=amg2023-openmp amg2023 openmp=oui
           ./bin/benchpark setup ./amg2023-openmp LLNL-Dane-DELL-sapphirerapids-OmniPath workspace/
           . workspace/setup.sh
           ramble \
@@ -143,7 +143,7 @@ jobs:
 
       - name: Dry run dynamic kripke-openmp on nosite-x86_64 with allocation modifier
         run: |
-          ./bin/benchpark experiment init --dest=kripke-openmp kripke programming_model=openmp
+          ./bin/benchpark experiment init --dest=kripke-openmp kripke openmp=oui
           ./bin/benchpark setup ./kripke-openmp nosite-x86_64 workspace/
           . workspace/setup.sh
           ramble \
@@ -154,7 +154,7 @@ jobs:
 
       - name: Dry run dynamic kripke-rocm on LLNL-Tioga-HPECray-zen3-MI250X-Slingshot with allocation modifier
         run: |
-          ./bin/benchpark experiment init --dest=kripke-rocm kripke programming_model=rocm
+          ./bin/benchpark experiment init --dest=kripke-rocm kripke rocm=oui
           ./bin/benchpark setup ./kripke-openmp LLNL-Tioga-HPECray-zen3-MI250X-Slingshot workspace/
           . workspace/setup.sh
           ramble \
@@ -186,7 +186,7 @@ jobs:
 
       - name: Dry run dynamic saxpy/rocm with static Tioga
         run: |
-          ./bin/benchpark experiment init --dest=saxpy-rocm saxpy programming_model=rocm
+          ./bin/benchpark experiment init --dest=saxpy-rocm saxpy rocm=oui
           ./bin/benchpark setup ./saxpy-rocm LLNL-Tioga-HPECray-zen3-MI250X-Slingshot workspace/
           . workspace/setup.sh
           ramble \
@@ -198,7 +198,7 @@ jobs:
       - name: Dry run dynamic saxpy/rocm with dynamic Tioga
         run: |
           ./bin/benchpark system init --dest=tioga-system2 tioga rocm=551 compiler=cce ~gtl
-          ./bin/benchpark experiment init --dest=saxpy-rocm2 saxpy programming_model=rocm
+          ./bin/benchpark experiment init --dest=saxpy-rocm2 saxpy rocm=oui
           ./bin/benchpark setup ./saxpy-rocm2 ./tioga-system2 workspace/
           . workspace/setup.sh
           ramble \
@@ -210,7 +210,7 @@ jobs:
       - name: Dry run dynamic saxpy/cuda with dynamic Sierra
         run: |
           ./bin/benchpark system init --dest=sierra-system sierra cuda=10-1-243 compiler=xl
-          ./bin/benchpark experiment init --dest=saxpy-cuda saxpy programming_model=cuda
+          ./bin/benchpark experiment init --dest=saxpy-cuda saxpy cuda=oui
           ./bin/benchpark setup ./saxpy-cuda ./sierra-system workspace/
           . workspace/setup.sh
           ramble \
@@ -261,7 +261,7 @@ jobs:
 
       - name: Dry run dynamic quicksilver-openmp on nosite-x86_64 with allocation modifier
         run: |
-          ./bin/benchpark experiment init --dest=quicksilver-openmp quicksilver experiment=weak
+          ./bin/benchpark experiment init --dest=quicksilver-openmp quicksilver openmp=oui experiment=weak
           ./bin/benchpark setup ./quicksilver-openmp nosite-x86_64 workspace/
           . workspace/setup.sh
           ramble \
@@ -329,3 +329,51 @@ jobs:
             --disable-progress-bar \
             --disable-logger \
             workspace setup --dry-run
+
+      - name: Dry run dynamic saxpy/openmp with dynamic CTS ruby
+        run: |
+          ./bin/benchpark system init --dest=ruby-system cts cluster=ruby
+          ./bin/benchpark experiment init --dest=saxpy-openmp saxpy openmp=oui
+          ./bin/benchpark setup ./saxpy-openmp ./ruby-system workspace/
+          . workspace/setup.sh
+          ramble \
+            --workspace-dir workspace/saxpy-openmp/Cts-6d48f81/workspace \
+            --disable-progress-bar \
+            --disable-logger \
+            workspace setup --dry-run
+            
+      - name: Dry run dynamic saxpy/openmp with dynamic CTS dane
+        run: |
+          ./bin/benchpark system init --dest=dane-system cts cluster=dane
+          ./bin/benchpark experiment init --dest=saxpy-openmp2 saxpy openmp=oui
+          ./bin/benchpark setup ./saxpy-openmp2 ./dane-system workspace/
+          . workspace/setup.sh
+          ramble \
+            --workspace-dir workspace/saxpy-openmp2/Cts-2c51a80/workspace \
+            --disable-progress-bar \
+            --disable-logger \
+            workspace setup --dry-run
+
+      - name: Dry run dynamic saxpy/openmp with dynamic CTS magma
+        run: |
+          ./bin/benchpark system init --dest=magma-system cts cluster=magma
+          ./bin/benchpark experiment init --dest=saxpy-openmp3 saxpy openmp=oui
+          ./bin/benchpark setup ./saxpy-openmp3 ./magma-system workspace/
+          . workspace/setup.sh
+          ramble \
+            --workspace-dir workspace/saxpy-openmp3/Cts-54a5761/workspace \
+            --disable-progress-bar \
+            --disable-logger \
+            workspace setup --dry-run
+
+      - name: Dry run dynamic saxpy/openmp with dynamic generic x86
+        run: |
+          ./bin/benchpark system init --dest=x86-system genericx86
+          ./bin/benchpark experiment init --dest=saxpy-omp-generic saxpy openmp=oui
+          ./bin/benchpark setup ./saxpy-omp-generic ./x86-system workspace/
+          . workspace/setup.sh
+          ramble \
+            --workspace-dir workspace/saxpy-omp-generic/Genericx86-040898b/workspace \
+            --disable-progress-bar \
+            --disable-logger \
+            workspace setup --dry-run
diff --git a/.github/workflows/style.yml b/.github/workflows/style.yml
@@ -6,10 +6,10 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
 
       - name: Set up Python 3.11
-        uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3
+        uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b
         with:
           python-version: '3.11'
           cache: 'pip'

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -0,0 +1,12 @@
+default:
+  id_tokens:
+    SITE_ID_TOKEN:
+      aud: https://lc.llnl.gov/gitlab
+
+include:
+  - local: '/.gitlab/ci/test.yml'
+
+stages:
+  - status_initiate
+  - test
+  - status_update
diff --git a/.gitlab/ci/test.yml b/.gitlab/ci/test.yml
@@ -0,0 +1,35 @@
+.test_clusters: &test_clusters
+  parallel:
+    matrix:
+      - HOST: tioga
+        ARCHCONFIG: LLNL-Tioga-HPECray-zen3-MI250X-Slingshot
+      - HOST: dane
+        ARCHCONFIG: LLNL-Dane-DELL-sapphirerapids-OmniPath
+
+test_run:
+  stage: test
+  tags:
+    - $HOST
+    - shell
+  <<: *test_clusters
+  rules:
+    - changes:
+        - .gitlab-ci.yml
+        - .gitlab/ci/*
+        - experiments/**
+        - systems/**
+        - repo/**
+        - modifiers/**
+        - var/**
+        - lib/**
+  script:
+    - . /usr/workspace/benchpark-dev/benchpark-venv/$SYS_TYPE/bin/activate
+    # Build Saxpy Workspace
+    - ./bin/benchpark setup saxpy/openmp $ARCHCONFIG workspace/
+    # Setup Ramble & Spack
+    - . workspace/setup.sh
+    # Setup Saxpy Workspace
+    - cd ./workspace/saxpy/openmp/$ARCHCONFIG/workspace/
+    - ramble --workspace-dir . --disable-progress-bar --disable-logger workspace setup
+    # Run Saxpy Experiments
+    - ramble --workspace-dir . --disable-progress-bar --disable-logger on