Merge branch 'mlperf-inference' into mixtral+gha+selfhosted

GATEOverflow · Oct 5, 2024 · d9b2082 · d9b2082
2 parents ad0b930 + 4adfb0b
commit d9b2082
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/script/detect-os/_cm.json b/script/detect-os/_cm.json
@@ -25,6 +25,11 @@
           "windows"
         ]
       },
+      "skip_if_env": {
+        "CM_WINDOWS_SYS_UTILS_MIN_INSTALL": [
+          "yes"
+        ]
+      },
       "tags": "get,sys-utils-min"
     }
   ],

diff --git a/script/get-generic-sys-util/customize.py b/script/get-generic-sys-util/customize.py
@@ -29,8 +29,13 @@ def preprocess(i):
 
     # Only "install" mode reaches here
     pm = env.get('CM_HOST_OS_PACKAGE_MANAGER')
+    util = env.get('CM_SYS_UTIL_NAME', '')
+    if util == '':
+        return {'return': 1, 'error': 'Please select a variation specifying the sys util name'}
 
-    if os_info['platform'] == 'windows':
+    package = state.get(util)
+
+    if os_info['platform'] == 'windows' and not package:
         print ('')
         print ('WARNING: for now skipping get-generic-sys-util on Windows ...')
         print ('')
@@ -40,12 +45,6 @@ def preprocess(i):
     if not pm:
         return {'return': 1, 'error': 'Package manager not detected for the given OS'}
 
-    util = env.get('CM_SYS_UTIL_NAME', '')
-    if util == '':
-        return {'return': 1, 'error': 'Please select a variation specifying the sys util name'}
-
-
-    package = state.get(util)
 
     if not package:
         return {'return': 1, 'error': 'No package name specified for {} and util name {}'.format(pm, util)}

diff --git a/script/get-sys-utils-min/_cm.yaml b/script/get-sys-utils-min/_cm.yaml
@@ -9,6 +9,7 @@ cache: true
 category: Detection or installation of tools and artifacts
 
 deps:
+  - tags: detect,os
   - tags: get,generic,sys-util,_xz
     enable_if_env:
       CM_HOST_OS_TYPE:
@@ -20,6 +21,7 @@ deps:
 
 env:
   CM_CLEAN_DIRS: bin
+  CM_WINDOWS_SYS_UTILS_MIN_INSTALL: yes
   CM_PACKAGE_WIN_URL: https://zenodo.org/records/13868077/files/cm-artifact-os-windows-32.zip?download=1
   CM_SUDO: sudo