Merge pull request #491 from GATEOverflow/mlperf-inference

Fixes for MLPerf inference, intel conda URL
mlcommons · Nov 6, 2024 · 52e8419 · 52e8419
2 parents d2041f3 + 2e5eaec
commit 52e8419
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 2 deletions.
diff --git a/.github/workflows/test-nvidia-mlperf-implementation.yml b/.github/workflows/test-nvidia-mlperf-implementation.yml
@@ -21,5 +21,5 @@ jobs:
           source gh_action/bin/activate
           export CM_REPOS=$HOME/GH_CM
           pip install --upgrade cm4mlops
-          cm run script --tags=run-mlperf,inference,_all-scenarios,_submission,_full,_r4.1-dev --preprocess_submission=yes --execution_mode=valid --gpu_name=rtx_4090 --pull_changes=yes --model=${{ matrix.model }} --submitter="MLCommons" --hw_name=RTX4090x2  --implementation=nvidia    --backend=tensorrt    --category=datacenter,edge --division=closed  --docker_dt=yes --docker_it=no --docker_cm_repo=gateoverflow@cm4mlops --adr.compiler.tags=gcc --device=cuda --use_dataset_from_host=yes --results_dir=$HOME/gh_action_results --submission_dir=$HOME/gh_action_submissions --clean  --docker --quiet
+          cm run script --tags=run-mlperf,inference,_all-scenarios,_submission,_full,_r4.1-dev --preprocess_submission=yes --execution_mode=valid --gpu_name=rtx_4090 --pull_changes=yes --pull_inference_changes=yes --model=${{ matrix.model }} --submitter="MLCommons" --hw_name=RTX4090x2  --implementation=nvidia    --backend=tensorrt    --category=datacenter,edge --division=closed  --docker_dt=yes --docker_it=no --docker_cm_repo=gateoverflow@cm4mlops --adr.compiler.tags=gcc --device=cuda --use_dataset_from_host=yes --results_dir=$HOME/gh_action_results --submission_dir=$HOME/gh_action_submissions --clean  --docker --quiet
           cm run script --tags=push,github,mlperf,inference,submission --repo_url=https://github.com/gateoverflow/mlperf_inference_unofficial_submissions_v5.0 --repo_branch=main --commit_message="Results from GH action on NVIDIA_RTX4090x2" --quiet --submission_dir=$HOME/gh_action_submissions --hw_name=RTX4090x2
diff --git a/script/app-mlperf-inference-mlcommons-python/_cm.yaml b/script/app-mlperf-inference-mlcommons-python/_cm.yaml
@@ -394,6 +394,7 @@ deps:
     names:
     - ml-model
     - sdxl-model
+    - ml-model-float16
     enable_if_env:
       CM_MODEL:
       - stable-diffusion-xl
@@ -929,6 +930,8 @@ variations:
       - tags: get,generic-python-lib,_package.diffusers
         names:
           - diffusers
+        version_max: "0.30.3"
+        version_max_usable: "0.30.3"
       - tags: get,generic-python-lib,_package.transformers
         names:
           - transformers

diff --git a/script/app-mlperf-inference/_cm.yaml b/script/app-mlperf-inference/_cm.yaml
@@ -103,7 +103,12 @@ deps:
   - tags: get,mlcommons,inference,src
     names:
     - inference-src
-
+  - tags: pull,git,repo
+    env:
+      CM_GIT_CHECKOUT_PATH: '<<<CM_MLPERF_INFERENCE_SOURCE>>>'
+    enable_if_env:
+      CM_MLPERF_INFERENCE_PULL_SRC_CHANGES:
+      - 'yes'
   - tags: get,mlperf,inference,utils
 
   - tags: install,pip-package,for-cmind-python,_package.pandas

diff --git a/script/install-generic-conda-package/_cm.json b/script/install-generic-conda-package/_cm.json
@@ -61,6 +61,12 @@
         "CM_CONDA_PKG_NAME": "#"
       }
     },
+    "source.intel": {
+      "group": "package-source",
+      "env": {
+        "CM_CONDA_PKG_SRC": "https://software.repos.intel.com/python/conda/"
+      }
+    },
     "source.#": {
       "group": "package-source",
       "env": {

diff --git a/script/run-mlperf-inference-app/_cm.yaml b/script/run-mlperf-inference-app/_cm.yaml
@@ -81,6 +81,7 @@ input_mapping:
   preprocess_submission: CM_RUN_MLPERF_SUBMISSION_PREPROCESSOR
   push_to_github: CM_MLPERF_RESULT_PUSH_TO_GITHUB
   pull_changes: CM_MLPERF_INFERENCE_PULL_CODE_CHANGES
+  pull_inference_changes: CM_MLPERF_INFERENCE_PULL_SRC_CHANGES
   readme: CM_MLPERF_README
   regenerate_accuracy_file: CM_MLPERF_REGENERATE_ACCURACY_FILE
   regenerate_files: CM_REGENERATE_MEASURE_FILES