Name Changes for sample and dynamic_vino_lib packages.

README.md

@@ -249,7 +249,7 @@ One-step installation scripts are provided for the dependencies' installation. P
 	```
   Run example application with an absolute path of an image on another console:
 	```bash
-	rosrun dynamic_vino_sample image_object_client ~/catkin_ws/src/ros_openvino_toolkit/data/images/car.png
+	rosrun vino_sample image_object_client ~/catkin_ws/src/ros_openvino_toolkit/data/images/car.png
 	```
 * run face detection service sample code input from Image  
   Run image processing service:
@@ -258,7 +258,7 @@ One-step installation scripts are provided for the dependencies' installation. P
 	```
   Run example application with an absolute path of an image on another console:
 	```bash
-	rosrun dynamic_vino_sample image_people_client ~/catkin_ws/src/ros_openvino_toolkit/data/images/team.jpg
+	rosrun vino_sample image_people_client ~/catkin_ws/src/ros_openvino_toolkit/data/images/team.jpg
 	```
 # TODO Features
 * Support **result filtering** for inference process, so that the inference results can be filtered to different subsidiary inference. For example, given an image, firstly we do Object Detection on it, secondly we pass cars to vehicle brand recognition and pass license plate to license number recognition.

doc/BINARY_VERSION_README.md

@@ -204,7 +204,7 @@ sudo ln -s ~/catkin_ws/src/ros_openvino_toolkit /opt/openvino_toolkit/ros_openvi
 	```
   Run example application with an absolute path of an image on another console:
 	```bash
-	rosrun dynamic_vino_sample image_object_client ~/catkin_ws/src/ros_openvino_toolkit/data/images/car.png
+	rosrun vino_sample image_object_client ~/catkin_ws/src/ros_openvino_toolkit/data/images/car.png
 	```
 * run people detection service sample code input from Image  
   Run image processing service:
@@ -213,7 +213,7 @@ sudo ln -s ~/catkin_ws/src/ros_openvino_toolkit /opt/openvino_toolkit/ros_openvi
 	```
   Run example application with an absolute path of an image on another console:
 	```bash
-	rosrun dynamic_vino_sample image_people_client ~/catkin_ws/src/ros_openvino_toolkit/data/images/team.jpg
+	rosrun vino_sample image_people_client ~/catkin_ws/src/ros_openvino_toolkit/data/images/team.jpg
 	```
 ## 6. Known Issues
 * Possible problems

dynamic_vino_lib/CMakeLists.txt → vino_core_lib/CMakeLists.txt

@@ -14,7 +14,7 @@
 
 cmake_minimum_required (VERSION 2.8.3)
 
-project(dynamic_vino_lib)
+project(vino_core_lib)
 
 message(STATUS "Looking for inference engine configuration file at: ${CMAKE_PREFIX_PATH}")
 find_package(InferenceEngine 1.1)

dynamic_vino_lib/include/dynamic_vino_lib/engines/engine.h → vino_core_lib/include/vino_core_lib/engines/engine.h

@@ -18,12 +18,12 @@
  * @brief A header file with declaration for NetworkEngine class
  * @file engine.h
  */
-#ifndef DYNAMIC_VINO_LIB_ENGINES_ENGINE_H
-#define DYNAMIC_VINO_LIB_ENGINES_ENGINE_H
+#ifndef VINO_CORE_LIB_ENGINES_ENGINE_H
+#define VINO_CORE_LIB_ENGINES_ENGINE_H
 
 #pragma once
 
-#include "dynamic_vino_lib/models/base_model.h"
+#include "vino_core_lib/models/base_model.h"
 #include "inference_engine.hpp"
 
 /**
@@ -65,4 +65,4 @@ class Engine
 };
 }  // namespace Engines
 
-#endif  // DYNAMIC_VINO_LIB_ENGINES_ENGINE_H
+#endif  // VINO_CORE_LIB_ENGINES_ENGINE_H

dynamic_vino_lib/include/dynamic_vino_lib/factory.h → vino_core_lib/include/vino_core_lib/factory.h

@@ -19,16 +19,16 @@
  * @file factory.h
  */
 
-#ifndef DYNAMIC_VINO_LIB_FACTORY_H
-#define DYNAMIC_VINO_LIB_FACTORY_H
+#ifndef VINO_CORE_LIB_FACTORY_H
+#define VINO_CORE_LIB_FACTORY_H
 
 #include <inference_engine.hpp>
 
 #include <memory>
 #include <string>
 
