Merge branch 'dev' into dev

Author: amd-arsuresh

.github/workflows/test-mlperf-inference-yolo-closed-div.yml

@@ -6,7 +6,7 @@ on:
   schedule:
     - cron: '0 0 * * *'  # Runs daily at 12 AM UTC
   pull_request_target:
-    branches: [ "main_off", "dev_off" ]
+    branches: [ "main", "dev" ]
     paths:
       - '.github/workflows/test-mlperf-inference-yolo.yml'
       - '**'
@@ -17,7 +17,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     env:
       MLC_INDEX: "on"
-      SUBMISSION_DIR: ${{ github.workspace }}/mlperf_inference_results
+      RESULTS_DIR: ${{ github.workspace }}/mlperf_inference_results
     strategy:
       fail-fast: false
       matrix:
@@ -51,20 +51,22 @@ jobs:
     - name: Test MLPerf Inference YOLO-v11 (Linux/macOS)
       run: |
         mlcr run-mlperf,inference,_full,_find-performance,_all-scenarios,_r6.0-dev --submitter="MLCommons" --pull_changes=yes --pull_inference_changes=yes --hw_name="gh_${{ matrix.os }}x86" --model=yolo-99 --implementation=reference --category=edge --backend=${{ matrix.backend }} --framework=pytorch --device=cpu --execution_mode=test -v --quiet     
-        mlcr run-mlperf,inference,_submission,_full,_all-modes,_all-scenarios,_r6.0-dev --division=closed --submission_dir=${{ env.SUBMISSION_DIR }} --submitter="MLCommons" --pull_changes=yes --pull_inference_changes=yes --hw_name="gh_${{ matrix.os }}x86" --model=yolo-99 --implementation=reference --category=edge --backend=${{ matrix.backend }} --framework=pytorch --device=cpu --execution_mode=valid --multistream_target_latency=900 --env.MLC_MLPERF_USE_MAX_DURATION=no -v --quiet     
-    
+        mlcr run-mlperf,inference,_compliance,_full,_all-modes,_all-scenarios,_r6.0-dev --division=closed --results_dir=${{ env.RESULTS_DIR }}  --model=yolo-99 --implementation=reference --category=edge --backend=${{ matrix.backend }} --framework=pytorch --device=cpu --execution_mode=valid --multistream_target_latency=900 --env.MLC_MLPERF_USE_MAX_DURATION=no -v --quiet --submitter="MLCommons" --pull_changes=yes --pull_inference_changes=yes --hw_name="gh_${{ matrix.os }}_python${{ matrix.python-version }}x86"
     - name: upload results artifact
       uses: actions/upload-artifact@v4
       with:
         name: mlperf-inference-yolo-results-${{ matrix.os }}-py${{ matrix.python-version }}-bk${{ matrix.backend }}
-        path: ${{ env.SUBMISSION_DIR }}
+        path: ${{ env.RESULTS_DIR }}
 
   upload-results-to-github:
     needs: mlc-run
     runs-on: ubuntu-latest
     env:
       MLC_INDEX: "on"
-      SUBMISSION_DIR: ${{ github.workspace }}/mlperf_inference_results
+      SUBMISSION_DIR: ${{ github.workspace }}/mlperf_inference_submission
+      ARTIFACT_DOWNLOAD_PATH: ${{ github.workspace }}/gh_artifacts
+      RESULTS_DIR: ${{ github.workspace }}/mlperf_inference_results
+
     concurrency: 
       group: upload-results-v6.0
       cancel-in-progress: false
@@ -100,7 +102,7 @@ jobs:
     - name: Download benchmark artifacts
       uses: actions/download-artifact@v4
       with:
-        path: "${{ env.SUBMISSION_DIR }}/closed"
+        path: "${{ env.ARTIFACT_DOWNLOAD_PATH }}"
 
     - name: Load secrets
       id: op-load-secrets
@@ -109,6 +111,26 @@ jobs:
         OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }}
         PAT: op://7basd2jirojjckncf6qnq3azai/bzbaco3uxoqs2rcyu42rvuccga/credential
 
+    - name: Prepare Results Directory
+      run: |
+        set -euo pipefail
+
+        mkdir -p "${{ env.RESULTS_DIR }}"
+
+        # Iterate over system folders
+        for system_dir in "${{ env.ARTIFACT_DOWNLOAD_PATH }}/*"; do
+          if [ -d "${system_dir}/valid_results" ]; then
+            echo "Processing ${system_dir}/valid_results"
+            cp -r "${system_dir}/valid_results/"* "${{ env.RESULTS_DIR }}/"
+          else
+            echo "Skipping ${system_dir} (no valid_results directory)"
+          fi
+        done
+
+        tree -a "${{ env.RESULTS_DIR }}"
+
+        mlcr generate,inference,submission --adr.compiler.tags=gcc --version=v6.0 --clean --preprocess_submission=yes --submission_base_dir="${{ env.SUBMISSION_DIR}}" --results_dir="${{ env.RESULTS_DIR }}" --run_checker --submitter=MLCommons --tar=yes --division=closed --env.MLC_DETERMINE_MEMORY_CONFIGURATION=yes --extra_checker_args="--skip-extra-accuracy-files-check" --quiet $docker_tags
+            
     - name: Push Results
       env:
         GITHUB_TOKEN: ${{ steps.op-load-secrets.outputs.PAT }}

