Merge branch 'develop' into experiment/kripke

LLNL · Apr 15, 2024 · 6b31c47 · 6b31c47
2 parents 7435d2b + e94f380
commit 6b31c47
Show file tree

Hide file tree

Showing 90 changed files with 3,605 additions and 678 deletions.
diff --git a/.flake8 b/.flake8
@@ -8,6 +8,10 @@
 max-line-length = 88
 select = C,E,F,W,B,B950
 ignore = E501,W503,E203
+
+per-file-ignores =
+  modifiers/*/modifier.py:F403,F405
+
 builtins = IPython
 exclude =
   .eggs,

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -23,13 +23,13 @@ jobs:
       license: ${{ steps.filter.outputs.license }}
 
     steps:
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # @v2
+      - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # @v2
         if: ${{ github.event_name == 'push' }}
         with:
           fetch-depth: 0
 
         # For pull requests it's not necessary to checkout the code
-      - uses: dorny/paths-filter@ebc4d7e9ebcb0b1eb21480bb8f43113e996ac77a
+      - uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36
         id: filter
         with:
           filters: |
@@ -48,6 +48,7 @@ jobs:
               - '.github/**'
               - 'bin/**'
               - 'configs/**'
+              - 'checkout-versions.yaml'
               - 'experiments/**'
               - 'repo/**'
             license:

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -7,26 +7,31 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
+      uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633
 
     - name: Setup Python
-      uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c
+      uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d
       with:
         python-version: '3.11'
         cache: 'pip'
         cache-dependency-path: '.github/workflows/requirements/docs.txt'
 
     - name: Setup GitHub Pages
       id: pages
-      uses: actions/configure-pages@1f0c5cde4bc74cd7e1254d0cb4de8d49e9068c7d
+      uses: actions/configure-pages@983d7736d9b0ae728b81ab479565c72886d7745b
 
     - name: Install Sphinx and Theme via Pip
       run: |
         pip install -r .github/workflows/requirements/docs.txt
+        # create a dummy workspace to get a working ramble
+        bin/benchpark setup saxpy/openmp nosite-x86_64 /tmp/workspace
+        # this is gross and we should better setup ramble for people or make it a Spack package
+        pip install -r /tmp/workspace/ramble/requirements.txt
 
     - name: Build with sphinx
       run: |
-        sphinx-build docs/ _build
+        cd docs
+        make html WORKSPACE_PATH=/tmp/workspace
 
     - name: Check for Typos using Codespell
       run: |
@@ -36,7 +41,7 @@ jobs:
       uses: actions/upload-pages-artifact@56afc609e74202658d3ffba0e8f6dda462b719fa
       if: github.ref == 'refs/heads/develop'
       with:
-        path: ./_build
+        path: ./docs/_build/html
 
   deploy:
     needs: build
@@ -54,4 +59,4 @@ jobs:
     steps:
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@decdde0ac072f6dcbe43649d82d9c635fff5b4e4
+        uses: actions/deploy-pages@d6db90164ac5ed86f2b6aed7e0febac5b3c0c03e
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@b4ffde65f46336ab88eb53be808477a3936bae11
+      - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633
 
       - name: Set up Python 3.11
-        uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c
+        uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d
         with:
           python-version: '3.11'
           cache: 'pip'

diff --git a/.github/workflows/requirements/docs.txt b/.github/workflows/requirements/docs.txt
@@ -2,3 +2,21 @@
 sphinx==7.2.6
 sphinx-rtd-theme==2.0.0
 codespell==2.2.6
+pandas==2.2.2
+pyyaml==6.0.1
+sphinxcontrib-programoutput==0.17
+# The remaining requirements are from Ramble
+pytest
+flake8
+google-cloud-storage # for gcs fetch test
+google-api-core # for gcs fetch error .exceptions
+coverage
+pre-commit
+graphlib-backport;python_version<"3.9"
+urllib3==1.26.18;python_version<="3.6"
+protobuf;python_version>"3.6"
+protobuf==3.19.4;python_version<="3.6"
+pyarrow==3.0.0;python_version<="3.6"
+google-cloud-bigquery
+tqdm
+deprecation
diff --git a/.github/workflows/requirements/style.txt b/.github/workflows/requirements/style.txt
@@ -1,4 +1,4 @@
-black==24.2.0
+black==24.4.0
 flake8==7.0.0
 isort==5.13.2
 codespell==2.2.6
diff --git a/.github/workflows/run.yml b/.github/workflows/run.yml
@@ -11,7 +11,11 @@ jobs:
           sudo apt-get remove -y gcc-13
 
       - name: Checkout Benchpark
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
+        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633
+
+      - name: Add needed Python libs
+        run: |
+          pip install -r ./requirements.txt
 
       - name: Build Saxpy Workspace
         run: |
@@ -22,7 +26,7 @@ jobs:
           . workspace/setup.sh
 
           spack mirror add ci-buildcache oci://ghcr.io/llnl/benchpark-binary-cache
-          spack config add "packages:all:target:[nosite-x86_64_v3]"
+          spack config add "packages:all:target:[x86_64_v3]"
 
           env | grep SPACK >> "$GITHUB_ENV"
           env | grep RAMBLE >> "$GITHUB_ENV"
@@ -42,12 +46,12 @@ jobs:
         working-directory: ./workspace/saxpy/openmp/nosite-x86_64/workspace/
         run: |
           ramble \
-            -c variables:n_nodes:1 \
-            -c variables:n_ranks:1 \
             --workspace-dir . \
             --disable-progress-bar \
             --disable-logger \
-            on
+            on \
+            --executor '{execute_experiment}' \
+            --where '{n_nodes} == 1'
 
       - name: Analyze Saxpy Results
         working-directory: ./workspace/saxpy/openmp/nosite-x86_64/workspace/

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@b4ffde65f46336ab88eb53be808477a3936bae11
+      - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633
 
       - name: Set up Python 3.11
-        uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c
+        uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d
         with:
           python-version: '3.11'
           cache: 'pip'

diff --git a/README.rst b/README.rst
@@ -1,7 +1,17 @@
-==================================================
-Benchpark
-==================================================
-
+.. raw:: html
+
+    <div align="left">
+      <h2>
+        <picture>
+        <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/LLNL/benchpark/develop/docs/_static/images/benchpark-dark.svg" width="400">
+        <source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/LLNL/benchpark/develop/docs/_static/images/benchpark-light.svg" width="400">
+        <img alt="Benchpark" src="https://raw.githubusercontent.com/LLNL/benchpark/develop/docs/_static/images/benchpark-light.svg" width="400">
+        </picture>
+      </h2>
+    </div>
+
+Overview
+--------
 You can find detailed documentation at `software.llnl.gov/benchpark
 <https://software.llnl.gov/benchpark>`_. Benchpark can also be found on `GitHub
 <https://github.com/llnl/benchpark>`_.
@@ -12,19 +22,19 @@ reproducible, working specifications for the following:
 
 1. **System specifications**
 
-- location of system compilers and system MPI
-- system scheduler and launcher
+* location of system compilers and system MPI
+* system scheduler and launcher
 
 2. **Benchmark specifications**
 
-- source repo and version
-- build (Spack) configuration
-- run (Ramble) configuration
+* source repo and version
+* build (Spack) configuration
+* run (Ramble) configuration
 
 3. **Experiment specifications**
 
-- programming models to use for benchmarks on a given system type
-- valid experiments for benchmarks on a given system (scientific parameter studies, performance parameter studies, etc.)
+* programming models to use for benchmarks on a given system type
+* valid experiments for benchmarks on a given system (scientific parameter studies, performance parameter studies, etc.)
 
 Dependencies
 ------------