Fix tensor information for DLDT

Change-Id: I4752fb271094b8c79481933b2a192a90f3ffd18a
Signed-off-by: Kwang Son <k.son@samsung.com>

diff --git a/mv_inference/inference/src/Inference.cpp b/mv_inference/inference/src/Inference.cpp
index 419d60be5a1c200c639d48bbd79a9a7e998eb512..40d1b9ed48fd167982c5ffa2a0be740c9003d92b 100755 (executable)
--- a/mv_inference/inference/src/Inference.cpp
+++ b/mv_inference/inference/src/Inference.cpp
@@ -93,7 +93,7 @@ namespace inference
                mSupportedInferenceBackend.insert(std::make_pair(
                                MV_INFERENCE_BACKEND_ONE, std::make_pair("mlapi", false)));
                mSupportedInferenceBackend.insert(std::make_pair(
-                               MV_INFERENCE_BACKEND_DLDT, std::make_pair("dldt", false)));
+                               MV_INFERENCE_BACKEND_DLDT, std::make_pair("dldt", true)));
 
                CheckSupportedInferenceBackend();
 
@@ -851,7 +851,7 @@ namespace inference
                if (mConfig.mTargetTypes & MV_INFERENCE_TARGET_DEVICE_GPU) {
                        if (!(mBackendCapacity.supported_accel_devices &
                                  INFERENCE_TARGET_GPU)) {
-                               LOGE("Backend doesn't support CPU device as an accelerator.");
+                               LOGE("Backend doesn't support GPU device as an accelerator.");
                                return MEDIA_VISION_ERROR_INVALID_PARAMETER;
                        }
                }
@@ -859,7 +859,7 @@ namespace inference
                if (mConfig.mTargetTypes & MV_INFERENCE_TARGET_DEVICE_CUSTOM) {
                        if (!(mBackendCapacity.supported_accel_devices &
                                  INFERENCE_TARGET_CUSTOM)) {
-                               LOGE("Backend doesn't support CPU device as an accelerator.");
+                               LOGE("Backend doesn't support CUSTOM device as an accelerator.");
                                return MEDIA_VISION_ERROR_INVALID_PARAMETER;
                        }
                }
@@ -910,12 +910,15 @@ namespace inference
                case INFERENCE_MODEL_CAFFE:
                case INFERENCE_MODEL_TF:
                case INFERENCE_MODEL_DARKNET:
-               case INFERENCE_MODEL_DLDT:
                case INFERENCE_MODEL_ONNX:
                case INFERENCE_MODEL_VIVANTE:
                        models.push_back(mConfig.mWeightFilePath);
                        models.push_back(mConfig.mConfigFilePath);
                        break;
+               case INFERENCE_MODEL_DLDT:
+                       models.push_back(mConfig.mConfigFilePath);
+                       models.push_back(mConfig.mWeightFilePath);
+                       break;
                case INFERENCE_MODEL_TFLITE:
                case INFERENCE_MODEL_TORCH:
                        models.push_back(mConfig.mWeightFilePath);

diff --git a/test/testsuites/stream_handpose_browser/stream_handpose_browser.c b/test/testsuites/stream_handpose_browser/stream_handpose_browser.c
index 0db7469ccd8e2fd4c9336085873cabeb65da12b5..7a973095c21317fa8c9977b716e4c9fb663d6ffd 100644 (file)
--- a/test/testsuites/stream_handpose_browser/stream_handpose_browser.c
+++ b/test/testsuites/stream_handpose_browser/stream_handpose_browser.c
@@ -1372,7 +1372,11 @@ int perform_dldt_hand_detection(mv_engine_config_h mv_engine_cfg)
                         MV_INFERENCE_MODEL_WEIGHT_FILE_PATH,
                         PE_DLDT_1_WEIGHT_PATH);
 
-       mv_engine_config_set_int_attribute(mv_engine_cfg,
+    mv_engine_config_set_string_attribute(mv_engine_cfg,
+                        MV_INFERENCE_MODEL_CONFIGURATION_FILE_PATH,
+                        PE_DLDT_1_XML_PATH);
+
+    mv_engine_config_set_int_attribute(mv_engine_cfg,
                         MV_INFERENCE_INPUT_DATA_TYPE,
                         MV_INFERENCE_DATA_FLOAT32);
 
@@ -1426,6 +1430,11 @@ int perform_dldt_hand_detection2(mv_engine_config_h mv_engine_cfg)
                         MV_INFERENCE_MODEL_WEIGHT_FILE_PATH,
                         PE_DLDT_2_WEIGHT_PATH);
 
+    mv_engine_config_set_string_attribute(mv_engine_cfg,
+                        MV_INFERENCE_MODEL_CONFIGURATION_FILE_PATH,
+                        PE_DLDT_2_XML_PATH);
+
+
        mv_engine_config_set_int_attribute(mv_engine_cfg,
                         MV_INFERENCE_INPUT_DATA_TYPE,
                         MV_INFERENCE_DATA_FLOAT32);
@@ -1875,7 +1884,7 @@ static int app_create(void *data)
                start = clock();
                mv_inference_prepare(hp_mv_infer2);
                end = clock();
-               printf("time: %2.3f\n", (double)(end - start)/CLOCKS_PER_SEC);
+               printf("time 2: %2.3f\n", (double)(end - start)/CLOCKS_PER_SEC);
 
                mv_create_source(&mv_src_p2);
        }