From 8dd0d469711f7701750835b36a12f261334e718a Mon Sep 17 00:00:00 2001 From: Tapasya Patki Date: Fri, 4 Apr 2025 14:32:40 -0700 Subject: [PATCH 1/5] Update flake8 version to fix compatibility error. --- .github/workflows/github-actions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml index 434c15ff9..628404ce7 100644 --- a/.github/workflows/github-actions.yml +++ b/.github/workflows/github-actions.yml @@ -194,7 +194,7 @@ jobs: - name: Update Black run: | pip install black==21.12b0 - pip install flake8==4.0.1 + pip install flake8==7.1.2 - name: Style check python files run: | From b8bb9b40082c96acfeed996b0cbe3b81d0e31ecf Mon Sep 17 00:00:00 2001 From: Tapasya Patki Date: Fri, 4 Apr 2025 14:47:26 -0700 Subject: [PATCH 2/5] Update black version to resolve compatibility error. --- .github/workflows/github-actions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml index 628404ce7..7295eb7e7 100644 --- a/.github/workflows/github-actions.yml +++ b/.github/workflows/github-actions.yml @@ -193,7 +193,7 @@ jobs: - name: Update Black run: | - pip install black==21.12b0 + pip install black==25.1.0 pip install flake8==7.1.2 - name: Style check python files From 68a6d9f349dafc513f02327a2e7b21c46a3788d7 Mon Sep 17 00:00:00 2001 From: Tapasya Patki Date: Fri, 4 Apr 2025 15:25:34 -0700 Subject: [PATCH 3/5] Update python version to 3.9 for CI --- .github/workflows/github-actions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml index 7295eb7e7..a89c0c6ea 100644 --- a/.github/workflows/github-actions.yml +++ b/.github/workflows/github-actions.yml @@ -166,7 +166,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - python-version: [3.7] + python-version: [3.9] steps: # Checkout variorum repository under $GITHUB_WORKSPACE From 6b10efc9b72cbf4793d02e82216eb7535edcf212 Mon Sep 17 00:00:00 2001 From: Tapasya Patki Date: Fri, 4 Apr 2025 15:33:58 -0700 Subject: [PATCH 4/5] Still fails, bump up python to 3.11 --- .github/workflows/github-actions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml index a89c0c6ea..4408dc10d 100644 --- a/.github/workflows/github-actions.yml +++ b/.github/workflows/github-actions.yml @@ -166,7 +166,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - python-version: [3.9] + python-version: [3.11] steps: # Checkout variorum repository under $GITHUB_WORKSPACE From 48ca4c087a0de07079149e8abda4de2c078f5315 Mon Sep 17 00:00:00 2001 From: Tapasya Patki Date: Fri, 4 Apr 2025 15:40:18 -0700 Subject: [PATCH 5/5] Rebase and format --- src/docs/sphinx/Argo.rst | 10 +++++----- src/utilities/verify_msr_kernel.py | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/docs/sphinx/Argo.rst b/src/docs/sphinx/Argo.rst index 7bc76c294..d26d006f8 100644 --- a/src/docs/sphinx/Argo.rst +++ b/src/docs/sphinx/Argo.rst @@ -39,11 +39,11 @@ and node-local mechanisms and policies. This includes developing and enabling power management in HPC schedulers (such as SLURM and Flux), large-scale system monitoring frameworks (LDMS), application profilers (such as Caliper), runtime system frameworks (such as Kokkos, GEOPM), and similar system- and -application-level frameworks. Variorum has been integrated with GEOPM through -a GEOPM `PlatformIO plugin for Variorum -https://github.com/amarathe84/geopm/pull/2>`_ named VariorumIO. -Using VariorumIO, GEOPM leverages Variorum's platform-agnostic API to query -power usage on the target system. +application-level frameworks. Variorum has been integrated with GEOPM through a +GEOPM `PlatformIO plugin for Variorum +https://github.com/amarathe84/geopm/pull/2>`_ named VariorumIO. Using +VariorumIO, GEOPM leverages Variorum's platform-agnostic API to query power +usage on the target system. `Hardware co-design` involves working closely with our vendors to continuously explore emerging new hardware trends and devices, and look for how best to diff --git a/src/utilities/verify_msr_kernel.py b/src/utilities/verify_msr_kernel.py index 1a689ed7f..7656a8a02 100755 --- a/src/utilities/verify_msr_kernel.py +++ b/src/utilities/verify_msr_kernel.py @@ -304,9 +304,9 @@ def check_msr_files_access(verbose): # if msr kernel is loaded err = check_msr_kernel_loaded(verbose) if err == 0: - err = check_msr_files_character_devices( + err = check_msr_files_character_devices(verbose) or check_msr_files_access( verbose - ) or check_msr_files_access(verbose) + ) if err == 0: print("-- Valid kernel loaded: msr") found_valid_kernel = 1