Merge pull request #217 from mlcommons/main

regular sync
mlcommons · Sep 16, 2024 · 73bbc25 · 73bbc25
2 parents dfbe406 + ad11c90
commit 73bbc25
Show file tree

Hide file tree

Showing 9 changed files with 71 additions and 62 deletions.
diff --git a/.github/workflows/test-cm-tutorial-retinanet.yml b/.github/workflows/test-cm-tutorial-retinanet.yml
@@ -19,7 +19,9 @@ jobs:
         python-version: ["3.9"]
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
+      with:
+        ref: ${{ github.event.pull_request.head.sha }}
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v3
       with:

diff --git a/.github/workflows/test-cm-tutorial-tvm-pip.yml b/.github/workflows/test-cm-tutorial-tvm-pip.yml
@@ -5,7 +5,7 @@ name: CM tutorial tvm pip install
 
 on:
   pull_request:
-    branches: [ "main", "test" ]
+    branches: [ "main", "test", "mlperf-inference" ]
     paths:
       - '.github/workflows/test-cm-tutorial-tvm-pip.yml'
       - '**'
@@ -20,7 +20,9 @@ jobs:
         python-version: ["3.9"]
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
+      with:
+        ref: ${{ github.event.pull_request.head.sha }}
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v3
       with:

diff --git a/.github/workflows/test-cm-tutorial-tvm.yml b/.github/workflows/test-cm-tutorial-tvm.yml
@@ -21,7 +21,9 @@ jobs:
         python-version: ["3.9"]
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
+      with:
+        ref: ${{ github.event.pull_request.head.sha }}
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v3
       with:

diff --git a/.github/workflows/test-mlperf-inference-abtf-poc.yml b/.github/workflows/test-mlperf-inference-abtf-poc.yml
@@ -37,7 +37,7 @@ jobs:
         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=5 --adr.compiler.tags=gcc --quiet  -v
+        cm run script --tags=run-abtf,inference,_poc-demo --test_query_count=5 --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 }}
@@ -62,7 +62,7 @@ jobs:
         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 --adr.compiler.tags=gcc --quiet  -v
+        cm run script --tags=run-abtf,inference,_poc-demo --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 }}
@@ -89,4 +89,4 @@ jobs:
         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 --quiet --env.CM_MLPERF_LOADGEN_BUILD_FROM_SRC=off  -v
+        cm run script --tags=run-abtf,inference,_poc-demo --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
diff --git a/script/app-mlperf-inference-mlcommons-python/_cm.yaml b/script/app-mlperf-inference-mlcommons-python/_cm.yaml
@@ -780,6 +780,9 @@ variations:
       CM_MLPERF_BACKEND_VERSION: <<<CM_ONNXRUNTIME_VERSION>>>
     deps:
     - tags: get,generic-python-lib,_onnx
+    - tags: get,generic-python-lib,_numpy
+      version_max: "1.26.4"
+      version_max_usable: "1.26.4"
     - tags: get,tvm
       names:
       - tvm

