From 81d398a8da35474c4cb4f9da9bca5f0979f4c50a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20Fran=C3=A7a?= <luis.franca@microsot.com>
Date: Thu, 5 Jan 2023 06:05:19 -0800
Subject: [PATCH] Fixing workflow bugs

---
 devops/azure/runner.py  | 9 ++++++---
 devops/azure/upload.py  | 6 +++---
 devops/requirements.txt | 2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/devops/azure/runner.py b/devops/azure/runner.py
index 26ef16a30..1ee0fd61f 100644
--- a/devops/azure/runner.py
+++ b/devops/azure/runner.py
@@ -382,6 +382,8 @@ def run_model(name, snpe_root, dataset, conn_string, use_device, benchmark_only,
 
     if not converted and onnx_model_found:
         model = convert(name, entity, long_name, onnx_model)
+        if model == 'error':
+            return
     elif converted:
         model_found, long_name, model = download_model(name, snpe_model_dir, conn_string, 'model.dlc')
         if not model_found:
@@ -558,10 +560,11 @@ def find_work_prioritized(use_device, benchmark_only, subset_list, no_quantizati
             log(f"# skipping {name} because something went wrong on previous step.")
             continue
         if not is_complete(entity, 'macs') or not is_true(entity, 'quantized'):
-            if not no_quantization:
-                continue
             if quantizing:
-                log(f"skip {name} for now until other quantization finishes on our node")
+                if no_quantization:
+                    log(f"No quantization work is done on this node. Skip {name} for now until other node works on it.")
+                else:
+                    log(f"skip {name} for now until other quantization finishes on our node")
                 continue
             priority = 20
         elif use_device and (total_benchmark_runs < MAX_BENCHMARK_RUNS):
diff --git a/devops/azure/upload.py b/devops/azure/upload.py
index 71f0859a9..d20abde22 100644
--- a/devops/azure/upload.py
+++ b/devops/azure/upload.py
@@ -6,7 +6,7 @@
 import sys
 import platform
 from azure.storage.blob import BlobClient, ContainerClient
-from status import get_status, merge_status_entity, get_all_status_entities, get_utc_date
+from status import get_status, update_status_entity, get_all_status_entities, get_utc_date
 from reset import reset_metrics
 from delete import delete_blobs
 
@@ -74,7 +74,7 @@ def upload(model, name, priority=None, benchmark_only=False, use_pillow=False):
 
     e['status'] = 'uploading'
     e['node'] = get_node_id()  # lock the row until upload complete
-    merge_status_entity(e)
+    update_status_entity(e)
     try:
         upload_blob(name, model)
         # remove any cached dlc files since they need to be redone now.
@@ -95,7 +95,7 @@ def upload(model, name, priority=None, benchmark_only=False, use_pillow=False):
     if use_pillow:
         e['use_pillow'] = 1 if use_pillow else 0
 
-    merge_status_entity(e)
+    update_status_entity(e)
 
 
 if __name__ == '__main__':
diff --git a/devops/requirements.txt b/devops/requirements.txt
index 9e3162c08..6878122de 100644
--- a/devops/requirements.txt
+++ b/devops/requirements.txt
@@ -1,7 +1,7 @@
 sphinx==4.5.0
 scipy==1.5.4
 matplotlib==3.3.4
-scikit-image==0.19.3
+scikit-image==0.17.2
 pyyaml==6.0
 numpy
 onnx==1.11.0