From 781f58849def512424427ffb5df96f386b8a028f Mon Sep 17 00:00:00 2001 From: Dewi <43684384+dyokelson@users.noreply.github.com> Date: Wed, 23 Oct 2024 06:07:38 -0700 Subject: [PATCH 1/3] System class: Adding Dane to CTS (#408) * adding Dane to CTS * add dryruns for all cts systems * fix typo --- .github/workflows/run.yml | 36 ++++++++++++++++++++++++++++++ var/sys_repo/systems/cts/system.py | 5 ++++- 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/.github/workflows/run.yml b/.github/workflows/run.yml index a4fa5eb9..c3039e39 100644 --- a/.github/workflows/run.yml +++ b/.github/workflows/run.yml @@ -329,3 +329,39 @@ jobs: --disable-progress-bar \ --disable-logger \ workspace setup --dry-run + + - name: Dry run dynamic saxpy/openmp with dynamic CTS ruby + run: | + ./bin/benchpark system init --dest=ruby-system cts cluster=ruby + ./bin/benchpark experiment init --dest=saxpy-openmp saxpy programming_model=openmp + ./bin/benchpark setup ./saxpy-openmp ./ruby-system workspace/ + . workspace/setup.sh + ramble \ + --workspace-dir workspace/saxpy-openmp/Cts-6d48f81/workspace \ + --disable-progress-bar \ + --disable-logger \ + workspace setup --dry-run + + - name: Dry run dynamic saxpy/openmp with dynamic CTS dane + run: | + ./bin/benchpark system init --dest=dane-system cts cluster=dane + ./bin/benchpark experiment init --dest=saxpy-openmp2 saxpy programming_model=openmp + ./bin/benchpark setup ./saxpy-openmp2 ./dane-system workspace/ + . workspace/setup.sh + ramble \ + --workspace-dir workspace/saxpy-openmp2/Cts-2c51a80/workspace \ + --disable-progress-bar \ + --disable-logger \ + workspace setup --dry-run + + - name: Dry run dynamic saxpy/openmp with dynamic CTS magma + run: | + ./bin/benchpark system init --dest=magma-system cts cluster=magma + ./bin/benchpark experiment init --dest=saxpy-openmp3 saxpy programming_model=openmp + ./bin/benchpark setup ./saxpy-openmp3 ./magma-system workspace/ + . workspace/setup.sh + ramble \ + --workspace-dir workspace/saxpy-openmp3/Cts-54a5761/workspace \ + --disable-progress-bar \ + --disable-logger \ + workspace setup --dry-run \ No newline at end of file diff --git a/var/sys_repo/systems/cts/system.py b/var/sys_repo/systems/cts/system.py index f7c86498..2d000fdc 100644 --- a/var/sys_repo/systems/cts/system.py +++ b/var/sys_repo/systems/cts/system.py @@ -15,6 +15,9 @@ "magma": { "sys_cores_per_node": 96, }, + "dane": { + "sys_cores_per_node": 112, + }, } @@ -23,7 +26,7 @@ class Cts(System): variant( "cluster", default="ruby", - values=("ruby", "magma"), + values=("ruby", "magma", "dane"), description="Which cluster to run on", ) From 647daadb40458fcf3ea7a5b3d3c99295c94d0dd5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Oct 2024 15:19:08 -0500 Subject: [PATCH 2/3] Bump actions/checkout from 4.2.1 to 4.2.2 (#409) Bumps [actions/checkout](https://github.com/actions/checkout) from 4.2.1 to 4.2.2. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871...11bd71901bbe5b1630ceea73d27597364c9af683) --- updated-dependencies: - dependency-name: actions/checkout 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/ci.yml | 2 +- .github/workflows/docs.yml | 2 +- .github/workflows/license.yml | 2 +- .github/workflows/run.yml | 4 ++-- .github/workflows/style.yml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 21c976d7..e715ea71 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: license: ${{ steps.filter.outputs.license }} steps: - - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # @v2 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # @v2 if: ${{ github.event_name == 'push' }} with: fetch-depth: 0 diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index c7fa08e1..3c719dcc 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - name: Setup Python uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 diff --git a/.github/workflows/license.yml b/.github/workflows/license.yml index 1755dd3d..00120a6d 100644 --- a/.github/workflows/license.yml +++ b/.github/workflows/license.yml @@ -6,7 +6,7 @@ jobs: verify-license: runs-on: ubuntu-latest steps: - - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - name: Set up Python 3.11 uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 diff --git a/.github/workflows/run.yml b/.github/workflows/run.yml index c3039e39..bc0e3bf6 100644 --- a/.github/workflows/run.yml +++ b/.github/workflows/run.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Benchpark - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - name: Add needed Python libs run: | @@ -94,7 +94,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Benchpark - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - name: Add needed Python libs run: | diff --git a/.github/workflows/style.yml b/.github/workflows/style.yml index 5c89cb5a..c6ed884c 100644 --- a/.github/workflows/style.yml +++ b/.github/workflows/style.yml @@ -6,7 +6,7 @@ jobs: lint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - name: Set up Python 3.11 uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 From 181f6c620ae926d06ec201289d675e9497244e41 Mon Sep 17 00:00:00 2001 From: pearce8 Date: Wed, 23 Oct 2024 18:03:44 -0500 Subject: [PATCH 3/3] Print status messages about bootstrapping (#410) Bootstrapping can take a while, provide some indication of activity to the user. --- lib/benchpark/runtime.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/benchpark/runtime.py b/lib/benchpark/runtime.py index 6637b5c9..9e73de9b 100644 --- a/lib/benchpark/runtime.py +++ b/lib/benchpark/runtime.py @@ -82,6 +82,7 @@ def __init__(self, dest): self.spack_location = self.dest / "spack" def bootstrap(self): + print("Hold tight, Benchpark is bootstrapping itself.") if not self.ramble_location.exists(): self._install_ramble() ramble_lib_path = self.ramble_location / "lib" / "ramble" @@ -99,7 +100,7 @@ def bootstrap(self): self._install_spack() def _install_ramble(self): - debug_print(f"Cloning Ramble to {self.ramble_location}") + print(f"Cloning Ramble to {self.ramble_location}") git_clone_commit( "https://github.com/GoogleCloudPlatform/ramble.git", self.ramble_commit, @@ -108,7 +109,7 @@ def _install_ramble(self): debug_print(f"Done cloning Ramble ({self.ramble_location})") def _install_spack(self): - debug_print(f"Cloning Spack to {self.spack_location}") + print(f"Cloning Spack to {self.spack_location}") git_clone_commit( "https://github.com/spack/spack.git", self.spack_commit, self.spack_location )