diff --git a/script/download-and-extract/_cm.json b/script/download-and-extract/_cm.json
@@ -76,7 +76,7 @@
   "uid": "c67e81a4ce2649f5",
   "variations": {
     "cmutil": {
-      "add_deps_recursive": {
+      "add_deps": {
         "download-script": {
           "tags": "_cmutil"
         }
@@ -85,7 +85,7 @@
       "group": "download-tool"
     },
     "curl": {
-      "add_deps_recursive": {
+      "add_deps": {
         "download-script": {
           "tags": "_wget"
         }
@@ -98,15 +98,15 @@
       }
     },
     "rclone": {
-      "add_deps_recursive": {
+      "add_deps": {
         "download-script": {
           "tags": "_rclone"
         }
       },
       "group": "download-tool"
     },
     "gdown": {
-      "add_deps_recursive": {
+      "add_deps": {
         "download-script": {
           "tags": "_gdown"
         }
@@ -154,7 +154,7 @@
       }
     },
     "wget": {
-      "add_deps_recursive": {
+      "add_deps": {
         "download-script": {
           "tags": "_wget"
         }

diff --git a/script/get-dataset-cifar10/requirements.txt b/script/get-dataset-cifar10/requirements.txt
@@ -1,47 +1,47 @@
-absl-py==0.11.0
-astunparse==1.6.3
-cachetools==4.2.1
-certifi==2020.12.5
-chardet==4.0.0
-cycler==0.10.0
-flatbuffers==1.12
-gast==0.4.0
-google-auth==1.27.0
-google-auth-oauthlib==0.4.2
-google-pasta==0.2.0
-grpcio==1.34.0
-h5py==3.1.0
-idna==2.10
-imageio==2.9.0
-joblib==1.1.1
-Keras-Preprocessing==1.1.2
-kiwisolver==1.3.1
-Markdown==3.3.3
-matplotlib==3.3.4
-numpy==1.19.5
-oauthlib==3.1.0
-opencv-python==4.5.1.48
-opt-einsum==3.3.0
-Pillow==8.1.0
-protobuf==3.14.0
-pyasn1==0.4.8
-pyasn1-modules==0.2.8
-pyparsing==2.4.7
-python-dateutil==2.8.1
-PyYAML==5.4.1
-requests==2.25.1
-requests-oauthlib==1.3.0
-rsa==4.7.1
-scikit-learn==0.24.1
-scipy==1.6.0
-six==1.15.0
-tensorboard==2.5.0
-tensorboard-plugin-wit==1.8.0
-tensorflow==2.5.0
-tensorflow-estimator==2.5.0
-termcolor==1.1.0
-threadpoolctl==2.1.0
-typing-extensions==3.7.4.3
-urllib3==1.26.3
-Werkzeug==1.0.1
-wrapt==1.12.1
+absl-py
+astunparse
+cachetools
+certifi
+chardet
+cycler
+flatbuffers
+gast
+google-auth
+google-auth-oauthlib
+google-pasta
+grpcio
+h5py
+idna
+imageio
+joblib
+Keras-Preprocessing
+kiwisolver
+Markdown
+matplotlib
+numpy
+oauthlib
+opencv-python
+opt-einsum
+Pillow
+protobuf
+pyasn1
+pyasn1-modules
+pyparsing
+python-dateutil
+PyYAML
+requests
+requests-oauthlib
+rsa
+scikit-learn
+scipy
+six
+tensorboard
+tensorboard-plugin-wit
+tensorflow
+tensorflow-estimator
+termcolor
+threadpoolctl
+typing-extensions
+urllib3
+Werkzeug
+wrapt
diff --git a/script/get-dataset-imagenet-aux/_cm.json b/script/get-dataset-imagenet-aux/_cm.json
@@ -16,7 +16,7 @@
   ],
   "prehook_deps": [
     {
-      "tags": "download-and-extract,_extract",
+      "tags": "download-and-extract,_extract,_wget",
       "env": {
         "CM_EXTRACT_EXTRACTED_FILENAME": "<<<CM_ML_MODEL_FILE>>>",
         "CM_EXTRACT_FINAL_ENV_NAME": "CM_DATASET_AUX_PATH",
@@ -55,7 +55,7 @@
         "2012"
       ],
       "env": {
-        "CM_PACKAGE_URL": "https://awww.dropbox.com/s/92n2fyej3lzy3s3/caffe_ilsvrc12.tar.gz",
+        "CM_PACKAGE_URL": "https://www.dropbox.com/s/92n2fyej3lzy3s3/caffe_ilsvrc12.tar.gz",
         "CM_PACKAGE_URL1": "http://dl.caffe.berkeleyvision.org/caffe_ilsvrc12.tar.gz",
         "CM_DOWNLOAD_CHECKSUM_": "ee346d67141e476df9c1a3f813552503"
       }

diff --git a/script/get-tvm/_cm.json b/script/get-tvm/_cm.json
@@ -55,6 +55,7 @@
   "variations": {
     "pip-install": {
       "group": "installation-type",
+      "default": true,
       "deps": [
         {
           "tags": "get,generic-python-lib,_apache-tvm"
@@ -76,7 +77,6 @@
     },
     "llvm": {
       "group": "installation-type",
-      "default": true,
       "deps": [
         {
           "names": [ "llvm" ],