Merge branch 'develop' into feature_thicket_modifier

LLNL · Feb 28, 2024 · 738c12c · 738c12c
2 parents 4856013 + 024b75e
commit 738c12c
Show file tree

Hide file tree

Showing 89 changed files with 3,359 additions and 146 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/bin/license b/.github/workflows/bin/license
@@ -24,7 +24,7 @@ licensed_files = [
     r"^configs\/[^\/]*\/[^\/]*",
     r"^docs\/[^\/]*\.rst$",
     r"^experiments\/[^\/]*\/[^\/]*",
-    r"^repo\/[^\/]*\/[^\/]*",
+    r"^repo\/[^\/]*\/[^\/]*(?<!\.patch)$",
 ]
 
 

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -29,7 +29,7 @@ jobs:
           fetch-depth: 0
 
         # For pull requests it's not necessary to checkout the code
-      - uses: dorny/paths-filter@4512585405083f25c027a35db413c2b3b9006d50
+      - uses: dorny/paths-filter@ebc4d7e9ebcb0b1eb21480bb8f43113e996ac77a
         id: filter
         with:
           filters: |

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -33,7 +33,7 @@ jobs:
         codespell
 
     - name: Upload artifact
-      uses: actions/upload-pages-artifact@0252fc4ba7626f0298f0cf00902a25c6afc77fa8
+      uses: actions/upload-pages-artifact@56afc609e74202658d3ffba0e8f6dda462b719fa
       if: github.ref == 'refs/heads/develop'
       with:
         path: ./_build
@@ -54,4 +54,4 @@ jobs:
     steps:
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@87c3283f01cd6fe19a0ab93a23b2f6fcba5a8e42
+        uses: actions/deploy-pages@decdde0ac072f6dcbe43649d82d9c635fff5b4e4
diff --git a/.github/workflows/requirements/style.txt b/.github/workflows/requirements/style.txt
@@ -1,4 +1,4 @@
-black==23.12.1
+black==24.2.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
@@ -70,7 +70,7 @@ jobs:
 
       - name: Upload Workspace Archive as CI Artifact
         if: always()
-        uses: actions/upload-artifact@694cdabd8bdb0f10b2cea11669e1bf5453eed0a6
+        uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3
         with:
           name: workspace-archive
           path: './workspace/saxpy/openmp/nosite-x86_64/workspace/archive/**'

diff --git a/bin/benchpark b/bin/benchpark
@@ -162,6 +162,12 @@ def benchpark_setup(subparsers, actions_dict):
         type=str,
         help="Where to install packages and store results for the experiments. Benchpark expects to manage this directory, and it should be empty/nonexistent the first time you run benchpark setup experiments.",
     )
+    create_parser.add_argument(
+        "--modifier",
+        type=str,
+        default="none",
+        help="The modifier to apply to the experiment (default none)",
+    )
 
     actions_dict["setup"] = benchpark_setup_handler
 
@@ -212,6 +218,7 @@ def benchpark_setup_handler(args):
     benchmark = args.benchmark
     system = args.system
     experiments_root = pathlib.Path(os.path.abspath(args.experiments_root))
+    modifier = args.modifier
     source_dir = source_location()
     debug_print(f"source_dir = {source_dir}")
     debug_print(f"specified benchmark/ProgrammingModel = {benchmark}")
@@ -246,10 +253,12 @@ def benchpark_setup_handler(args):
 
     configs_src_dir = source_dir / "configs" / str(system)
     experiment_src_dir = source_dir / "experiments" / benchmark
+    modifier_config_dir = source_dir / "modifiers" / modifier / "configs"
 
     ramble_configs_dir.mkdir(parents=True)
     symlink_tree(configs_src_dir, ramble_configs_dir)
     symlink_tree(experiment_src_dir, ramble_configs_dir)
+    symlink_tree(modifier_config_dir, ramble_configs_dir)
 
     spack_location = experiments_root / "spack"
     ramble_location = experiments_root / "ramble"
@@ -287,6 +296,9 @@ def benchpark_setup_handler(args):
         run_command(
             f'{ramble_exe} config --scope=site add "config:disable_progress_bar:true"'
         )
+        run_command(
+            f"{ramble_exe} repo add -t modifiers --scope=site {source_dir}/modifiers"
+        )
         run_command(
             f"{ramble_exe} config --scope=site add \"config:spack:global:args:'-d'\""
         )

