Merge pull request #21 from houk-intel/pipeline

Object detection works now
intel · Dec 5, 2018 · 800ddb9 · 800ddb9
2 parents da9e6a3 + 28fb4c7
commit 800ddb9
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 14 deletions.
diff --git a/dynamic_vino_lib/src/pipeline_manager.cpp b/dynamic_vino_lib/src/pipeline_manager.cpp
@@ -116,6 +116,8 @@ PipelineManager::parseInputDevice(
       if (params.input_meta != "") {
         device = std::make_shared<Input::Image>(params.input_meta);
       }
+    } else {
+      slog::err << "Invalid input device name: " << name << slog::endl;
     }
 
     if (device != nullptr) {
@@ -141,6 +143,8 @@ PipelineManager::parseOutput(
       object = std::make_shared<Outputs::ImageWindowOutput>("Results");
     } else if (name == kOutputTpye_RViz) {
       object = std::make_shared<Outputs::RvizOutput>();
+    } else {
+      slog::err << "Invalid output name: " << name << slog::endl;
     }
     if (object != nullptr) {
       outputs.insert({name, object});
@@ -187,6 +191,8 @@ PipelineManager::parseInference(
 
     } else if (infer.name == kInferTpye_ObjectDetection) {
       object = createObjectDetection(infer);
+    } else {
+      slog::err << "Invalid inference name: " << infer.name << slog::endl;
     }
 
     if (object != nullptr) {

diff --git a/sample/param/pipeline_object.yaml b/sample/param/pipeline_object.yaml
@@ -2,20 +2,21 @@ Pipelines:
 - name: object
   inputs: [StandardCamera]
   infers:
-    - name: object_detection
+    - name: ObjectDetection
       model: /opt/intel/computer_vision_sdk/deployment_tools/intel_models/person-vehicle-bike-detection-crossroad-0078/FP32/person-vehicle-bike-detection-crossroad-0078.xml
+      engine: CPU
       label: to/be/set/xxx.labels
       batch: 16
-  outputs: [ImageWindow, RosTopic, Rviz]
+  outputs: [ImageWindow, RosTopic, RViz]
   confidence_threshold: 0.2
   connects:
     - left: StandardCamera
-      right: [object_detection]
-    - left: object_detection
+      right: [ObjectDetection]
+    - left: ObjectDetection
       right: [ImageWindow]
-    - left: object_detection
+    - left: ObjectDetection
       right: [RosTopic]
-    - left: object_detection
-      right: [Rviz]
+    - left: ObjectDetection
+      right: [RViz]
 
 OpenvinoCommon:
diff --git a/sample/param/pipeline_object_oss.yaml b/sample/param/pipeline_object_oss.yaml
@@ -2,20 +2,21 @@ Pipelines:
 - name: object
   inputs: [StandardCamera]
   infers:
-    - name: object_detection
+    - name: ObjectDetection
       model: /opt/openvino_toolkit/open_model_zoo/model_downloader/Security/object_detection/crossroad/0078/dldt/person-vehicle-bike-detection-crossroad-0078.xml 
+      engine: CPU
       label: to/be/set/xxx.labels
       batch: 16
-  outputs: [ImageWindow, RosTopic, Rviz]
+  outputs: [ImageWindow, RosTopic, RViz]
   confidence_threshold: 0.2
   connects:
     - left: StandardCamera
-      right: [object_detection]
-    - left: object_detection
+      right: [ObjectDetection]
+    - left: ObjectDetection
       right: [ImageWindow]
-    - left: object_detection
+    - left: ObjectDetection
       right: [RosTopic]
-    - left: object_detection
-      right: [Rviz]
+    - left: ObjectDetection
+      right: [RViz]
 
 OpenvinoCommon: