From c47491dd40f88682fbb3a729d8d2eeb1572b7fdb Mon Sep 17 00:00:00 2001 From: Arjun Suresh Date: Tue, 7 Jan 2025 23:20:24 +0000 Subject: [PATCH 01/14] Update sources_checksums.json --- compliance/sources_checksums.json | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/compliance/sources_checksums.json b/compliance/sources_checksums.json index 78a240f1..0d4f101c 100644 --- a/compliance/sources_checksums.json +++ b/compliance/sources_checksums.json @@ -1,19 +1,2 @@ [ - { - "__init__.py": "da39a3ee5e6b4b0d3255bfef95601890afd80709", - "client.py": "33ca4f26368777ac06e01f9567b714a4b8063886", - "lib/__init__.py": "da39a3ee5e6b4b0d3255bfef95601890afd80709", - "lib/client.py": "ac2aa093c8e8bbc9569b9e2a3471bc64e58a2258", - "lib/common.py": "611d8b29633d331eb19c9455ea3b5fa3284ed6df", - "lib/external/__init__.py": "da39a3ee5e6b4b0d3255bfef95601890afd80709", - "lib/external/ntplib.py": "4da8f970656505a40483206ef2b5d3dd5e81711d", - "lib/server.py": "99303c836c683aa9017ec565104e636161d02acb", - "lib/source_hashes.py": "60a2e02193209e8d392803326208d5466342da18", - "lib/summary.py": "aa92f0a3f975eecd44d3c0cd0236342ccc9f941d", - "lib/time_sync.py": "80894ef2389e540781ff78de94db16aa4203a14e", - "server.py": "c3f90f2f7eeb4db30727556d0c815ebc89b3d28b", - "tests/unit/__init__.py": "da39a3ee5e6b4b0d3255bfef95601890afd80709", - "tests/unit/test_server.py": "948c1995d4008bc2aa6c4046a34ffa3858d6d671", - "tests/unit/test_source_hashes.py": "00468a2907583c593e6574a1f6b404e4651c221a" - } -] \ No newline at end of file +] From 10284184c7518b53c274473e1848889982ec54a0 Mon Sep 17 00:00:00 2001 From: Arjun Suresh Date: Tue, 7 Jan 2025 23:24:56 +0000 Subject: [PATCH 02/14] Update check.py | Only support PTD 1.11.1 for inference 5.0 --- compliance/check.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compliance/check.py b/compliance/check.py index 93d9d6fb..06b058da 100755 --- a/compliance/check.py +++ b/compliance/check.py @@ -39,7 +39,7 @@ class CheckerWarning(Exception): pass -SUPPORTED_VERSION = ["1.10.0"] +SUPPORTED_VERSION = ["1.11.1"] SUPPORTED_MODEL = { "YokogawaWT210": 8, "YokogawaWT500": 35, @@ -214,7 +214,7 @@ def get_ptd_answer(command: str) -> str: assert ( version in SUPPORTED_VERSION - ), f"PTD version {version!r} is not supported. Supported versions are 1.10.0" + ), f"PTD version {version!r} is not supported. Supported versions are {SUPPORTED_VERSION}" assert ( power_meter_model in SUPPORTED_MODEL.keys() ), f"Power meter {power_meter_model!r} is not supported. Only {', '.join(SUPPORTED_MODEL.keys())} are supported." From c02210b660e102ed08800e64787f3b180857a8f9 Mon Sep 17 00:00:00 2001 From: Arjun Suresh Date: Tue, 7 Jan 2025 23:25:05 +0000 Subject: [PATCH 03/14] Create update_checksums.yml --- .github/workflows/update_checksums.yml | 52 ++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 .github/workflows/update_checksums.yml diff --git a/.github/workflows/update_checksums.yml b/.github/workflows/update_checksums.yml new file mode 100644 index 00000000..6fa371dc --- /dev/null +++ b/.github/workflows/update_checksums.yml @@ -0,0 +1,52 @@ +name: Update checksums +on: + push: + branches: + - master + paths: + - 'compliance/**' + - '.github/workflows/update_checksums.yaml' + - '__init__.py' + - 'client.py' + - 'lib/__init__.py' + - 'lib/client.py' + - 'lib/common.py' + - 'lib/external/__init__.py' + - 'lib/external/ntplib.py' + - 'lib/server.py' + - 'lib/source_hashes.py' + - 'lib/summary.py' + - 'lib/time_sync.py' + - 'server.py' + - 'tests/unit/__init__.py' + - 'tests/unit/test_server.py' + - 'tests/unit/test_source_hashes.py' +jobs: + check: + name: Check Python + runs-on: "${{ matrix.on }}" + strategy: + fail-fast: false + matrix: + python-version: [3.9] + on: [ubuntu-latest] + + steps: + - uses: actions/checkout@v4 + + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v2 + with: + python-version: ${{ matrix.python-version }} + + - name: Update the source checksums + run: | + python3 compliance/helper/update_sources_checksum.py + HAS_CHANGES=$(git diff --staged --name-only) + if [ ${#HAS_CHANGES} -gt 0 ]; then + # Use the GitHub actor's name and email + git config --global user.name "${GITHUB_ACTOR}" + git config --global user.email "${GITHUB_ACTOR}@users.noreply.github.com" + # Commit changes + git commit -m '[Automated Commit] Update checksums' + git push From 3b1b0c348063d1d2342ba813c1d7cf6b13c80022 Mon Sep 17 00:00:00 2001 From: Arjun Suresh Date: Tue, 7 Jan 2025 23:28:57 +0000 Subject: [PATCH 04/14] Update update_checksums.yml --- .github/workflows/update_checksums.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/update_checksums.yml b/.github/workflows/update_checksums.yml index 6fa371dc..721454ff 100644 --- a/.github/workflows/update_checksums.yml +++ b/.github/workflows/update_checksums.yml @@ -21,8 +21,9 @@ on: - 'tests/unit/__init__.py' - 'tests/unit/test_server.py' - 'tests/unit/test_source_hashes.py' + jobs: - check: + update_checksums: name: Check Python runs-on: "${{ matrix.on }}" strategy: @@ -33,6 +34,8 @@ jobs: steps: - uses: actions/checkout@v4 + with: + fetch-depth: 0 - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v2 From d4b9d97ba393e8dc19e12b56b664247fc7a63f54 Mon Sep 17 00:00:00 2001 From: Arjun Suresh Date: Tue, 7 Jan 2025 23:30:06 +0000 Subject: [PATCH 05/14] Update update_checksums.yml --- .github/workflows/update_checksums.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update_checksums.yml b/.github/workflows/update_checksums.yml index 721454ff..c8ee3bc1 100644 --- a/.github/workflows/update_checksums.yml +++ b/.github/workflows/update_checksums.yml @@ -5,7 +5,7 @@ on: - master paths: - 'compliance/**' - - '.github/workflows/update_checksums.yaml' + - '.github/workflows/update_checksums.yml' - '__init__.py' - 'client.py' - 'lib/__init__.py' From 15832d3e7be2dcca6c49abcb2a8a5190867129d9 Mon Sep 17 00:00:00 2001 From: Arjun Suresh Date: Tue, 7 Jan 2025 23:33:02 +0000 Subject: [PATCH 06/14] Update update_checksums.yml --- .github/workflows/update_checksums.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/update_checksums.yml b/.github/workflows/update_checksums.yml index c8ee3bc1..2f4be819 100644 --- a/.github/workflows/update_checksums.yml +++ b/.github/workflows/update_checksums.yml @@ -52,4 +52,5 @@ jobs: git config --global user.email "${GITHUB_ACTOR}@users.noreply.github.com" # Commit changes git commit -m '[Automated Commit] Update checksums' - git push + git push + fi From 60c212848c1f1d37e8df5474ae23fec09e2f1bd0 Mon Sep 17 00:00:00 2001 From: Arjun Suresh Date: Tue, 7 Jan 2025 23:36:43 +0000 Subject: [PATCH 07/14] Update update_checksums.yml --- .github/workflows/update_checksums.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/update_checksums.yml b/.github/workflows/update_checksums.yml index 2f4be819..f64ad748 100644 --- a/.github/workflows/update_checksums.yml +++ b/.github/workflows/update_checksums.yml @@ -45,12 +45,13 @@ jobs: - name: Update the source checksums run: | python3 compliance/helper/update_sources_checksum.py + git diff-index --quiet HEAD || (echo "$ver_num" > dbversion && git add dbversion && git commit -am "Updated results summary" && git pull --rebase && git push) HAS_CHANGES=$(git diff --staged --name-only) if [ ${#HAS_CHANGES} -gt 0 ]; then # Use the GitHub actor's name and email git config --global user.name "${GITHUB_ACTOR}" git config --global user.email "${GITHUB_ACTOR}@users.noreply.github.com" # Commit changes - git commit -m '[Automated Commit] Update checksums' + git commit -am '[Automated Commit] Update checksums' git push fi From 9969f1ad6b04924cd80362b80dcbb9d80d093a01 Mon Sep 17 00:00:00 2001 From: Arjun Suresh Date: Tue, 7 Jan 2025 23:38:23 +0000 Subject: [PATCH 08/14] Update update_checksums.yml --- .github/workflows/update_checksums.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/update_checksums.yml b/.github/workflows/update_checksums.yml index f64ad748..0fe6ae52 100644 --- a/.github/workflows/update_checksums.yml +++ b/.github/workflows/update_checksums.yml @@ -49,8 +49,8 @@ jobs: HAS_CHANGES=$(git diff --staged --name-only) if [ ${#HAS_CHANGES} -gt 0 ]; then # Use the GitHub actor's name and email - git config --global user.name "${GITHUB_ACTOR}" - git config --global user.email "${GITHUB_ACTOR}@users.noreply.github.com" + git config --global user.name mlcommons-bot + git config --global user.email "mlcommons-bot@users.noreply.github.com" # Commit changes git commit -am '[Automated Commit] Update checksums' git push From 221c59b236766a95c9cbb5a8bd7ed89d338c7e8e Mon Sep 17 00:00:00 2001 From: Arjun Suresh Date: Tue, 7 Jan 2025 23:40:23 +0000 Subject: [PATCH 09/14] Update update_checksums.yml --- .github/workflows/update_checksums.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/update_checksums.yml b/.github/workflows/update_checksums.yml index 0fe6ae52..9da1556e 100644 --- a/.github/workflows/update_checksums.yml +++ b/.github/workflows/update_checksums.yml @@ -45,12 +45,11 @@ jobs: - name: Update the source checksums run: | python3 compliance/helper/update_sources_checksum.py - git diff-index --quiet HEAD || (echo "$ver_num" > dbversion && git add dbversion && git commit -am "Updated results summary" && git pull --rebase && git push) HAS_CHANGES=$(git diff --staged --name-only) if [ ${#HAS_CHANGES} -gt 0 ]; then # Use the GitHub actor's name and email - git config --global user.name mlcommons-bot - git config --global user.email "mlcommons-bot@users.noreply.github.com" + git config --global user.name "${GITHUB_ACTOR}" + git config --global user.email "${GITHUB_ACTOR}@users.noreply.github.com" # Commit changes git commit -am '[Automated Commit] Update checksums' git push From 3048e989d6b4a6a1596b930de25625ba26fe0683 Mon Sep 17 00:00:00 2001 From: Arjun Suresh Date: Tue, 7 Jan 2025 23:42:46 +0000 Subject: [PATCH 10/14] Update update_checksums.yml --- .github/workflows/update_checksums.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/update_checksums.yml b/.github/workflows/update_checksums.yml index 9da1556e..8eddcd34 100644 --- a/.github/workflows/update_checksums.yml +++ b/.github/workflows/update_checksums.yml @@ -45,11 +45,11 @@ jobs: - name: Update the source checksums run: | python3 compliance/helper/update_sources_checksum.py + git config --global user.name "${GITHUB_ACTOR}" + git config --global user.email "${GITHUB_ACTOR}@users.noreply.github.com" + git add compliance/sources_checksums.json HAS_CHANGES=$(git diff --staged --name-only) if [ ${#HAS_CHANGES} -gt 0 ]; then - # Use the GitHub actor's name and email - git config --global user.name "${GITHUB_ACTOR}" - git config --global user.email "${GITHUB_ACTOR}@users.noreply.github.com" # Commit changes git commit -am '[Automated Commit] Update checksums' git push From b54ffe20d8e52328db0a7d80331429e370cff400 Mon Sep 17 00:00:00 2001 From: arjunsuresh Date: Tue, 7 Jan 2025 23:42:57 +0000 Subject: [PATCH 11/14] [Automated Commit] Update checksums --- compliance/sources_checksums.json | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/compliance/sources_checksums.json b/compliance/sources_checksums.json index 0d4f101c..ec8e7bc8 100644 --- a/compliance/sources_checksums.json +++ b/compliance/sources_checksums.json @@ -1,2 +1,19 @@ [ -] + { + "__init__.py": "da39a3ee5e6b4b0d3255bfef95601890afd80709", + "client.py": "33ca4f26368777ac06e01f9567b714a4b8063886", + "lib/__init__.py": "da39a3ee5e6b4b0d3255bfef95601890afd80709", + "lib/client.py": "ac2aa093c8e8bbc9569b9e2a3471bc64e58a2258", + "lib/common.py": "611d8b29633d331eb19c9455ea3b5fa3284ed6df", + "lib/external/__init__.py": "da39a3ee5e6b4b0d3255bfef95601890afd80709", + "lib/external/ntplib.py": "4da8f970656505a40483206ef2b5d3dd5e81711d", + "lib/server.py": "9bc9a3b6b9b716520658ac175913bcbbdb354336", + "lib/source_hashes.py": "60a2e02193209e8d392803326208d5466342da18", + "lib/summary.py": "602a9fedfa503e5544d27ab3b0067f235047efc3", + "lib/time_sync.py": "80894ef2389e540781ff78de94db16aa4203a14e", + "server.py": "c3f90f2f7eeb4db30727556d0c815ebc89b3d28b", + "tests/unit/__init__.py": "da39a3ee5e6b4b0d3255bfef95601890afd80709", + "tests/unit/test_server.py": "948c1995d4008bc2aa6c4046a34ffa3858d6d671", + "tests/unit/test_source_hashes.py": "00468a2907583c593e6574a1f6b404e4651c221a" + } +] \ No newline at end of file From 400d958a4ea585274cc44e788bbeb10da5aa93eb Mon Sep 17 00:00:00 2001 From: Arjun Suresh Date: Tue, 7 Jan 2025 23:57:31 +0000 Subject: [PATCH 12/14] Update inference_power_workflow.yaml --- .github/workflows/inference_power_workflow.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/inference_power_workflow.yaml b/.github/workflows/inference_power_workflow.yaml index 901aa268..d7eeeb4e 100644 --- a/.github/workflows/inference_power_workflow.yaml +++ b/.github/workflows/inference_power_workflow.yaml @@ -25,8 +25,7 @@ jobs: - name: Install dependencies run: | python3 -m pip install --upgrade pip - python3 -m pip install cmind - cm pull repo mlcommons@ck + python3 -m pip install cm4mlops cm run script --quiet --tags=get,sys-utils-cm - name: Start power server @@ -35,4 +34,4 @@ jobs: - name: Test CM Script for MLPerf Inference ResNet50 with power run: | - cm run script --tags=run,mlperf,inference,generate-run-cmds,_performance-only,_short --submitter="cTuning" --model=resnet50 --backend=onnxruntime --device=cpu --scenario=Offline --test_query_count=5 --precision=fp32 --quiet --power=yes + cm run script --tags=run,mlperf,inference,generate-run-cmds,_performance-only,_short --submitter="MLCommons" --model=resnet50 --backend=onnxruntime --device=cpu --scenario=Offline --test_query_count=5 --precision=fp32 --quiet --power=yes From b50c3fbe91ab71ad526288cf6756538454fffe34 Mon Sep 17 00:00:00 2001 From: Arjun Suresh Date: Wed, 8 Jan 2025 00:07:39 +0000 Subject: [PATCH 13/14] Update python_compliance.yaml --- .github/workflows/python_compliance.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python_compliance.yaml b/.github/workflows/python_compliance.yaml index 2c8089c7..beaf0056 100644 --- a/.github/workflows/python_compliance.yaml +++ b/.github/workflows/python_compliance.yaml @@ -15,7 +15,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: [3.7, 3.8, 3.9] + python-version: [3.8, 3.9, 3.10, 3.11] on: [ubuntu-latest, windows-latest] steps: From 2f75bedb5612f88755111ed46dedd439e7c14293 Mon Sep 17 00:00:00 2001 From: Arjun Suresh Date: Wed, 8 Jan 2025 00:16:31 +0000 Subject: [PATCH 14/14] Update python_compliance.yaml --- .github/workflows/python_compliance.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python_compliance.yaml b/.github/workflows/python_compliance.yaml index beaf0056..5c7f77ab 100644 --- a/.github/workflows/python_compliance.yaml +++ b/.github/workflows/python_compliance.yaml @@ -15,7 +15,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: [3.8, 3.9, 3.10, 3.11] + python-version: [3.8, 3.9] on: [ubuntu-latest, windows-latest] steps: