Merge pull request GATEOverflow#59 from arjunsuresh/mlperf-inference

Cleanups
anandhu-eng · Jun 8, 2024 · 834f4f8 · 834f4f8
2 parents 176661f + 32ea794
commit 834f4f8
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 1 deletion.
diff --git a/script/download-file/_cm.json b/script/download-file/_cm.json
@@ -8,6 +8,17 @@
   "deps": [
     {
       "tags": "detect,os"
+    },
+    {
+      "tags": "get,generic-sys-util,_md5sha1sum",
+      "enable_if_env": {
+        "CM_HOST_OS_FLAVOR": [
+          "macos"
+        ],
+        "CM_DOWNLOAD_CHECKSUM": [
+          "on"
+        ]
+      }
     }
   ],
   "default_env": {

diff --git a/script/download-file/customize.py b/script/download-file/customize.py
@@ -127,7 +127,7 @@ def preprocess(i):
     #verify checksum if file already present
     if env.get('CM_DOWNLOAD_CHECKSUM', '') != '':
         x='*' if os_info['platform'] == 'windows' else ''
-        env['CM_DOWNLOAD_CHECKSUM_CMD'] = "echo {} {}{}{}{} | md5sum -c".format(env.get('CM_DOWNLOAD_CHECKSUM'), x, q, env['CM_DOWNLOAD_FILENAME'], q)
+        env['CM_DOWNLOAD_CHECKSUM_CMD'] = "echo {} {}{}{}{} | md5sum -cs ".format(env.get('CM_DOWNLOAD_CHECKSUM'), x, q, env['CM_DOWNLOAD_FILENAME'], q)
     else:
         env['CM_DOWNLOAD_CHECKSUM_CMD'] = ""
 

diff --git a/script/download-file/run.sh b/script/download-file/run.sh
@@ -47,6 +47,7 @@ if [[ ${require_download} == "1" ]]; then
      echo ""
      echo "${CM_DOWNLOAD_CHECKSUM_CMD}"
      eval "${CM_DOWNLOAD_CHECKSUM_CMD}"
+     test $? -eq 0 || exit $?
   fi
 fi
 

diff --git a/script/extract-file/_cm.json b/script/extract-file/_cm.json
@@ -8,6 +8,22 @@
   "deps": [
     {
       "tags": "detect,os"
+    },
+    {
+      "tags": "get,generic-sys-util,_md5sha1sum",
+      "enable_if_env": {
+        "CM_HOST_OS_FLAVOR": [
+          "macos"
+        ]
+      },
+      "skip_if_any_env": {
+        "CM_EXTRACT_EXTRACTED_CHECKSUM_FILE": [
+          "off"
+        ],
+        "CM_EXTRACT_EXTRACTED_CHECKSUM": [
+          "off"
+        ]
+      }
     }
   ],
   "input_description": {},

diff --git a/script/get-generic-sys-util/_cm.json b/script/get-generic-sys-util/_cm.json
@@ -459,6 +459,17 @@
           "dnf": "nlohmann-json-dev"
         }
       }
+    },
+    "md5sha1sum": {
+      "env": {
+        "CM_SYS_UTIL_NAME": "md5sha1sum"
+      },
+      "state": {
+        "md5sha1sum": {
+          "apt": "",
+          "brew": "md5sha1sum"
+        }
+      }
     }
   }
 }