Merge pull request #413 from GATEOverflow/mlperf-inference

Improve the benchmark-program-mlperf run command
mlcommons · Oct 23, 2024 · 77882c5 · 77882c5
2 parents dbb9d43 + f35509a
commit 77882c5
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 22 deletions.
diff --git a/script/benchmark-program-mlperf/customize.py b/script/benchmark-program-mlperf/customize.py
@@ -25,29 +25,34 @@ def postprocess(i):
 
             if os_info['platform'] != 'windows':
                 # Construct the shell command with proper escaping
-                env['CM_MLPERF_RUN_CMD'] = (
-                    "CM_MLPERF_RUN_COUNT=$(cat ${CM_RUN_DIR}/count.txt); "
-                    "echo ${CM_MLPERF_RUN_COUNT}; "
-                    "CM_MLPERF_RUN_COUNT=$((CM_MLPERF_RUN_COUNT+1)); "
-                    "echo ${CM_MLPERF_RUN_COUNT} > ${CM_RUN_DIR}/count.txt && "
-                    "if [ ${CM_MLPERF_RUN_COUNT} -eq 1 ]; then "
-                    "export CM_MLPERF_USER_CONF=${CM_MLPERF_RANGING_USER_CONF}; "
-                    "else "
-                    "export CM_MLPERF_USER_CONF=${CM_MLPERF_TESTING_USER_CONF}; "
-                    "fi && " + env.get('CM_RUN_CMD', '').strip()
-                )
+                env['CM_MLPERF_RUN_CMD'] = r"""
+CM_MLPERF_RUN_COUNT=\$(cat \${CM_RUN_DIR}/count.txt);
+echo \${CM_MLPERF_RUN_COUNT};
+CM_MLPERF_RUN_COUNT=\$((CM_MLPERF_RUN_COUNT+1));
+echo \${CM_MLPERF_RUN_COUNT} > \${CM_RUN_DIR}/count.txt &&
+if [ \${CM_MLPERF_RUN_COUNT} -eq 1 ]; then
+export CM_MLPERF_USER_CONF="${CM_MLPERF_RANGING_USER_CONF}";
+else
+export CM_MLPERF_USER_CONF="${CM_MLPERF_TESTING_USER_CONF}";
+fi && 
+                """ + env.get('CM_RUN_CMD', '').strip()
             else:
-                env['CM_MLPERF_RUN_CMD'] = (
-                    "set /P CM_MLPERF_RUN_COUNT=<\"%CM_RUN_DIR%\\count.txt\" & "
-                    "echo %CM_MLPERF_RUN_COUNT% & "
-                    "set /A CM_MLPERF_RUN_COUNT=!CM_MLPERF_RUN_COUNT!+1 & "
-                    "echo !CM_MLPERF_RUN_COUNT! > \"%CM_RUN_DIR%\\count.txt\" & "
-                    "if !CM_MLPERF_RUN_COUNT! EQU 1 ( "
-                    "set CM_MLPERF_USER_CONF=%CM_MLPERF_RANGING_USER_CONF% "
-                    ") else ( "
-                    "set CM_MLPERF_USER_CONF=%CM_MLPERF_TESTING_USER_CONF% "
-                    ") & " + env.get('CM_RUN_CMD', '').strip()
-                )
+                env['CM_MLPERF_RUN_CMD'] = r"""
+:: Read the current count from the file
+set /p CM_MLPERF_RUN_COUNT=<%CM_RUN_DIR%\count.txt
+echo !CM_MLPERF_RUN_COUNT!
+
+:: Increment the count
+set /a CM_MLPERF_RUN_COUNT=!CM_MLPERF_RUN_COUNT! + 1
+echo !CM_MLPERF_RUN_COUNT! > %CM_RUN_DIR%\count.txt
+
+:: Check the value and set the environment variable accordingly
+if !CM_MLPERF_RUN_COUNT! EQU 1 (
+    set CM_MLPERF_USER_CONF=%CM_MLPERF_RANGING_USER_CONF%
+) else (
+    set CM_MLPERF_USER_CONF=%CM_MLPERF_TESTING_USER_CONF%
+)
+                """ + env.get('CM_RUN_CMD', '').strip()
         else:
             # Just use the existing CM_RUN_CMD if no ranging run is needed
             env['CM_MLPERF_RUN_CMD'] = env.get('CM_RUN_CMD', '').strip()

diff --git a/script/get-generic-sys-util/_cm.json b/script/get-generic-sys-util/_cm.json
@@ -668,6 +668,21 @@
         }
       }
     },
+    "vim-common": {
+      "env": {
+        "CM_SYS_UTIL_NAME": "vim_common",
+        "CM_SYS_UTIL_CHECK_CMD": "xxd --version"
+      },
+      "state": {
+        "vim_common": {
+          "apt": "vim-common",
+          "brew": "vim",
+          "dnf": "vim-common",
+          "yum": "vim-common",
+          "choco": "vim"
+        }
+      }
+    },
     "xz": {
       "env": {
         "CM_SYS_UTIL_NAME": "xz"