-#include "dynamic_vino_lib/common.h"
-#include "dynamic_vino_lib/inputs/base_input.h"
+#include "vino_core_lib/common.h"
+#include "vino_core_lib/inputs/base_input.h"
 #include "extension/ext_list.hpp"
 
 /**
@@ -67,4 +67,4 @@ class Factory
       const std::string& custom_cldnn_message, bool performance_message);
 };
 
-#endif  // DYNAMIC_VINO_LIB_FACTORY_H
+#endif  // VINO_CORE_LIB_FACTORY_H

dynamic_vino_lib/include/dynamic_vino_lib/inferences/age_gender_detection.h → vino_core_lib/include/vino_core_lib/inferences/age_gender_detection.h

@@ -18,16 +18,16 @@
  * @brief A header file with declaration for AgeGenderDetection Class
  * @file age_gender_recignition.h
  */
-#ifndef DYNAMIC_VINO_LIB_INFERENCES_AGE_GENDER_DETECTION_H
-#define DYNAMIC_VINO_LIB_INFERENCES_AGE_GENDER_DETECTION_H
+#ifndef VINO_CORE_LIB_INFERENCES_AGE_GENDER_DETECTION_H
+#define VINO_CORE_LIB_INFERENCES_AGE_GENDER_DETECTION_H
 
 #include <memory>
 #include <string>
 #include <vector>
 
-#include "dynamic_vino_lib/engines/engine.h"
-#include "dynamic_vino_lib/inferences/base_inference.h"
-#include "dynamic_vino_lib/models/age_gender_detection_model.h"
+#include "vino_core_lib/engines/engine.h"
+#include "vino_core_lib/inferences/base_inference.h"
+#include "vino_core_lib/models/age_gender_detection_model.h"
 #include "inference_engine.hpp"
 #include "opencv2/opencv.hpp"
 
@@ -36,7 +36,7 @@ namespace Outputs
 class BaseOuput;
 }
 
-namespace dynamic_vino_lib
+namespace vino_core_lib
 {
 /**
  * @class AgeGenderResult
@@ -76,7 +76,7 @@ class AgeGenderResult : public Result
 class AgeGenderDetection : public BaseInference
 {
  public:
-  using Result = dynamic_vino_lib::AgeGenderResult;
+  using Result = vino_core_lib::AgeGenderResult;
   AgeGenderDetection();
   ~AgeGenderDetection() override;
   /**
@@ -114,7 +114,7 @@ class AgeGenderDetection : public BaseInference
    * to the frame generated by the input device.
    * @param[in] idx The index of the result.
    */
-  const dynamic_vino_lib::Result* getLocationResult(int idx) const override;
+  const vino_core_lib::Result* getLocationResult(int idx) const override;
   /**
    * @brief Get the name of the Inference instance.
    * @return The name of the Inference instance.
@@ -131,6 +131,6 @@ class AgeGenderDetection : public BaseInference
   std::shared_ptr<Models::AgeGenderDetectionModel> valid_model_;
   std::vector<Result> results_;
 };
-}  // namespace dynamic_vino_lib
+}  // namespace vino_core_lib
 
-#endif  // DYNAMIC_VINO_LIB_INFERENCES_AGE_GENDER_DETECTION_H
+#endif  // VINO_CORE_LIB_INFERENCES_AGE_GENDER_DETECTION_H

dynamic_vino_lib/include/dynamic_vino_lib/inferences/base_inference.h → vino_core_lib/include/vino_core_lib/inferences/base_inference.h

@@ -18,14 +18,14 @@
  * @brief A header file with declaration for BaseInference Class
  * @file base_inference.h
  */
-#ifndef DYNAMIC_VINO_LIB_INFERENCES_BASE_INFERENCE_H
-#define DYNAMIC_VINO_LIB_INFERENCES_BASE_INFERENCE_H
+#ifndef VINO_CORE_LIB_INFERENCES_BASE_INFERENCE_H
+#define VINO_CORE_LIB_INFERENCES_BASE_INFERENCE_H
 
 #include <memory>
 #include <string>
 
-#include "dynamic_vino_lib/engines/engine.h"
-#include "dynamic_vino_lib/slog.h"
+#include "vino_core_lib/engines/engine.h"
+#include "vino_core_lib/slog.h"
 #include "inference_engine.hpp"
 #include "opencv2/opencv.hpp"
 
@@ -73,7 +73,7 @@ void matU8ToBlob(const cv::Mat& orig_image, InferenceEngine::Blob::Ptr& blob,
   }
 }
 