script/app-mlperf-inference/meta.yaml

@@ -1720,7 +1720,7 @@ variations:
           - "yes"
       mounts:
         - "${{ MLC_ML_MODEL_YOLOV11_PATH }}:${{ MLC_ML_MODEL_YOLOV11_PATH }}"
-        - "${{ MLC_DATASET_YOLO_COCO2017_FILTERED_PATH }}:${{ MLC_DATASET_YOLO_COCO2017_FILTERED_PATH }}"
+        - "${{ MLC_ML_DATASET_MLPERF_INFERENCE_YOLO_COCO2017_FILTERED_DATASET_PATH }}:${{ MLC_ML_DATASET_MLPERF_INFERENCE_YOLO_COCO2017_FILTERED_DATASET_PATH }}"
     posthook_deps:
     - enable_if_env:
         MLC_MLPERF_LOADGEN_MODE:

script/get-dataset-mlperf-inference-yolo-coco2017-filtered-dataset/customize.py

@@ -24,8 +24,9 @@ def postprocess(i):
     env = i['env']
 
     if env.get('MLC_DOWNLOAD_MODE', '') != 'dry':
-        env['MLC_ML_DATASET_MLPERF_INFERENCE_YOLO_COCO2017_FILTERED_DATASET_PATH'] = os.path.join(
-            env['MLC_ML_DATASET_MLPERF_INFERENCE_YOLO_COCO2017_FILTERED_DATASET_PATH'], "val2017_safe")
+        if env.get('MLC_TMP_REQUIRE_DOWNLOAD', '') == "yes":
+            env['MLC_ML_DATASET_MLPERF_INFERENCE_YOLO_COCO2017_FILTERED_DATASET_PATH'] = os.path.join(
+                env['MLC_ML_DATASET_MLPERF_INFERENCE_YOLO_COCO2017_FILTERED_DATASET_PATH'], "val2017_safe")
         env['MLC_ML_DATASET_FILE_WITH_PATH'] = env['MLC_ML_DATASET_MLPERF_INFERENCE_YOLO_COCO2017_FILTERED_DATASET_PATH']
         env['MLC_ML_DATASET_MLPERF_INFERENCE_YOLO_COCO2017_FILTERED_DATASET_ANNOTATION_PATH'] = os.path.join(
             env['MLC_ML_DATASET_FILE_WITH_PATH'], "annotations", "instances_val2017.json")

script/get-lib-jemalloc/README.md

@@ -59,6 +59,12 @@ No script specific inputs
 | `--verify_ssl` | Verify SSL |  | `False` |
 ## Variations
 
+### Repo
+
+- `url.#` _(# can be substituted dynamically)_
+- `url.facebook` (default)
+- `url.official`
+
 ### Ungrouped
 
 - `branch.#` _(# can be substituted dynamically)_
@@ -69,10 +75,5 @@ No script specific inputs
 - `lg-page.#` _(# can be substituted dynamically)_
 - `lg-quantum.#` _(# can be substituted dynamically)_
 - `sha.#` _(# can be substituted dynamically)_
+- `version.#` _(# can be substituted dynamically)_
 - `version.official` (base: url.official)
-
-### Version
-
-- `url.#` _(# can be substituted dynamically)_
-- `url.facebook` (default)
-- `url.official`

script/get-ml-model-yolov11/customize.py

@@ -23,8 +23,9 @@ def postprocess(i):
     env = i['env']
 
     if env.get('MLC_DOWNLOAD_MODE', '') != 'dry':
-        env['MLC_ML_MODEL_YOLOV11_PATH'] = os.path.join(
-            env['MLC_ML_MODEL_YOLOV11_PATH'], 'yolo11l.pt')
+        if env.get('MLC_TMP_REQUIRE_DOWNLOAD') == "yes":
+            env['MLC_ML_MODEL_YOLOV11_PATH'] = os.path.join(
+                env['MLC_ML_MODEL_YOLOV11_PATH'], 'yolo11l.pt')
         env['MLC_ML_MODEL_FILE_WITH_PATH'] = env['MLC_ML_MODEL_YOLOV11_PATH']
 
     return {'return': 0}