From 7a444f8656480fa3551dc5d1439c1a3fc0c10e53 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Apr 2024 09:51:26 -0700 Subject: [PATCH 1/5] Bump black from 24.4.0 to 24.4.2 in /.github/workflows/requirements (#215) Bumps [black](https://github.com/psf/black) from 24.4.0 to 24.4.2. - [Release notes](https://github.com/psf/black/releases) - [Changelog](https://github.com/psf/black/blob/main/CHANGES.md) - [Commits](https://github.com/psf/black/compare/24.4.0...24.4.2) --- updated-dependencies: - dependency-name: black dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/requirements/style.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/requirements/style.txt b/.github/workflows/requirements/style.txt index 2c06c97ef..45b9c4bae 100644 --- a/.github/workflows/requirements/style.txt +++ b/.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 From 597569c4cfb502c1a4427474691f01ac3a8b2f47 Mon Sep 17 00:00:00 2001 From: Alec Scott Date: Mon, 29 Apr 2024 16:07:27 -0700 Subject: [PATCH 2/5] Tags command should use benchmarks not experiments (#217) * Benchpark tags cmd should use benchmarks not experiments to generate tags * Black format code --- bin/benchpark | 20 +++++++++----------- docs/generate-benchmark-list.py | 2 +- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/bin/benchpark b/bin/benchpark index b900b4cb7..99c1c6385 100755 --- a/bin/benchpark +++ b/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) diff --git a/docs/generate-benchmark-list.py b/docs/generate-benchmark-list.py index 391604a68..209f7eb33 100755 --- a/docs/generate-benchmark-list.py +++ b/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("[", "") From f2847e3c0f7df9e432a1f300158ff960712d6350 Mon Sep 17 00:00:00 2001 From: Alec Scott Date: Mon, 29 Apr 2024 16:08:58 -0700 Subject: [PATCH 3/5] ci: rebuild docs on changes to bin/benchpark (#216) Co-authored-by: pearce8 --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 254a0dbe3..b9b31a25c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,6 +35,7 @@ jobs: filters: | docs: - '.github/**' + - 'bin/**' - 'docs/**' - 'README.rst' style: From ea8293e69cf3fd6270274dcef87dbfaddee9515e Mon Sep 17 00:00:00 2001 From: Riyaz Haque <5333387+rfhaque@users.noreply.github.com> Date: Tue, 30 Apr 2024 15:35:13 -0700 Subject: [PATCH 4/5] Update spack version (#219) * Update spack version * Removing specific cmake version requested by saxpy * Removing specific cmake version requested by raja-perf * Removing specific cmake version requested by raja-perf --------- Co-authored-by: Riyaz Haque Co-authored-by: pearce8 --- checkout-versions.yaml | 2 +- experiments/raja-perf/mpi-only/ramble.yaml | 2 +- experiments/raja-perf/openmp/ramble.yaml | 2 +- experiments/saxpy/openmp/ramble.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/checkout-versions.yaml b/checkout-versions.yaml index 2d7d07ce6..6c3973512 100644 --- a/checkout-versions.yaml +++ b/checkout-versions.yaml @@ -5,4 +5,4 @@ versions: ramble: bb664f142b2cbdb2b2ea39e70a8535c9f27c1179 - spack: 31de670bd26beca979ebd75dcb0ce90c535a78c4 + spack: c2eef8bab26adb00b250992e29d697b4706356a0 diff --git a/experiments/raja-perf/mpi-only/ramble.yaml b/experiments/raja-perf/mpi-only/ramble.yaml index 6e19371c1..73e58f6d4 100644 --- a/experiments/raja-perf/mpi-only/ramble.yaml +++ b/experiments/raja-perf/mpi-only/ramble.yaml @@ -32,7 +32,7 @@ ramble: spack_spec: 'blt@0.5.2:' compiler: compiler-gcc raja-perf: - spack_spec: raja-perf@develop ~openmp +mpi ^cmake@3.23.1 + spack_spec: raja-perf@develop ~openmp +mpi compiler: default-compiler environments: raja-perf: diff --git a/experiments/raja-perf/openmp/ramble.yaml b/experiments/raja-perf/openmp/ramble.yaml index 7e734d177..21a531a18 100644 --- a/experiments/raja-perf/openmp/ramble.yaml +++ b/experiments/raja-perf/openmp/ramble.yaml @@ -33,7 +33,7 @@ ramble: concretized: true packages: raja-perf: - spack_spec: raja-perf@develop +openmp +mpi ^cmake@3.23.1 + spack_spec: raja-perf@develop +openmp +mpi compiler: default-compiler environments: raja-perf: diff --git a/experiments/saxpy/openmp/ramble.yaml b/experiments/saxpy/openmp/ramble.yaml index cc7bdf7da..f4e601edf 100644 --- a/experiments/saxpy/openmp/ramble.yaml +++ b/experiments/saxpy/openmp/ramble.yaml @@ -40,7 +40,7 @@ ramble: concretized: true packages: saxpy: - spack_spec: saxpy@1.0.0 +openmp{modifier_spack_variant} ^cmake@3.23.1 + spack_spec: saxpy@1.0.0 +openmp{modifier_spack_variant} compiler: default-compiler environments: saxpy: From 7a4f6b69121a59dc10448fa86e098ca1dc887c53 Mon Sep 17 00:00:00 2001 From: Riyaz Haque <5333387+rfhaque@users.noreply.github.com> Date: Fri, 3 May 2024 12:34:48 -0700 Subject: [PATCH 5/5] Update saxpy spec (#227) * Disable openmp variant in saxpy cuda spec * Disable openmp variant in saxpy rocm spec --------- Co-authored-by: Riyaz Haque --- .../auxiliary_software_files/packages.yaml | 3 +++ experiments/saxpy/cuda/ramble.yaml | 2 +- experiments/saxpy/rocm/ramble.yaml | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/configs/LLNL-Tioga-HPECray-zen3-MI250X-Slingshot/auxiliary_software_files/packages.yaml b/configs/LLNL-Tioga-HPECray-zen3-MI250X-Slingshot/auxiliary_software_files/packages.yaml index af604fd29..838cc7542 100644 --- a/configs/LLNL-Tioga-HPECray-zen3-MI250X-Slingshot/auxiliary_software_files/packages.yaml +++ b/configs/LLNL-Tioga-HPECray-zen3-MI250X-Slingshot/auxiliary_software_files/packages.yaml @@ -41,6 +41,9 @@ packages: prefix: /usr - spec: cmake@3.23.1 prefix: /usr/tce + - spec: cmake@3.24.2 + prefix: /usr/tce + buildable: false pkgconf: externals: - spec: pkgconf@1.4.2 diff --git a/experiments/saxpy/cuda/ramble.yaml b/experiments/saxpy/cuda/ramble.yaml index 677a096f3..f1260d196 100644 --- a/experiments/saxpy/cuda/ramble.yaml +++ b/experiments/saxpy/cuda/ramble.yaml @@ -33,7 +33,7 @@ ramble: concretized: true packages: saxpy: - spack_spec: saxpy@1.0.0 +cuda{modifier_spack_variant} cuda_arch=={cuda_arch} ^cuda@{default_cuda_version} + spack_spec: saxpy@1.0.0 +cuda{modifier_spack_variant} cuda_arch=={cuda_arch} ~openmp ^cuda@{default_cuda_version} compiler: default-compiler environments: saxpy: diff --git a/experiments/saxpy/rocm/ramble.yaml b/experiments/saxpy/rocm/ramble.yaml index dd80075d0..80f443b21 100644 --- a/experiments/saxpy/rocm/ramble.yaml +++ b/experiments/saxpy/rocm/ramble.yaml @@ -33,7 +33,7 @@ ramble: concretized: true packages: saxpy: - spack_spec: saxpy@1.0.0 +rocm{modifier_spack_variant} amdgpu_target={rocm_arch} + spack_spec: saxpy@1.0.0 +rocm{modifier_spack_variant} ~openmp amdgpu_target={rocm_arch} compiler: default-compiler environments: saxpy: