Merge pull request #148 from mlcommons/dev

Sync Dev

Author: arjunsuresh

script/test-cm-core/src/script/process_tests.py renamed to .github/scripts/process_individual_tests.py

@@ -1,7 +1,6 @@
 import sys
 import os
-import cmind as cm
-import check as checks
+import mlc
 import json
 import yaml
 
@@ -11,7 +10,7 @@
     print(file)
     if not os.path.isfile(file) or not "script" in file:
         continue
-    if not file.endswith("_cm.json") and not file.endswith("_cm.yaml"):
+    if not file.endswith("meta.json") and not file.endswith("meta.yaml"):
         continue
     script_path = os.path.dirname(file)
     f = open(file)
@@ -24,15 +23,15 @@
     uid = data['uid']
 
     ii = {
-        'action': 'test', 'automation': 'script', 'artifact': uid, 'quiet': 'yes', 'out': 'con'
+        'action': 'test', 'target': 'script', 'item': uid, 'quiet': 'yes', 'out': 'con'
     }
-    if os.environ.get('DOCKER_CM_REPO', '') != '':
-        ii['docker_cm_repo'] = os.environ['DOCKER_CM_REPO']
-    if os.environ.get('DOCKER_CM_REPO_BRANCH', '') != '':
-        ii['docker_cm_repo_branch'] = os.environ['DOCKER_CM_REPO_BRANCH']
+    if os.environ.get('DOCKER_MLC_REPO', '') != '':
+        ii['docker_mlc_repo'] = os.environ['DOCKER_MLC_REPO']
+    if os.environ.get('DOCKER_MLC_REPO_BRANCH', '') != '':
+        ii['docker_mlc_repo_branch'] = os.environ['DOCKER_MLC_REPO_BRANCH']
     if os.environ.get('TEST_INPUT_INDEX', '') != '':
         ii['test_input_index'] = os.environ['TEST_INPUT_INDEX']
     print(ii)
-    r = cm.access(ii)
-
-    checks.check_return(r)
+    ret = mlc.access(ii)
+    if ret['return'] > 0:
+        raise Exception(r['error'])

.github/workflows/build_wheel.yml

@@ -11,7 +11,6 @@ on:
       - VERSION
       - setup.py
 
-
 jobs:
   build_wheels:
     if: github.repository_owner == 'mlcommons'

.github/workflows/format.yml

@@ -11,6 +11,8 @@ env:
 jobs:
   format-code:
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -54,8 +56,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 github-actions[bot]
+            git config --global user.email "github-actions[bot]@users.noreply.github.com"
             # Commit changes
             git commit -m '[Automated Commit] Format Codebase'
             git push 

.github/workflows/run-individual-script-tests.yml

@@ -1,12 +1,12 @@
 # This workflow will run configured tests for any updated CM scripts
-name: Individual CM script Tests
+name: Individual Automation script Tests
 
 on:
   pull_request:
     branches: [ "main", "dev" ]
     paths:
-      - 'script/**_cm.json'
-      - 'script/**_cm.yaml'
+      - 'script/**meta.json'
+      - 'script/**meta.yaml'
 
 jobs:
   run-script-tests:
@@ -32,6 +32,6 @@ jobs:
         for file in ${{ steps.getfile.outputs.files }}; do
           echo $file
         done
-        CM_PULL_DEFAULT_MLOPS_REPO=no pip install cm4mlops
-        cm pull repo --url=${{ github.event.pull_request.head.repo.html_url }} --checkout=${{ github.event.pull_request.head.ref }}
-        DOCKER_CM_REPO=${{ github.event.pull_request.head.repo.html_url }} DOCKER_CM_REPO_BRANCH=${{ github.event.pull_request.head.ref }} TEST_INPUT_INDEX=${{ matrix.test-input-index }} python3 script/test-cm-core/src/script/process_tests.py ${{ steps.getfile.outputs.files }}
+        pip install mlcflow
+        mlc pull repo ${{ github.event.pull_request.head.repo.html_url }} --branch=${{ github.event.pull_request.head.ref }}
+        DOCKER_MLC_REPO=${{ github.event.pull_request.head.repo.html_url }} DOCKER_MLC_REPO_BRANCH=${{ github.event.pull_request.head.ref }} TEST_INPUT_INDEX=${{ matrix.test-input-index }} python3 .github/scripts/process_individual_tests.py ${{ steps.getfile.outputs.files }}

.github/workflows/test-amd-mlperf-inference-implementations.yml

@@ -19,8 +19,8 @@ jobs:
           if [ -f "gh_action/bin/deactivate" ]; then source gh_action/bin/deactivate; fi
           python3 -m venv gh_action
           source gh_action/bin/activate
-          export CM_REPOS=$HOME/GH_CM
+          export MLC_REPOS=$HOME/GH_MLC
           pip install --upgrade cm4mlops
           cm pull repo
-          cm run script --tags=run-mlperf,inference,_all-scenarios,_full,_r4.1-dev  --execution_mode=valid  --pull_changes=yes --pull_inference_changes=yes --model=${{ matrix.model }} --submitter="MLCommons" --hw_name=IntelSPR.24c  --implementation=amd    --backend=pytorch    --category=datacenter --division=open --scenario=Offline  --docker_dt=yes --docker_it=no --docker_cm_repo=gateoverflow@mlperf-automations --docker_cm_repo_branch=dev --adr.compiler.tags=gcc --device=rocm --use_dataset_from_host=yes  --results_dir=$HOME/gh_action_results --submission_dir=$HOME/gh_action_submissions --clean  --docker --quiet --docker_skip_run_cmd=yes
-          # cm run script --tags=push,github,mlperf,inference,submission --repo_url=https://github.com/mlcommons/mlperf_inference_unofficial_submissions_v5.0 --repo_branch=dev --commit_message="Results from GH action on SPR.24c" --quiet --submission_dir=$HOME/gh_action_submissions --hw_name=IntelSPR.24c
+          mlcr --tags=run-mlperf,inference,_all-scenarios,_full,_r4.1-dev  --execution_mode=valid  --pull_changes=yes --pull_inference_changes=yes --model=${{ matrix.model }} --submitter="MLCommons" --hw_name=IntelSPR.24c  --implementation=amd    --backend=pytorch    --category=datacenter --division=open --scenario=Offline  --docker_dt=yes --docker_it=no --docker_mlc_repo=gateoverflow@mlperf-automations --docker_mlc_repo_branch=dev --adr.compiler.tags=gcc --device=rocm --use_dataset_from_host=yes  --results_dir=$HOME/gh_action_results --submission_dir=$HOME/gh_action_submissions --clean  --docker --quiet --docker_skip_run_cmd=yes
+          # mlcr --tags=push,github,mlperf,inference,submission --repo_url=https://github.com/mlcommons/mlperf_inference_unofficial_submissions_v5.0 --repo_branch=dev --commit_message="Results from GH action on SPR.24c" --quiet --submission_dir=$HOME/gh_action_submissions --hw_name=IntelSPR.24c