Merge branch 'develop' into stream-consistency

.github/workflows/ci.yml

@@ -35,6 +35,7 @@ jobs:
           filters: |
             docs:
               - '.github/**'
+              - 'bin/**'
               - 'docs/**'
               - 'README.rst'
             style:

.github/workflows/requirements/style.txt

@@ -1,4 +1,4 @@
-black==24.4.0
+black==24.4.2
 flake8==7.0.0
 isort==5.13.2
 codespell==2.2.6

bin/benchpark

@@ -483,7 +483,7 @@ Further steps are needed to build the experiments (ramble -P -D {ramble_workspac
     print(instructions)
 
 
-def helper_experiments_tags(ramble_exe, experiments):
+def helper_experiments_tags(ramble_exe, benchmarks):
     # find all tags in Ramble applications (both in Ramble built-in and in Benchpark/repo)
     (tags_stdout, tags_stderr) = run_command(f"{ramble_exe} attributes --tags --all")
     ramble_applications_tags = {}
@@ -494,20 +494,20 @@ def helper_experiments_tags(ramble_exe, experiments):
         ramble_applications_tags[key_value[0]] = key_value[1].strip().split(",")
 
     benchpark_experiments_tags = {}
-    for exp in experiments:
-        benchpark_experiments_tags[exp] = ramble_applications_tags[exp]
+    for benchmark in benchmarks:
+        benchpark_experiments_tags[benchmark] = ramble_applications_tags[benchmark]
     return benchpark_experiments_tags
 
 
 def benchpark_tags_handler(args):
     """
-    Filter ramble tags by benchpark experiments
+    Filter ramble tags by benchpark benchmarks
     """
     source_dir = source_location()
     experiments_root = pathlib.Path(os.path.abspath(args.experiments_root))
     ramble_location = experiments_root / "ramble"
     ramble_exe = ramble_location / "bin" / "ramble"
-    experiments = benchpark_experiments()
+    benchmarks = benchpark_benchmarks()
 
     if args.tag:
         if benchpark_check_tag(args.tag):
@@ -516,17 +516,15 @@ def benchpark_tags_handler(args):
             lines = tag_stdout.splitlines()
 
             for line in lines:
-                if line in experiments:
+                if line in benchmarks:
                     print(line)
 
     elif args.application:
-        if benchpark_check_experiment(args.application):
-            benchpark_experiments_tags = helper_experiments_tags(
-                ramble_exe, experiments
-            )
+        if benchpark_check_benchmark(args.application):
+            benchpark_experiments_tags = helper_experiments_tags(ramble_exe, benchmarks)
             print(benchpark_experiments_tags[args.application])
     else:
-        benchpark_experiments_tags = helper_experiments_tags(ramble_exe, experiments)
+        benchpark_experiments_tags = helper_experiments_tags(ramble_exe, benchmarks)
         print("All tags that exist in Benchpark experiments:")
         for k, v in benchpark_experiments_tags.items():
             print(k)

checkout-versions.yaml

@@ -5,4 +5,4 @@
 
 versions:
   ramble: bb664f142b2cbdb2b2ea39e70a8535c9f27c1179
-  spack: 31de670bd26beca979ebd75dcb0ce90c535a78c4
+  spack: c2eef8bab26adb00b250992e29d697b4706356a0

configs/LLNL-Tioga-HPECray-zen3-MI250X-Slingshot/auxiliary_software_files/packages.yaml

@@ -41,6 +41,9 @@ packages:
       prefix: /usr
     - spec: [email protected]
       prefix: /usr/tce
+    - spec: [email protected]
+      prefix: /usr/tce
+    buildable: false
   pkgconf:
     externals:
     - spec: [email protected]

docs/generate-benchmark-list.py

@@ -54,7 +54,7 @@ def main(workspace):
     for bmark in benchmarks:
         # call benchpark tags -a bmark workspace
         cmd = ["../bin/benchpark", "tags", "-a", bmark, workspace]
-        byte_data = subprocess.run(cmd, capture_output=True)
+        byte_data = subprocess.run(cmd, capture_output=True, check=True)
         tags = str(byte_data.stdout, "utf-8")
         tags = (
             tags.replace("[", "")

experiments/raja-perf/mpi-only/ramble.yaml

@@ -32,7 +32,7 @@ ramble:
         spack_spec: '[email protected]:'
         compiler: compiler-gcc
       raja-perf:
-        spack_spec: raja-perf@develop ~openmp +mpi ^[email protected]
+        spack_spec: raja-perf@develop ~openmp +mpi
         compiler: default-compiler
     environments:
       raja-perf:

experiments/raja-perf/openmp/ramble.yaml

@@ -33,7 +33,7 @@ ramble:
     concretized: true
     packages:
       raja-perf:
-        spack_spec: raja-perf@develop +openmp +mpi ^[email protected]
+        spack_spec: raja-perf@develop +openmp +mpi 
         compiler: default-compiler
     environments:
       raja-perf:

experiments/saxpy/cuda/ramble.yaml

@@ -33,7 +33,7 @@ ramble:
     concretized: true
     packages:
       saxpy:
-        spack_spec: [email protected] +cuda{modifier_spack_variant} cuda_arch=={cuda_arch} ^cuda@{default_cuda_version}
+        spack_spec: [email protected] +cuda{modifier_spack_variant} cuda_arch=={cuda_arch} ~openmp ^cuda@{default_cuda_version}
         compiler: default-compiler
     environments:
       saxpy:

experiments/saxpy/openmp/ramble.yaml

@@ -40,7 +40,7 @@ ramble:
     concretized: true
     packages:
       saxpy:
-        spack_spec: [email protected] +openmp{modifier_spack_variant} ^[email protected]
+        spack_spec: [email protected] +openmp{modifier_spack_variant}
         compiler: default-compiler
     environments:
       saxpy:

experiments/saxpy/rocm/ramble.yaml

@@ -33,7 +33,7 @@ ramble:
     concretized: true
     packages:
       saxpy:
-        spack_spec: [email protected] +rocm{modifier_spack_variant} amdgpu_target={rocm_arch}
+        spack_spec: [email protected] +rocm{modifier_spack_variant} ~openmp amdgpu_target={rocm_arch}
         compiler: default-compiler
     environments:
       saxpy: