remove maskrcnn v2

Signed-off-by: jcwchen <[email protected]>
onnx · Jun 21, 2023 · e1f7704 · e1f7704
1 parent 1337fe8
commit e1f7704
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 24 deletions.
diff --git a/models/mlagility/maskrcnn_resnet50_fpn_v2/maskrcnn_resnet50_fpn_v2-18.onnx b/models/mlagility/maskrcnn_resnet50_fpn_v2/maskrcnn_resnet50_fpn_v2-18.onnx
diff --git a/models/mlagility/maskrcnn_resnet50_fpn_v2/test_data_set_0/input_0.pb b/models/mlagility/maskrcnn_resnet50_fpn_v2/test_data_set_0/input_0.pb
diff --git a/models/mlagility/maskrcnn_resnet50_fpn_v2/test_data_set_0/output_0.pb b/models/mlagility/maskrcnn_resnet50_fpn_v2/test_data_set_0/output_0.pb
diff --git a/models/mlagility/maskrcnn_resnet50_fpn_v2/test_data_set_0/output_1.pb b/models/mlagility/maskrcnn_resnet50_fpn_v2/test_data_set_0/output_1.pb
diff --git a/models/mlagility/maskrcnn_resnet50_fpn_v2/test_data_set_0/output_2.pb b/models/mlagility/maskrcnn_resnet50_fpn_v2/test_data_set_0/output_2.pb
diff --git a/models/mlagility/maskrcnn_resnet50_fpn_v2/test_data_set_0/output_3.pb b/models/mlagility/maskrcnn_resnet50_fpn_v2/test_data_set_0/output_3.pb
diff --git a/workflow_scripts/mlagility_config.py b/workflow_scripts/mlagility_config.py
@@ -2,7 +2,7 @@
     "torch_hub/alexnet.py",
     "torch_hub/resnet50.py",
     "torchvision/fasterrcnn_resnet50_fpn_v2.py",
-    "torchvision/maskrcnn_resnet50_fpn_v2.py",
+    "torchvision/maskrcnn_resnet50_fpn.py",
     "torchvision/ssd300_vgg16.py",
     "torch_hub/mobilenet_v2.py",
     "torch_hub/mobilenet_v3_large.py",

diff --git a/workflow_scripts/run_mlagility.py b/workflow_scripts/run_mlagility.py
@@ -1,7 +1,7 @@
 import argparse
 from mlagility_config import models_info
 import os.path as osp
-from os import listdir
+from os import listdir, rename
 from pathlib import Path
 import shutil
 import subprocess
@@ -46,7 +46,9 @@ def main():
         model_zoo_dir = model_name
         try:
             print(f"----------------Checking {model_zoo_dir}----------------")
-            final_model_path = osp.join(mlagility_models_dir, model_zoo_dir, f"{model_zoo_dir}-{ZOO_OPSET_VERSION}.onnx")
+            final_model_dir = osp.join(mlagility_models_dir, model_zoo_dir)
+            final_model_name = f"{model_zoo_dir}-{ZOO_OPSET_VERSION}.onnx"
+            final_model_path = osp.join(final_model_dir, final_model_name)
             if osp.exists(final_model_path) and args.skip:
                 print(f"Skip checking {model_zoo_dir} because {final_model_path} already exists.")
                 continue
@@ -55,12 +57,13 @@ def main():
                             cwd=cwd_path, stdout=sys.stdout,
                             stderr=sys.stderr, check=True)
             model_hash_name = find_model_hash_name(".cache", model_name + "_" + directory_name + "_")
-            mlagility_created_dir = osp.join(cache_converted_dir, model_hash_name, "onnx", model_hash_name + base_name)
+            mlagility_created_onnx = osp.join(cache_converted_dir, model_hash_name, "onnx", model_hash_name + base_name)
             if args.create:
-                ort_test_dir_utils.create_test_dir(mlagility_created_dir, "./", final_model_path)
+                ort_test_dir_utils.create_test_dir(mlagility_created_onnx, "./", final_model_path)
+                rename(osp.join(final_model_dir, model_hash_name), final_model_path)
                 print(f"Successfully created {model_zoo_dir} by mlagility and ORT.")
             else:
-                shutil.copy(mlagility_created_dir, final_model_path)
+                shutil.copy(mlagility_created_onnx, final_model_path)
                 subprocess.run(["git", "diff", "--exit-code", "--", final_model_path],
                                 cwd=cwd_path, stdout=sys.stdout,
                                 stderr=sys.stderr, check=True)