change "get,python" to "get,python3" in all scripts to be consistant …

…and make sure that this deps in reused!
Ailurus1 · Jan 6, 2023 · dc38284 · dc38284
1 parent 8567d16
commit dc38284
Show file tree

Hide file tree

Showing 21 changed files with 23 additions and 24 deletions.
diff --git a/cm-mlops/script/app-image-classification-torch-py/_cm.json b/cm-mlops/script/app-image-classification-torch-py/_cm.json
@@ -19,7 +19,7 @@
         "python",
         "python3"
       ],
-      "tags": "get,python"
+      "tags": "get,python3"
     },
     {
       "tags": "get,dataset,imagenet,image-classification,preprocessed"

diff --git a/cm-mlops/script/app-image-classification-tvm-onnx-py/_cm.json b/cm-mlops/script/app-image-classification-tvm-onnx-py/_cm.json
@@ -20,7 +20,7 @@
         "python",
         "python3"
       ],
-      "tags": "get,python"
+      "tags": "get,python3"
     },
     {
       "tags": "get,dataset,image-classification,original"

diff --git a/cm-mlops/script/app-mlperf-inference/_cm_not_used.json b/cm-mlops/script/app-mlperf-inference/_cm_not_used.json
@@ -25,7 +25,7 @@
       "names": [
         "python3"
       ],
-      "tags": "get,python"
+      "tags": "get,python3"
     },
     {
       "names": [

diff --git a/cm-mlops/script/generate-mlperf-inference-submission/_cm.json b/cm-mlops/script/generate-mlperf-inference-submission/_cm.json
@@ -10,7 +10,7 @@
         "python",
         "python3"
       ],
-      "tags": "get,python"
+      "tags": "get,python3"
     },
     {
       "names": [

diff --git a/cm-mlops/script/generate-mlperf-tiny-submission/_cm.json b/cm-mlops/script/generate-mlperf-tiny-submission/_cm.json
@@ -10,7 +10,7 @@
         "python",
         "python3"
       ],
-      "tags": "get,python"
+      "tags": "get,python3"
     },
     {
       "tags": "get,sut,system-description"

diff --git a/cm-mlops/script/get-generic-python-lib/_cm.json b/cm-mlops/script/get-generic-python-lib/_cm.json
@@ -14,7 +14,7 @@
         "python",
         "python3"
       ],
-      "tags": "get,python"
+      "tags": "get,python3"
     }
   ],
   "extra_cache_tags_from_env": [

diff --git a/cm-mlops/script/get-ml-model-resnet50-tvm/_cm.json b/cm-mlops/script/get-ml-model-resnet50-tvm/_cm.json
@@ -10,7 +10,7 @@
       "names": [
         "python, python3"
       ],
-      "tags": "get,python"
+      "tags": "get,python3"
     },
     {
       "names": [

diff --git a/cm-mlops/script/get-python3/customize.py b/cm-mlops/script/get-python3/customize.py
@@ -99,10 +99,9 @@ def postprocess(i):
     found_path_root = os.path.dirname(found_path)
 
     if from_virtual:
-        # Clean PATH and other vars with original Python if from virtual
-        # since we use . activate to set these ...
-        # If we need them, we can add them later explicitly ...
-        for k in ['+PATH']:#, '+LD_LIBRARY_PATH', '+C_INCLUDE_PATH']:
+        # Clean PATH (it will be in activate script) 
+        # but keep LD_LIBRARY_PATH and C_INCLUDE_PATH from the native python
+        for k in ['+PATH']:
             if k in env:
                 del(env[k])
 

diff --git a/cm-mlops/script/install-generic-python-lib/_cm.json b/cm-mlops/script/install-generic-python-lib/_cm.json
@@ -14,7 +14,7 @@
         "python",
         "python3"
       ],
-      "tags": "get,python"
+      "tags": "get,python3"
     }
   ],
   "extra_cache_tags_from_env": [

diff --git a/cm-mlops/script/install-python-src/_cm.json b/cm-mlops/script/install-python-src/_cm.json
@@ -38,7 +38,7 @@
           "yes"
         ]
       },