-namespace dynamic_vino_lib
+namespace vino_core_lib
 {
 /**
  * @class Result
@@ -155,7 +155,7 @@ class BaseInference
    * to the frame generated by the input device.
    * @param[in] idx The index of the result.
    */
-  virtual const dynamic_vino_lib::Result* getLocationResult(int idx) const = 0;
+  virtual const vino_core_lib::Result* getLocationResult(int idx) const = 0;
   /**
    * @brief Get the name of the Inference instance.
    * @return The name of the Inference instance.
@@ -198,6 +198,6 @@ class BaseInference
   int enqueued_frames = 0;
   bool results_fetched_ = false;
 };
-}  // namespace dynamic_vino_lib
+}  // namespace vino_core_lib
 
-#endif  // DYNAMIC_VINO_LIB_INFERENCES_BASE_INFERENCE_H
+#endif  // VINO_CORE_LIB_INFERENCES_BASE_INFERENCE_H

dynamic_vino_lib/include/dynamic_vino_lib/inferences/emotions_detection.h → vino_core_lib/include/vino_core_lib/inferences/emotions_detection.h

@@ -18,24 +18,24 @@
  * @brief A header file with declaration for EmotionsDetection Class
  * @file emotions_detection.h
  */
-#ifndef DYNAMIC_VINO_LIB_INFERENCES_EMOTIONS_DETECTION_H
-#define DYNAMIC_VINO_LIB_INFERENCES_EMOTIONS_DETECTION_H
+#ifndef VINO_CORE_LIB_INFERENCES_EMOTIONS_DETECTION_H
+#define VINO_CORE_LIB_INFERENCES_EMOTIONS_DETECTION_H
 
 #include <memory>
 #include <string>
 #include <vector>
 
-#include "dynamic_vino_lib/engines/engine.h"
-#include "dynamic_vino_lib/inferences/base_inference.h"
-#include "dynamic_vino_lib/models/emotion_detection_model.h"
+#include "vino_core_lib/engines/engine.h"
+#include "vino_core_lib/inferences/base_inference.h"
+#include "vino_core_lib/models/emotion_detection_model.h"
 #include "inference_engine.hpp"
 #include "opencv2/opencv.hpp"
 
 namespace Outputs
 {
 class BaseOuput;
 }
-namespace dynamic_vino_lib
+namespace vino_core_lib
 {
 /**
  * @class EmotionResult
@@ -67,7 +67,7 @@ class EmotionsResult : public Result
 class EmotionsDetection : public BaseInference
 {
  public:
-  using Result = dynamic_vino_lib::EmotionsResult;
+  using Result = vino_core_lib::EmotionsResult;
   EmotionsDetection();
   ~EmotionsDetection() override;
   /**
@@ -105,7 +105,7 @@ class EmotionsDetection : public BaseInference
    * to the frame generated by the input device.
    * @param[in] idx The index of the result.
    */
-  const dynamic_vino_lib::Result* getLocationResult(int idx) const override;
+  const vino_core_lib::Result* getLocationResult(int idx) const override;
   /**
    * @brief Get the name of the Inference instance.
    * @return The name of the Inference instance.
@@ -122,6 +122,6 @@ class EmotionsDetection : public BaseInference
   std::shared_ptr<Models::EmotionDetectionModel> valid_model_;
   std::vector<Result> results_;
 };
-}  // namespace dynamic_vino_lib
+}  // namespace vino_core_lib
 
-#endif  // DYNAMIC_VINO_LIB_INFERENCES_EMOTIONS_DETECTION_H
+#endif  // VINO_CORE_LIB_INFERENCES_EMOTIONS_DETECTION_H

dynamic_vino_lib/include/dynamic_vino_lib/inferences/face_detection.h → vino_core_lib/include/vino_core_lib/inferences/face_detection.h

@@ -18,8 +18,8 @@
  * @brief A header file with declaration for FaceDetection Class
  * @file face_detection.h
  */
-#ifndef DYNAMIC_VINO_LIB_INFERENCES_FACE_DETECTION_H
-#define DYNAMIC_VINO_LIB_INFERENCES_FACE_DETECTION_H
+#ifndef VINO_CORE_LIB_INFERENCES_FACE_DETECTION_H
+#define VINO_CORE_LIB_INFERENCES_FACE_DETECTION_H
 
 #include <object_msgs/Object.h>
 #include <object_msgs/ObjectInBox.h>
@@ -30,14 +30,14 @@
 #include <string>
 #include <vector>
 
-#include "dynamic_vino_lib/engines/engine.h"
-#include "dynamic_vino_lib/inferences/base_inference.h"
-#include "dynamic_vino_lib/models/face_detection_model.h"
+#include "vino_core_lib/engines/engine.h"
+#include "vino_core_lib/inferences/base_inference.h"
+#include "vino_core_lib/models/face_detection_model.h"
 #include "inference_engine.hpp"
 #include "opencv2/opencv.hpp"
 
 // namespace
-namespace dynamic_vino_lib
+namespace vino_core_lib
 {
 /**
  * @class FaceDetectionResult
@@ -73,7 +73,7 @@ class FaceDetectionResult : public Result
 class FaceDetection : public BaseInference
 {
  public:
-  using Result = dynamic_vino_lib::FaceDetectionResult;
+  using Result = vino_core_lib::FaceDetectionResult;
   explicit FaceDetection(double);
   ~FaceDetection() override;
   /**
@@ -111,7 +111,7 @@ class FaceDetection : public BaseInference
    * to the frame generated by the input device.
    * @param[in] idx The index of the result.
    */
-  const dynamic_vino_lib::Result* getLocationResult(int idx) const override;
+  const vino_core_lib::Result* getLocationResult(int idx) const override;
   /**
    * @brief Show the observed detection result either through image window
      or ROS topic.
@@ -132,5 +132,5 @@ class FaceDetection : public BaseInference
   int object_size_;
   double show_output_thresh_ = 0;
 };
-}  // namespace dynamic_vino_lib
-#endif  // DYNAMIC_VINO_LIB_INFERENCES_FACE_DETECTION_H
+}  // namespace vino_core_lib
+#endif  // VINO_CORE_LIB_INFERENCES_FACE_DETECTION_H

dynamic_vino_lib/include/dynamic_vino_lib/inferences/head_pose_detection.h → vino_core_lib/include/vino_core_lib/inferences/head_pose_detection.h

@@ -18,20 +18,20 @@
  * @brief A header file with declaration for FaceDetection Class
  * @file head_pose_detection.h
  */
-#ifndef DYNAMIC_VINO_LIB_INFERENCES_HEAD_POSE_DETECTION_H
-#define DYNAMIC_VINO_LIB_INFERENCES_HEAD_POSE_DETECTION_H
+#ifndef VINO_CORE_LIB_INFERENCES_HEAD_POSE_DETECTION_H
+#define VINO_CORE_LIB_INFERENCES_HEAD_POSE_DETECTION_H
 
 #include <memory>
 #include <string>
 #include <vector>
 
-#include "dynamic_vino_lib/engines/engine.h"
-#include "dynamic_vino_lib/inferences/base_inference.h"
-#include "dynamic_vino_lib/models/head_pose_detection_model.h"
+#include "vino_core_lib/engines/engine.h"
+#include "vino_core_lib/inferences/base_inference.h"
+#include "vino_core_lib/models/head_pose_detection_model.h"
 #include "inference_engine.hpp"
 #include "opencv2/opencv.hpp"
 
-namespace dynamic_vino_lib
+namespace vino_core_lib
 {
 /**
  * @class HeadPoseResult
@@ -80,7 +80,7 @@ class HeadPoseResult : public Result
 class HeadPoseDetection : public BaseInference
 {
  public:
-  using Result = dynamic_vino_lib::HeadPoseResult;
+  using Result = vino_core_lib::HeadPoseResult;
   HeadPoseDetection();
   ~HeadPoseDetection() override;
   /**
@@ -118,7 +118,7 @@ class HeadPoseDetection : public BaseInference
    * to the frame generated by the input device.
    * @param[in] idx The index of the result.
    */
-  const dynamic_vino_lib::Result* getLocationResult(int idx) const override;
+  const vino_core_lib::Result* getLocationResult(int idx) const override;
   /**
    * @brief Get the name of the Inference instance.
    * @return The name of the Inference instance.
@@ -135,5 +135,5 @@ class HeadPoseDetection : public BaseInference
   std::shared_ptr<Models::HeadPoseDetectionModel> valid_model_;
   std::vector<Result> results_;
 };
-}  // namespace dynamic_vino_lib
-#endif  // DYNAMIC_VINO_LIB_INFERENCES_HEAD_POSE_DETECTION_H
+}  // namespace vino_core_lib
+#endif  // VINO_CORE_LIB_INFERENCES_HEAD_POSE_DETECTION_H