diff --git a/configs/CSC-LUMI-HPECray-zen3-MI250X-Slingshot/auxiliary_software_files/compilers.yaml b/configs/CSC-LUMI-HPECray-zen3-MI250X-Slingshot/auxiliary_software_files/compilers.yaml
@@ -0,0 +1,139 @@
+# Copyright 2023 Lawrence Livermore National Security, LLC and other
+# Benchpark Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: Apache-2.0
+
+compilers:
+  - compiler:
+      spec: [email protected]
+      paths:
+        cc: /usr/bin/gcc
+        cxx: /usr/bin/g++
+        f77: /usr/bin/gfortran
+        fc: /usr/bin/gfortran
+      flags: {}
+      operating_system: sles15
+      target: any
+      modules: []
+      environment:
+        append_path:
+          PKG_CONFIG_PATH: /usr/lib64/pkgconfig
+      extra_rpaths: []
+  - compiler:
+      spec: [email protected]
+      paths:
+        cc: /opt/cray/pe/gcc/11.2.0/bin/gcc
+        cxx: /opt/cray/pe/gcc/11.2.0/bin/g++
+        f77: /opt/cray/pe/gcc/11.2.0/bin/gfortran
+        fc: /opt/cray/pe/gcc/11.2.0/bin/gfortran
+      flags: {}
+      operating_system: sles15
+      target: any
+      modules: []
+      environment:
+        prepend_path:
+          LD_LIBRARY_PATH: /opt/cray/pe/pmi/6.1.12/lib:/opt/cray/libfabric/1.15.2.0/lib64
+          PKG_CONFIG_PATH: /usr/lib64/pkgconfig
+      extra_rpaths: []
+  - compiler:
+      spec: [email protected]
+      paths:
+        cc: /opt/cray/pe/gcc/12.2.0/bin/gcc
+        cxx: /opt/cray/pe/gcc/12.2.0/bin/g++
+        f77: /opt/cray/pe/gcc/12.2.0/bin/gfortran
+        fc: /opt/cray/pe/gcc/12.2.0/bin/gfortran
+      flags: {}
+      operating_system: sles15
+      target: any
+      modules: []
+      environment:
+        prepend_path:
+          LD_LIBRARY_PATH: /opt/cray/pe/pmi/6.1.12/lib:/opt/cray/libfabric/1.15.2.0/lib64
+          PKG_CONFIG_PATH: /usr/lib64/pkgconfig
+      extra_rpaths: []
+  - compiler:
+      spec: [email protected]
+      paths:
+        cc: /opt/cray/pe/cce/14.0.2/bin/craycc
+        cxx: /opt/cray/pe/cce/14.0.2/bin/crayCC
+        f77: /opt/cray/pe/cce/14.0.2/bin/crayftn
+        fc: /opt/cray/pe/cce/14.0.2/bin/crayftn
+      flags: {}
+      operating_system: sles15
+      target: any
+      modules: []
+      environment:
+        set:
+          RFE_811452_DISABLE: '1'
+        prepend_path:
+          LD_LIBRARY_PATH: /opt/cray/pe/pmi/6.1.12/lib
+        append_path:
+          LD_LIBRARY_PATH: /opt/cray/pe/gcc-libs
+          PKG_CONFIG_PATH: /usr/lib64/pkgconfig
+      extra_rpaths:
+      - /opt/cray/pe/gcc-libs
+  - compiler:
+      spec: [email protected]
+      paths:
+        cc: /opt/cray/pe/cce/15.0.1/bin/craycc
+        cxx: /opt/cray/pe/cce/15.0.1/bin/crayCC
+        f77: /opt/cray/pe/cce/15.0.1/bin/crayftn
+        fc: /opt/cray/pe/cce/15.0.1/bin/crayftn
+      flags: {}
+      operating_system: sles15
+      target: any
+      modules: []
+      environment:
+        set:
+          RFE_811452_DISABLE: '1'
+        prepend_path:
+          LD_LIBRARY_PATH: /opt/cray/pe/pmi/6.1.12/lib
+        append_path:
+          LD_LIBRARY_PATH: /opt/cray/pe/gcc-libs
+          PKG_CONFIG_PATH: /usr/lib64/pkgconfig
+      extra_rpaths:
+      - /opt/cray/pe/gcc-libs
+  - compiler:
+      spec: [email protected]
+      paths:
+        cc: /opt/cray/pe/cce/16.0.1/bin/craycc
+        cxx: /opt/cray/pe/cce/16.0.1/bin/crayCC
+        f77: /opt/cray/pe/cce/16.0.1/bin/crayftn
+        fc: /opt/cray/pe/cce/16.0.1/bin/crayftn
+      flags: {}
+      operating_system: sles15
+      target: any
+      modules: []
+      environment:
+        set:
+          RFE_811452_DISABLE: '1'
+        prepend_path:
+          LD_LIBRARY_PATH: /opt/cray/pe/pmi/6.1.12/lib
+        append_path:
+          LD_LIBRARY_PATH: /opt/cray/pe/gcc-libs
+          PKG_CONFIG_PATH: /usr/lib64/pkgconfig
+      extra_rpaths:
+      - /opt/cray/pe/gcc-libs
+  - compiler:
+        spec: [email protected]
+        paths:
+          cc:  /appl/lumi/SW/CrayEnv/EB/rocm/5.6.1/bin/amdclang
+          cxx: /appl/lumi/SW/CrayEnv/EB/rocm/5.6.1/bin/amdclang++
+          f77: /appl/lumi/SW/CrayEnv/EB/rocm/5.6.1/bin/amdflang
+          fc:  /appl/lumi/SW/CrayEnv/EB/rocm/5.6.1/bin/amdflang
+        flags: {}
+        operating_system: sles15
+        target: any
+        modules: []
+        environment:
+          set:
+            RFE_811452_DISABLE: '1'
+          append_path:
+            LD_LIBRARY_PATH: /opt/cray/pe/gcc-libs
+          prepend_path:
+            LD_LIBRARY_PATH: /opt/cray/pe/pmi/6.1.12/lib
+            LIBRARY_PATH:  /appl/lumi/SW/CrayEnv/EB/rocm/5.6.1/lib:/appl/lumi/SW/CrayEnv/EB/rocm/5.6.1/lib64
+        extra_rpaths:
+        - /appl/lumi/SW/CrayEnv/EB/rocm/5.6.1/lib
+        - /appl/lumi/SW/CrayEnv/EB/rocm/5.6.1/lib64
+        - /opt/cray/pe/gcc-libs