-      "tags": "get,python"
+      "tags": "get,python3"
     }
   ],
   "tags": [

diff --git a/cm-mlops/script/install-python-venv/_cm.json b/cm-mlops/script/install-python-venv/_cm.json
@@ -24,7 +24,7 @@
       "names": [
         "register-python"
       ],
-      "tags": "get,python"
+      "tags": "get,python3"
     }
   ],
   "tags": [

diff --git a/cm-mlops/script/print-hello-world-py/_cm.json b/cm-mlops/script/print-hello-world-py/_cm.json
@@ -16,7 +16,7 @@
         "python",
         "python3"
       ],
-      "tags": "get,python"
+      "tags": "get,python3"
     },
     {
       "tags": "print,python-version"

diff --git a/cm-mlops/script/print-python-version/_cm.json b/cm-mlops/script/print-python-version/_cm.json
@@ -10,7 +10,7 @@
         "python",
         "python3"
       ],
-      "tags": "get,python"
+      "tags": "get,python3"
     }
   ],
   "tags": [

diff --git a/cm-mlops/script/process-mlperf-accuracy/_cm.json b/cm-mlops/script/process-mlperf-accuracy/_cm.json
@@ -14,7 +14,7 @@
         "python3",
         "python"
       ],
-      "tags": "get,python"
+      "tags": "get,python3"
     },
     {
       "enable_if_env": {

diff --git a/cm-mlops/script/publish-results-to-dashboard/_cm.json b/cm-mlops/script/publish-results-to-dashboard/_cm.json
@@ -10,7 +10,7 @@
         "python3",
         "python"
       ],
-      "tags": "get,python"
+      "tags": "get,python3"
     },
     {
       "tags": "get,generic-python-lib,_wandb"

diff --git a/cm-mlops/script/run-mlperf-inference-app/_cm.json b/cm-mlops/script/run-mlperf-inference-app/_cm.json
@@ -20,7 +20,7 @@
         "python",
         "python3"
       ],
-      "tags": "get,python"
+      "tags": "get,python3"
     },
     {
       "names": [

diff --git a/cm-mlops/script/run-mlperf-inference-submission-checker/_cm.json b/cm-mlops/script/run-mlperf-inference-submission-checker/_cm.json
@@ -12,7 +12,7 @@
         "python",
         "python3"
       ],
-      "tags": "get,python"
+      "tags": "get,python3"
     },
     {
       "names": [

diff --git a/cm-mlops/script/run-mlperf-power-client/_cm.json b/cm-mlops/script/run-mlperf-power-client/_cm.json
@@ -20,7 +20,7 @@
         "python",
         "python3"
       ],
-      "tags": "get,python"
+      "tags": "get,python3"
     },
     {
       "names": [

diff --git a/cm-mlops/script/run-mlperf-power-server/_cm.json b/cm-mlops/script/run-mlperf-power-server/_cm.json
@@ -25,7 +25,7 @@
         "python",
         "python3"
       ],
-      "tags": "get,python"
+      "tags": "get,python3"
     },
     {
       "names": [

diff --git a/cm-mlops/script/truncate-mlperf-inference-accuracy-log/_cm.json b/cm-mlops/script/truncate-mlperf-inference-accuracy-log/_cm.json
@@ -11,7 +11,7 @@
         "python",
         "python3"
       ],
-      "tags": "get,python"
+      "tags": "get,python3"
     },
     {
       "names": [

diff --git a/cm-mlops/script/wrapper-reproduce-octoml-tinyml-submission/_cm.json b/cm-mlops/script/wrapper-reproduce-octoml-tinyml-submission/_cm.json
@@ -10,7 +10,7 @@
         "python",
         "python3"
       ],
-      "tags": "get,python"
+      "tags": "get,python3"
     }
   ],
   "env": {},
-Original file line number
+Diff line change
@@ Expand Up / @@ -38,7 +38,7 @@ @@
               "yes"
             ]
           },
-          "tags": "get,python"
+          "tags": "get,python3"
         }
       ],
       "tags": [
@@ Expand Down @@