Add web interface and update readme

luxonis · Sep 21, 2021 · 1dc4c87 · 1dc4c87
1 parent daac45b
commit 1dc4c87
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 2 deletions.
diff --git a/cli/setup.py b/cli/setup.py
@@ -4,7 +4,7 @@
 
 setup(
     name='blobconverter',
-    version='1.1.0',
+    version='1.1.1',
     description='The tool that allows you to covert neural networks to MyriadX blob',
     long_description=io.open("README.md", encoding="utf-8").read(),
     long_description_content_type="text/markdown",

diff --git a/websrc/src/components/ConversionForm.jsx b/websrc/src/components/ConversionForm.jsx
@@ -35,6 +35,7 @@ const resolveSteps = source => {
       return [model_downloader_step, model_optimizer_step, myriad_compile_step]
     case "caffe":
     case "tf":
+    case "onnx":
       return [model_optimizer_step, myriad_compile_step]
     case "openvino":
       return [myriad_compile_step]
@@ -104,6 +105,13 @@ const ConversionForm = ({modelSource, prevStep, availableZooModels, convertModel
                 <input id="tf-model" name="tf-model" type="file" accept=".pb" required/>
               </div>
             }
+            {
+              modelSource === "onnx" &&
+              <div className="form-group">
+                <label htmlFor="onnx-model">Model file (.onnx)</label>
+                <input id="onnx-model" name="onnx-model" type="file" accept=".onnx" required/>
+              </div>
+            }
             {
               modelSource === "zoo" &&
               <div className="form-group">
@@ -157,7 +165,7 @@ const ConversionForm = ({modelSource, prevStep, availableZooModels, convertModel
           <div className="upper-border">Advanced options</div>
           <div className="advanced-options">
             {
-              _.includes(["tf", "caffe"], modelSource) &&
+              _.includes(["onnx", "tf", "caffe"], modelSource) &&
                 <div className="advanced-option">
                   <label htmlFor="advanced-option-input-optimizer"><span>Model optimizer</span> params:</label>
                   <input type="text" id="advanced-option-input-optimizer" name="advanced-option-input-optimizer" defaultValue={model_optimizer_step['cli_params']}/>

diff --git a/websrc/src/components/TypeChooser.jsx b/websrc/src/components/TypeChooser.jsx
@@ -22,6 +22,7 @@ const openVinoVersions = [
 const modelSources = [
   {label: "Caffe Model", value: "caffe"},
   {label: "TensorFlow Model", value: "tf"},
+  {label: "ONNX Model", value: "onnx"},
   {label: "OpenVino Model", value: "openvino"},
   {label: "OpenVino Zoo Model", value: "zoo"},
   {label: "Config file", value: "file"},

diff --git a/websrc/src/redux/sagas/dashboardSaga.js b/websrc/src/redux/sagas/dashboardSaga.js
@@ -81,6 +81,11 @@ function* convertModel({payload}) {
           optimizer_additional = ` --input_model=$dl_dir/${precision}/${payload['tf-model'].name}`
           break;
         }
+        case 'onnx': {
+          framework = "onnx";
+          optimizer_additional = ` --input_model=$dl_dir/${precision}/${payload['onnx-model'].name}`
+          break;
+        }
       }
       const filenames = Object.values(payload).map(item => item.name).filter(item => !!item)
       const yml = generateYaml({