Merge pull request #464 from GATEOverflow/mlperf-inference

Use pkg-config deps for get-generic-sys-util
mlcommons · Nov 3, 2024 · d1f984b · d1f984b
2 parents fa46c07 + f049765
commit d1f984b
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 12 deletions.
diff --git a/script/app-mlperf-inference-nvidia/_cm.yaml b/script/app-mlperf-inference-nvidia/_cm.yaml
@@ -436,6 +436,7 @@ variations:
     - tags: get,generic-python-lib,_onnx-graphsurgeon
     - tags: get,generic-python-lib,_package.onnx
       version: 1.13.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-generic-sys-util/_cm.json b/script/get-generic-sys-util/_cm.json
@@ -11,6 +11,14 @@
   "deps": [
     {
       "tags": "detect,os"
+    },
+    {
+      "tags": "get,generic-sys-util,_pkg-config,_detect",
+      "skip_if_env": {
+        "CM_SYS_UTIL_NAME": [
+          "pkg_config"
+        ]
+      }
     }
   ],
   "new_env_keys": [
@@ -548,6 +556,21 @@
         }
       }
     },
+    "pkg-config": {
+      "env": {
+        "CM_SYS_UTIL_NAME": "pkg_config",
+        "CM_SYS_UTIL_VERSION_RE": "\\b(\\d+\\.\\d+(?:\\.\\d+)?)\\b",
+        "CM_TMP_VERSION_DETECT_GROUP_NUMBER": 0
+      },
+      "state": {
+        "pkg_config": {
+          "apt": "pkg-config",
+          "brew": "pkg-config",
+          "dnf": "pkg-config",
+          "yum": "pkg-config"
+        }
+      }
+    },
     "psmisc": {
       "env": {
         "CM_SYS_UTIL_NAME": "psmisc"

diff --git a/script/get-generic-sys-util/detect.sh b/script/get-generic-sys-util/detect.sh
@@ -1,14 +1,18 @@
 #!/bin/bash
-
-if [[ -n "${CM_SYS_UTIL_VERSION_CMD}" ]]; then
-  if [[ "${CM_SYS_UTIL_VERSION_CMD_USE_ERROR_STREAM}" == "yes" ]]; then
-    # Redirect both stdout and stderr to tmp-ver.out
-    cmd="${CM_SYS_UTIL_VERSION_CMD}  > tmp-ver.out 2>&1"
-  else
-    cmd="${CM_SYS_UTIL_VERSION_CMD}  > tmp-ver.out"
-  fi
-  echo $cmd
-  eval $cmd
+if [[ -n "${CM_SYS_UTIL_VERSION_CMD_OVERRIDE}" ]]; then
+  eval "${CM_SYS_UTIL_VERSION_CMD_OVERRIDE}"
   test $? -eq 0 || exit $?
+else
+  if [[ -n "${CM_SYS_UTIL_VERSION_CMD}" ]]; then
+    if [[ "${CM_SYS_UTIL_VERSION_CMD_USE_ERROR_STREAM}" == "yes" ]]; then
+      # Redirect both stdout and stderr to tmp-ver.out
+      cmd="${CM_SYS_UTIL_VERSION_CMD} > tmp-ver.out 2>&1"
+    else
+      cmd="${CM_SYS_UTIL_VERSION_CMD} > tmp-ver.out"
+    fi
+    echo $cmd
+    eval $cmd
+    test $? -eq 0 || exit $?
+  fi
 fi
 
diff --git a/...mplementation/gpu-device/tensorrt-framework/framework-version-default/default-config.yaml b/...mplementation/gpu-device/tensorrt-framework/framework-version-default/default-config.yaml
@@ -12,9 +12,13 @@
   bert-99:
     Offline:
       target_qps: 8000
+    Server:
+      target_qps: 6000
   bert-99.9:
     Offline:
-      target_qps: 8000
+      target_qps: 3500
+    Server:
+      target_qps: 3000
   3d-unet-99:
     Offline:
       target_qps: 8.0