Merge from CTuning (#1032)

cm-mlops/script/app-mlperf-inference-reference/_cm.yaml

@@ -40,6 +40,7 @@ input_mapping:
   max_batchsize: CM_MLPERF_LOADGEN_MAX_BATCHSIZE
   mode: CM_MLPERF_LOADGEN_MODE
   num_threads: CM_NUM_THREADS
+  threads: CM_NUM_THREADS
   dataset: CM_MLPERF_VISION_DATASET_OPTION
   model: CM_MLPERF_CUSTOM_MODEL_PATH
   output_dir: OUTPUT_BASE_DIR
@@ -769,6 +770,9 @@ variations:
       - tags: get,generic-python-lib,_package.torchmetrics
         names:
           - torchmetrics
+      - tags: get,generic-python-lib,_package.torch-fidelity
+        names:
+          - torch-fidelity
     adr:
       mlperf-implementation:
         tags: _repo.https://github.com/pgmpablo157321/inference

cm-mlops/script/app-mlperf-inference-reference/customize.py

@@ -68,7 +68,9 @@ def preprocess(i):
 
     env['CM_MLPERF_LOADGEN_EXTRA_OPTIONS'] +=  " --mlperf_conf '" + env['CM_MLPERF_CONF'] + "'"
 
-    env['MODEL_DIR'] = env.get('CM_ML_MODEL_PATH', os.path.dirname(env.get('CM_MLPERF_CUSTOM_MODEL_PATH', env.get('CM_ML_MODEL_FILE_WITH_PATH'))))
+    env['MODEL_DIR'] = env.get('CM_ML_MODEL_PATH')
+    if not env['MODEL_DIR']:
+        env['MODEL_DIR'] = os.path.dirname(env.get('CM_MLPERF_CUSTOM_MODEL_PATH', env.get('CM_ML_MODEL_FILE_WITH_PATH')))
 
     RUN_CMD = ""
     state['RUN'] = {}
@@ -84,7 +86,7 @@ def preprocess(i):
     if int(NUM_THREADS) > 2 and env['CM_MLPERF_DEVICE'] == "gpu":
         NUM_THREADS = "2" # Don't use more than 2 threads when run on GPU
 
-    if env['CM_MODEL'] in  [ 'resnet50', 'retinanet'] :
+    if env['CM_MODEL'] in  [ 'resnet50', 'retinanet', 'sdxl' ] :
         scenario_extra_options +=  " --threads " + NUM_THREADS
 
     ml_model_name = env['CM_MODEL']
@@ -250,10 +252,12 @@ def get_run_cmd_reference(env, scenario_extra_options, mode_extra_options, datas
                 " --profile " + 'stable-diffusion-xl-pytorch ' + \
                 " --dataset " + 'coco-1024' +  \
                 " --dataset-path " + env['CM_DATASET_PATH_ROOT'] + \
-                ' --dtype ' + env['CM_MLPERF_MODEL_PRECISION'].replace("float", "fp") + \
+                ' --dtype ' + env['CM_MLPERF_MODEL_PRECISION'].replace("bfloat", "bf").replace("float", "fp") + \
                 " --device " + device + \
                  env['CM_MLPERF_LOADGEN_EXTRA_OPTIONS'] + \
-                " --model-path " + env['MODEL_DIR']
+                 scenario_extra_options + mode_extra_options + \
+                " --output " + env['CM_MLPERF_OUTPUT_DIR'] + \
+                " "#--model-path " + env['MODEL_DIR']
 
     elif "3d-unet" in env['CM_MODEL']:
 

cm-mlops/script/get-dataset-imagenet-calibration/_cm.yaml

@@ -0,0 +1,47 @@
+alias: get-dataset-imagenet-calibration
+automation_alias: script
+automation_uid: 5b4e0237da074764
+cache: true
+deps:
+  - tags: download,file
+    force_cache: true
+    extra_cache_tags: imagenet-calibration,imagenet,calibration
+    names:
+      - calibration-file-downloader
+    env:
+        CM_DOWNLOAD_FINAL_ENV_NAME: CM_MLPERF_IMAGENET_CALIBRATION_LIST_FILE_WITH_PATH
+        CM_DOWNLOAD_LOCAL_FILE_PATH: <<<CM_MLPERF_IMAGENET_CALIBRATION_LIST_LOCAL_PATH>>>
+
+docker_input_mapping: {}
+input_description: {}
+input_mapping: {}
+new_env_keys:
+- CM_MLPERF_IMAGENET_CALIBRATION_LIST_FILE_WITH_PATH
+new_state_keys: []
+post_deps: []
+posthook_deps: []
+prehook_deps: []
+tags:
+- get
+- dataset
+- imagenet
+- calibration
+uid: 30361fad3dff49ff
+variations:
+  mlperf.option1:
+    group: calibration-option
+    default: true
+    env:
+      CM_MLPERF_IMAGENET_CALIBRATION_OPTION: one
+      CM_DOWNLOAD_CHECKSUM: f09719174af3553119e2c621157773a6
+    adr:
+      calibration-file-downloader:
+        tags: _url.https://github.com/mlcommons/inference/raw/master/calibration/ImageNet/cal_image_list_option_1.txt
+  mlperf.option2:
+    group: calibration-option
+    env:
+      CM_MLPERF_IMAGENET_CALIBRATION_OPTION: two
+      CM_DOWNLOAD_CHECKSUM: e44582af00e3b4fc3fac30efd6bdd05f
+    adr:
+      calibration-file-downloader:
+        tags: _url.https://github.com/mlcommons/inference/raw/master/calibration/ImageNet/cal_image_list_option_2.txt

cm-mlops/script/get-dataset-imagenet-calibration/customize.py

@@ -0,0 +1,22 @@
+from cmind import utils
+import os
+
+def preprocess(i):
+
+    os_info = i['os_info']
+
+    env = i['env']
+
+    meta = i['meta']
+
+    automation = i['automation']
+
+    quiet = (env.get('CM_QUIET', False) == 'yes')
+
+    return {'return':0}
+
+def postprocess(i):
+
+    env = i['env']
+
+    return {'return':0}

cm-mlops/script/get-dataset-imagenet-calibration/run.bat

@@ -0,0 +1 @@
+rem native script

cm-mlops/script/get-dataset-imagenet-calibration/run.sh

@@ -0,0 +1,27 @@
+#!/bin/bash
+
+#CM Script location: ${CM_TMP_CURRENT_SCRIPT_PATH}
+
+#To export any variable
+#echo "VARIABLE_NAME=VARIABLE_VALUE" >>tmp-run-env.out
+
+#${CM_PYTHON_BIN_WITH_PATH} contains the path to python binary if "get,python" is added as a dependency
+
+
+
+function exit_if_error() {
+  test $? -eq 0 || exit $?
+}
+
+function run() {
+  echo "Running: "
+  echo "$1"
+  echo ""
+  if [[ ${CM_FAKE_RUN} != 'yes' ]]; then
+    eval "$1"
+    exit_if_error
+  fi
+}
+
+#Add your run commands here...
+# run "$CM_RUN_CMD"

cm-mlops/script/get-lib-qaic-api/_cm.json

@@ -0,0 +1,38 @@
+{
+  "alias": "get-lib-qaic-api",
+  "automation_alias": "script",
+  "automation_uid": "5b4e0237da074764",
+  "cache": true,
+  "category": "Detection or installation of tools and artifacts",
+  "default_version": "master",
+  "deps": [
+    {
+      "tags": "detect,os"
+    }
+  ],
+  "env": {
+  },
+  "new_env_keys": [
+    "CM_LIB_QAIC_*",
+    "+C_INCLUDE_PATH",
+    "+CPLUS_INCLUDE_PATH",
+    "+LD_LIBRARY_PATH"
+  ],
+  "prehook_deps": [
+  ],
+  "tags": [
+    "get",
+    "api",
+    "lib-qaic-api",
+    "lib",
+    "qaic"
+  ],
+  "uid": "1e253ae184e44f23",
+  "versions": {
+    "master": {
+      "env": {
+        "CM_LIB_QAIC_VERSION": "master"
+      }
+    }
+  }
+}

cm-mlops/script/get-lib-qaic-api/customize.py

@@ -0,0 +1,39 @@
+from cmind import utils
+import os
+
+def preprocess(i):
+    os_info = i['os_info']
+    if os_info['platform'] == 'windows':
+        return {'return':1, 'error': 'Windows is not supported in this script yet'}
+
+    env = i['env']
+
+    #env['CM_GIT_CHECKOUT'] = env['CM_TMP_GIT_BRANCH_NAME']
+
+    return {'return':0}
+
+def postprocess(i):
+
+    env = i['env']
+
+    paths = [
+            "+C_INCLUDE_PATH",
+            "+CPLUS_INCLUDE_PATH",
+            "+LD_LIBRARY_PATH",
+            "+DYLD_FALLBACK_LIBRARY_PATH"
+            ]
+
+    for key in paths:
+        env[key] = []
+
+    include_paths = [ env['CM_TMP_CURRENT_SCRIPT_PATH'] ]
+
+    for inc_path in include_paths:
+        env['+C_INCLUDE_PATH'].append(inc_path)
+        env['+CPLUS_INCLUDE_PATH'].append(inc_path)
+
+    version = "master"
+    env['CM_QAIC_API_SRC_FILE'] = os.path.join(env['CM_TMP_CURRENT_SCRIPT_PATH'], version, "QAicInfApi.cpp")
+    env['CM_QAIC_API_INC_FILE'] = os.path.join(env['CM_TMP_CURRENT_SCRIPT_PATH'], version, "QAicInfApi.h")
+
+    return {'return':0}