From: Inki Dae <inki.dae@samsung.com>
Date: Fri, 7 Feb 2020 06:42:03 +0000 (+0900)
Subject: Consider one more inference target devices
X-Git-Tag: submit/tizen/20200423.063253~63
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c7ddd9272b5a91169b131151db2247b3283ef8db;p=platform%2Fcore%2Fmultimedia%2Finference-engine-interface.git

Consider one more inference target devices

Change-Id: I3183273117f73a36fe87d8dd6ca00c5d9720a02a
Signed-off-by: Inki Dae <inki.dae@samsung.com>
---

diff --git a/common/inference_engine_common_impl.cpp b/common/inference_engine_common_impl.cpp
old mode 100644
new mode 100755
index 4b98b5e..7286efb
--- a/common/inference_engine_common_impl.cpp
+++ b/common/inference_engine_common_impl.cpp
@@ -153,9 +153,9 @@ int InferenceEngineCommon::SetOutputTensorParamNodes(std::vector<std::string> no
     return ret;
 }
 
-int InferenceEngineCommon::SetTargetDevice(inference_target_type_e type)
+int InferenceEngineCommon::SetTargetDevices(int types)
 {
-    int ret = engine->SetTargetDevice(type);
+    int ret = engine->SetTargetDevices(types);
     if (ret != INFERENCE_ENGINE_ERROR_NONE)
         LOGE("Fail to SetTargetDevice");
 
diff --git a/include/inference_engine_common.h b/include/inference_engine_common.h
old mode 100644
new mode 100755
index d39e57f..e446b4f
--- a/include/inference_engine_common.h
+++ b/include/inference_engine_common.h
@@ -45,12 +45,12 @@ public:
     virtual int SetOutputTensorParamNodes(std::vector<std::string> nodes) = 0;
 
     /**
-     * @brief Set target device.
+     * @brief Set target devices.
      * @details See #inference_target_type_e
      *
      * @since_tizen 5.5
      */
-    virtual int SetTargetDevice(inference_target_type_e type) = 0;
+    virtual int SetTargetDevices(int types) = 0;
 
     /**
      * @brief Load model data with user-given model information.
diff --git a/include/inference_engine_common_impl.h b/include/inference_engine_common_impl.h
old mode 100644
new mode 100755
index c6910d8..cbd0fb0
--- a/include/inference_engine_common_impl.h
+++ b/include/inference_engine_common_impl.h
@@ -60,7 +60,7 @@ public:
     void UnbindBackend(void);
 
     /**
-     * @brief Set an input node name. Deprecated.
+     * @brief Set input node name. Deprecated.
      *
      * @since_tizen 5.5
      */
@@ -74,12 +74,12 @@ public:
     int SetOutputTensorParamNodes(std::vector<std::string> nodes);
 
     /**
-     * @brief Set target device.
+     * @brief Set target devices.
      * @details See #inference_target_type_e
      *
      * @since_tizen 5.5
      */
-    int SetTargetDevice(inference_target_type_e type);
+    int SetTargetDevices(int types);
 
     /**
      * @brief Load model data with user-given model information.
diff --git a/include/inference_engine_type.h b/include/inference_engine_type.h
index 2ea3538..c2af1c7 100644
--- a/include/inference_engine_type.h
+++ b/include/inference_engine_type.h
@@ -110,13 +110,11 @@ typedef struct _tensor_t {
  * This structure should be configured before InferenceEngineCommon object is
  * created and then passed to InferenceEngineCommon's constructor.
  *
- * If target_devices member is defined by user then INFERENCE_TARGET_CPU will be set as a default device.
- *
  * @since_tizen 6.0
  */
 typedef struct _inference_engine_config {
     std::string backend_name; /**< a backend name which could be one among supported backends(tflite, opencv, armnn, dldt) */
-    inference_target_type_e target_devices; /**< which device or devices to be targeted for inference. */
+    int target_devices; /**< which device or devices to be targeted for inference. */
     // TODO.
 } inference_engine_config;
 
diff --git a/include/inference_engine_vision_impl.h b/include/inference_engine_vision_impl.h
old mode 100644
new mode 100755
index 8f52180..f231fe4
--- a/include/inference_engine_vision_impl.h
+++ b/include/inference_engine_vision_impl.h
@@ -69,7 +69,7 @@ public:
     ~InferenceEngineVision();
 
     /**
-     * @brief Set an input node name. Deprecated.
+     * @brief Set input node name. Deprecated.
      *
      * @since_tizen 5.5
      */
@@ -139,12 +139,12 @@ public:
     int SetOutputTensorProperty(inference_engine_layer_property &property);
 
     /**
-     * @brief Set target device.
+     * @brief Set target devices.
      * @details See #inference_target_type_e
      *
      * @since_tizen 5.5
      */
-    int SetTargetDevice(inference_target_type_e type);
+    int SetTargetDevices(int types);
 
     /**
      * @brief Load model data with user-given model information.
diff --git a/vision/inference_engine_vision_impl.cpp b/vision/inference_engine_vision_impl.cpp
old mode 100644
new mode 100755
index b1ba62a..04b75fc
--- a/vision/inference_engine_vision_impl.cpp
+++ b/vision/inference_engine_vision_impl.cpp
@@ -213,9 +213,9 @@ int InferenceEngineVision::SetOutputTensorProperty(inference_engine_layer_proper
     return ret;
 }
 
-int InferenceEngineVision::SetTargetDevice(inference_target_type_e type)
+int InferenceEngineVision::SetTargetDevices(int types)
 {
-    int ret = mCommonEngine->SetTargetDevice(type);
+    int ret = mCommonEngine->SetTargetDevices(types);
     if (ret != INFERENCE_ENGINE_ERROR_NONE)
         LOGE("Fail to SetTargetDevice");