Merge pull request #426 from Oseltamivir/main

Fixes #261 partially
mlcommons · Nov 6, 2024 · 49e1cda · 49e1cda
2 parents 54afe33 + 8470530
commit 49e1cda
Show file tree

Hide file tree

Showing 13 changed files with 724 additions and 166 deletions.
diff --git a/.github/workflows/test-mlperf-inference-abtf-poc.yml b/.github/workflows/test-mlperf-inference-abtf-poc.yml
@@ -16,13 +16,25 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-22.04, ubuntu-20.04, ubuntu-24.04]
+        os: [ubuntu-22.04, ubuntu-20.04, ubuntu-24.04, macos-latest, macos-13, windows-latest]
         python-version: [ "3.8", "3.12" ]
         backend: [ "pytorch" ]
         implementation: [ "python" ]
+        extra-args: [ "--adr.compiler.tags=gcc" ]
         exclude:
         - os: ubuntu-24.04
           python-version: "3.8"
+        - os: windows-latest
+          python-version: "3.8"
+        - os: windows-latest
+          extra-args: "--adr.compiler.tags=gcc" 
+        - os: macos-latest
+          python-version: "3.8"
+        - os: macos-13
+          python-version: "3.8"
+        include:
+          - os: windows-latest
+            extra-args: "--env.CM_MLPERF_LOADGEN_BUILD_FROM_SRC=off"
 
     steps:
     - uses: actions/checkout@v3
@@ -35,58 +47,6 @@ jobs:
         pip install cmind
         cm pull repo --url=${{ github.event.pull_request.head.repo.html_url }} --checkout=${{ github.event.pull_request.head.ref }}
         cm pull repo mlcommons@cm4abtf --branch=poc
-    - name: Test MLPerf Inference ABTF POC using ${{ matrix.backend }} on docker
-      run: |
-        cm run script --tags=run-abtf,inference,_poc-demo --test_query_count=2 --adr.compiler.tags=gcc --adr.cocoeval.version_max=1.5.7 --adr.cocoeval.version_max_usable=1.5.7 --quiet  -v
-
-  build2:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [macos-latest, macos-13]
-        python-version: [ "3.12" ]
-        backend: [ "pytorch" ]
-        implementation: [ "python" ]
-
-    steps:
-    - uses: actions/checkout@v3
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v3
-      with:
-        python-version: ${{ matrix.python-version }}
-    - name: Install dependencies
-      run: |
-        python3 -m pip install cmind
-        cm pull repo --url=${{ github.event.pull_request.head.repo.html_url }} --checkout=${{ github.event.pull_request.head.ref }}
-        cm pull repo mlcommons@cm4abtf --branch=poc
-    - name: Test MLPerf Inference ABTF POC using ${{ matrix.backend }} on ${{ matrix.os }}
-      run: |
-        cm run script --tags=run-abtf,inference,_poc-demo --test_query_count=2 --adr.compiler.tags=gcc --adr.cocoeval.version_max=1.5.7 --adr.cocoeval.version_max_usable=1.5.7 --quiet  -v
-    
-  build3:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [windows-latest]
-        python-version: [ "3.12" ]
-        backend: [ "pytorch" ]
-        implementation: [ "python" ]
-        exclude:
-        - python-version: "3.8"
-
-    steps:
-    - uses: actions/checkout@v3
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v3
-      with:
-        python-version: ${{ matrix.python-version }}
-    - name: Install dependencies
-      run: |
-        python3 -m pip install cmind
-        cm pull repo --url=${{ github.event.pull_request.head.repo.html_url }} --checkout=${{ github.event.pull_request.head.ref }}
-        cm pull repo mlcommons@cm4abtf --branch=poc
     - name: Test MLPerf Inference ABTF POC using ${{ matrix.backend }} on ${{ matrix.os }}
       run: |
-        cm run script --tags=run-abtf,inference,_poc-demo --test_query_count=2 --quiet --env.CM_MLPERF_LOADGEN_BUILD_FROM_SRC=off --adr.cocoeval.version_max=1.5.7 --adr.cocoeval.version_max_usable=1.5.7  -v
+        cm run script --tags=run-abtf,inference,_poc-demo --test_query_count=2 --adr.cocoeval.version_max=1.5.7 --adr.cocoeval.version_max_usable=1.5.7 --quiet ${{ matrix.extra-args }} -v
diff --git a/automation/script/module.py b/automation/script/module.py
@@ -8,7 +8,6 @@
 # TBD: when we have bandwidth and resources, we should refactor it
 # and make it cleaner and simpler while keeping full backwards compatibility.
 #
-
 import os
 import logging
 
@@ -3979,7 +3978,7 @@ def parse_version(self, i):
            return r
 
         string = r['string']
-
+        
         if r['match'].lastindex and r['match'].lastindex >= group_number:
             version = r['match'].group(group_number)
         else:

diff --git a/script/app-mlperf-inference-nvidia/_cm.yaml b/script/app-mlperf-inference-nvidia/_cm.yaml
@@ -435,7 +435,8 @@ variations:
     - tags: get,generic-python-lib,_pycocotools
     - tags: get,generic-python-lib,_onnx-graphsurgeon
     - tags: get,generic-python-lib,_package.onnx
-      version: 1.13.1
+      version: 1.14.1
+    - tags: get,generic-python-lib,_package.sympy
 
   sdxl:
     new_env_keys:                                                                      

diff --git a/script/build-docker-image/customize.py b/script/build-docker-image/customize.py
@@ -54,7 +54,7 @@ def preprocess(i):
     image_name = get_image_name(env)
 
     if build_dockerfile:
-        dockerfile_path = "\${CM_DOCKERFILE_WITH_PATH}"
+        dockerfile_path = r"\${CM_DOCKERFILE_WITH_PATH}"
 
     # Write .dockerignore
     with open('.dockerignore', 'w') as f:

diff --git a/script/get-dataset-imagenet-aux/_cm.json b/script/get-dataset-imagenet-aux/_cm.json
@@ -39,6 +39,7 @@
     },
     "from.berkeleyvision": {
       "group": "download-source",
+      "default": true,
       "base": [
         "2012"
       ],
@@ -51,7 +52,6 @@
     },
     "from.dropbox": {
       "group": "download-source",
-      "default": true,
       "base": [
         "2012"
       ],