Merge branch 'develop' of github.com:LLNL/benchpark into experiment/S…

…TREAM

.github/workflows/run.yml

@@ -222,6 +222,32 @@ jobs:
             --disable-logger \
             workspace setup --dry-run
 
+      - name: Dry run dynamic saxpy/openmp with dynamic Venado
+        run: |
+          ./bin/benchpark system init --dest=venado-system1 lanl-venado cuda=12.5 compiler=cce +gtl
+          system_id=$(./bin/benchpark system id ./venado-system1)
+          ./bin/benchpark experiment init --dest=saxpy-openmp-venado saxpy+openmp
+          ./bin/benchpark setup ./saxpy-openmp-venado ./venado-system1 workspace/
+          . workspace/setup.sh
+          ramble \
+            --workspace-dir "workspace/saxpy-openmp-venado/$system_id/workspace" \
+            --disable-progress-bar \
+            --disable-logger \
+            workspace setup --dry-run
+
+      - name: Dry run dynamic saxpy/cuda with dynamic Venado
+        run: |
+          ./bin/benchpark system init --dest=venado-system2 lanl-venado cuda=12.5 compiler=cce +gtl
+          system_id=$(./bin/benchpark system id ./venado-system2)
+          ./bin/benchpark experiment init --dest=saxpy-cuda-venado saxpy+cuda
+          ./bin/benchpark setup ./saxpy-cuda-venado ./venado-system2 workspace/
+          . workspace/setup.sh
+          ramble \
+            --workspace-dir "workspace/saxpy-cuda-venado/$system_id/workspace" \
+            --disable-progress-bar \
+            --disable-logger \
+            workspace setup --dry-run
+
       - name: Dry run dynamic gromacs/openmp with dynamic Ruby
         run: |
           ./bin/benchpark system init --dest=cluster-system llnl-cluster compiler=gcc 

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

@@ -302,6 +302,7 @@ packages:
         gtl_cutoff_size: 4096
         fi_cxi_ats: 0
         gtl_lib_path: /opt/cray/pe/mpich/8.1.26/gtl/lib
+        gtl_libs: ["libmpi_gtl_hsa"]
         ldflags: "-L/opt/cray/pe/mpich/8.1.26/ofi/crayclang/16.0/lib -lmpi -L/opt/cray/pe/mpich/8.1.26/gtl/lib -Wl,-rpath=/opt/cray/pe/mpich/8.1.26/gtl/lib -lmpi_gtl_hsa"
     - spec: [email protected]%[email protected] ~gtl +wrappers
       prefix: /opt/cray/pe/mpich/8.1.26/ofi/crayclang/16.0

pull_request_template.md

@@ -1,38 +1,26 @@
 ## Description
 
-FIXME:Provide a short summary of the change. Please also include relevant
-motivation and context.
+- [ ] Replace with: A short description of the change, including motivation and context.
+- [ ] Replace with: A list of any dependencies.
+- [ ] Replace with: Link(s) to relevant [issue(s)](https://docs.github.com/en/issues/tracking-your-work-with-issues/using-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword)
+- [ ] Complete the checklist for a relevant section(s) below
+- [ ] Delete sections below that are not relevant to this PR
 
-Dependencies: FIXME:Add a list of any dependencies.
+## Adding/modifying a system (docs: [Adding a System](https://software.llnl.gov/benchpark/add-a-system-config.html))
 
-Fixes issue(s): FIXME:Add list of relevant issues.
+- [ ] Add/modify `systems/system_name/Create a new directory for the system, add/modify `system.py` file
+- [ ] Add/modify a dry run unit test in `.github/workflows/run.yml`
+- [ ] Add/modify `systems/all_system_definitions/system-hardware/system_definition.yaml which will appear in the [docs catalogue](https://software.llnl.gov/benchpark/system-list.html)
 
-## Type of Change
+## Adding/modifying a benchmark (docs: [Adding a Benchmark](https://software.llnl.gov/benchpark/add-a-benchmark.html))
 
-- { } Adding a system, benchmark, or experiment
-- { } Modifying an existing system, benchmark, or experiment
-- { } Documentation update
-- { } Build/CI update
-- { } Benchpark core functionality
+- [ ] (optional) If package upstreamed to Spack is insufficient, add/modify `repo/benchmark_name/package.py`
+- [ ] (optional) If application upstreamed to Ramble is insufficient, add/modify `repo/benchmark_name/application.py`
+- [ ] Tags in Ramble's `application.py` or in `repo/benchmark_name/application.py` will appear in the [docs catalogue](https://software.llnl.gov/benchpark/benchmark-list.html)
+- [ ] Add/modify an `experiments/benchmark_name/experiment.py` to define a single node and multi-node experiments
+- [ ] Add/modify a dry run unit test in `.github/workflows/run.yml`
 
-## Checklist:
+## Adding/modifying core functionality, CI, or documentation:
 
-If adding/modifying a system:
-- { } Create a new directory for the system and a new `system.py` file
-- { } Add a new dry run unit test in `.github/workflows`
-- { } System appears in System Specifications table in docs catalogue section
-
-If adding/modifying a benchpark:
-- { } Add a new `application.py` and (maybe) `package.py` under a new directory
-      for this benchmark
-- { } Configure an experiment
-- { } Benchmark appears in Benchmarks and Experiments table in docs catalogue
-      section
-
-If adding/modifying a experiment:
-- { } Extend `experiment.py` under existing directory for specific benchmark
-- { } Define a single node and multi-node experiments
-
-If adding/modifying core functionality:
-- { } Update docs
-- { } Update `.github/workflows` and `.gitlab/ci` unit tests (if needed)
+- [ ] Update docs
+- [ ] Update `.github/workflows` and `.gitlab/ci` unit tests (if needed)

repo/amg2023/package.py

@@ -36,14 +36,18 @@ class Amg2023(CMakePackage, CudaPackage, ROCmPackage):
 
     depends_on("hypre+cuda", when="+cuda")
     requires("+cuda", when="^hypre+cuda")
-    for arch in ("none", "50", "60", "70", "80"):
+    for arch in ("none", "50", "60", "70", "80", "90"):
         depends_on(f"hypre cuda_arch={arch}", when=f"cuda_arch={arch}")
 
     depends_on("hypre+rocm", when="+rocm")
     requires("+rocm", when="^hypre+rocm")
     for target in ("none", "gfx803", "gfx900", "gfx906", "gfx908", "gfx90a", "gfx942"):
         depends_on(f"hypre amdgpu_target={target}", when=f"amdgpu_target={target}")
 
+    def setup_build_environment(self, env):
+        if "+cuda" in self.spec:
+            env.set("NVCC_APPEND_FLAGS", "-allow-unsupported-compiler")
+
     def cmake_args(self):
         cmake_options = []
         cmake_options.append(self.define_from_variant("AMG_WITH_CALIPER", "caliper"))

repo/caliper/for_aarch64.patch

@@ -0,0 +1,11 @@
+--- spack-src/src/services/callpath/Callpath.cpp.bak	2020-10-28 14:38:19.668122844 +0900
++++ spack-src/src/services/callpath/Callpath.cpp	2020-10-28 15:03:12.258061188 +0900
+@@ -63,7 +63,7 @@
+         unw_context_t unw_ctx;
+         unw_cursor_t  unw_cursor;
+
+-        unw_getcontext(&unw_ctx);
++        unw_getcontext(unw_ctx);
+
+         if (unw_init_local(&unw_cursor, &unw_ctx) < 0) {
+             Log(0).stream() << "callpath: unable to init libunwind cursor" << endl;