test mo to ovc

Author: sbalandi

tools/model_tools/src/omz_tools/omz_converter.py

@@ -112,33 +112,49 @@ def convert(reporter, model, output_dir, args, mo_props, requested_precisions):
             return False
         model_format = 'onnx'
 
-    expanded_mo_args = [
+    custom_mo_args = [
         string.Template(arg).substitute(template_variables)
         for arg in model.mo_args]
+    
+    expanded_mo_args = []
+    input_model = ''
+    for arg in custom_mo_args:
+        if 'input_model' in arg:
+            input_model = arg.split('=')[-1]
+        if 'output' in arg:
+            expanded_mo_args.append(arg)
 
     for model_precision in sorted(model_precisions):
         data_type = model_precision.split('-')[0]
         layout_string = ','.join(
             '{}({})'.format(input.name, input.layout) for input in model.input_info if input.layout
         )
-        shape_string = ','.join(str(input.shape) for input in model.input_info if input.shape)
-
-        if layout_string:
-            expanded_mo_args.append('--layout={}'.format(layout_string))
+        shape_string = ','.join(str(input.shape).replace(" ", "") for input in model.input_info if input.shape)
+        
+        # input_arg = ''
+        # for input in model.input_info:
+        #     if input_arg:
+        #         input_arg += ','
+        #     input_arg += f'{input.name}{str(input.shape).replace(" ", "")}'
+
+        # if layout_string:
+        #     expanded_mo_args.append('--layout={}'.format(layout_string))
         if shape_string:
-            expanded_mo_args.append('--input_shape={}'.format(shape_string))
+            expanded_mo_args.append('--input={}'.format(shape_string))
         if data_type == "FP16":
             expanded_mo_args.append("--compress_to_fp16=True")
         else:
             expanded_mo_args.append("--compress_to_fp16=False")
 
         mo_output_dir = output_dir / model.subdirectory / model_precision
         mo_cmd = [*mo_props.cmd_prefix,
-            '--framework={}'.format(model_format),
-            f'--output_dir={mo_output_dir}',
-            '--model_name={}'.format(model.name),
-            '--input={}'.format(','.join(input.name for input in model.input_info)),
-            *expanded_mo_args, *mo_props.extra_args]
+            input_model,
+            f'--output_model={str(Path(mo_output_dir, model.name + ".xml"))}',
+            # '--framework={}'.format(model_format),
+            # f'--output={mo_output_dir}',
+            # '--model_name={}'.format(model.name),
+            # f'--input=\"{input_arg}\"',
+            *expanded_mo_args]
 
         reporter.print_section_heading('{}Converting {} to IR ({})',
             '(DRY RUN) ' if args.dry_run else '', model.name, model_precision)
@@ -271,15 +287,15 @@ def converter(argv):
         mo_path = args.mo
 
         if mo_path is None:
-            mo_executable = shutil.which('mo')
+            mo_executable = shutil.which('ovc')
 
             if mo_executable:
                 mo_path = Path(mo_executable)
             else:
                 try:
-                    mo_path = Path(os.environ['INTEL_OPENVINO_DIR']) / 'tools/mo/openvino/tools/mo/mo.py'
-                    if not mo_path.exists():
-                        mo_path = Path(os.environ['INTEL_OPENVINO_DIR']) / 'tools/model_optimizer/mo.py'
+                    # mo_path = Path(os.environ['INTEL_OPENVINO_DIR']) / 'tools/mo/openvino/tools/mo/mo.py'
+                    # if not mo_path.exists():
+                    mo_path = Path(os.environ['INTEL_OPENVINO_DIR']) / 'tools/ovc/ovc.py'
                 except KeyError:
                     sys.exit('Unable to locate Model Optimizer. '
                         + 'Use --mo or run setupvars.sh/setupvars.bat from the OpenVINO toolkit.')
@@ -291,11 +307,11 @@ def converter(argv):
             if str(mo_path).lower().endswith('.py'):
                 mo_dir = mo_path.parent
             else:
-                mo_package_path, stderr = _common.get_package_path(args.python, 'openvino.tools.mo')
+                mo_package_path, stderr = _common.get_package_path(args.python, 'openvino.tools.ovc')
                 mo_dir = mo_package_path
 
                 if mo_package_path is None:
-                    mo_package_path, stderr = _common.get_package_path(args.python, 'mo')
+                    mo_package_path, stderr = _common.get_package_path(args.python, 'ovc')
                     if mo_package_path is None:
                         sys.exit('Unable to load Model Optimizer. Errors occurred: {}'.format(stderr))
                     mo_dir = mo_package_path.parent