test: Change a backend type from VIVANTE to MLAPI

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

diff --git a/include/mv_inference_type.h b/include/mv_inference_type.h
index 46fb65b7381f0ea4de08385a0c0d6c6cff69df8b..434fabaddfed9f02245907ad33a86aff612d072b 100644 (file)
--- a/include/mv_inference_type.h
+++ b/include/mv_inference_type.h
@@ -44,7 +44,7 @@ typedef enum {
     MV_INFERENCE_BACKEND_OPENCV,    /**< OpenCV */
     MV_INFERENCE_BACKEND_TFLITE,    /**< TensorFlow-Lite */
     MV_INFERENCE_BACKEND_ARMNN,     /**< ARMNN (Since 6.0) */
-    MV_INFERENCE_BACKEND_VIVANTE,   /**< Vivante (Since 6.0) */
+    MV_INFERENCE_BACKEND_MLAPI,     /**< Vivante (Since 6.0) */
        MV_INFERENCE_BACKEND_NNFW,      /**< NNFW (Since 6.0) */
     MV_INFERENCE_BACKEND_MAX        /**< Backend MAX */
 } mv_inference_backend_type_e;

diff --git a/mv_inference/inference/src/Inference.cpp b/mv_inference/inference/src/Inference.cpp
index 8540915a1bf46ba7d23725809a25a5e06fadaed5..6f886ce15d500d3691fe15292cf94b8b9f8e2bbf 100755 (executable)
--- a/mv_inference/inference/src/Inference.cpp
+++ b/mv_inference/inference/src/Inference.cpp
@@ -83,7 +83,7 @@ Inference::Inference() :
        mSupportedInferenceBackend.insert(std::make_pair(MV_INFERENCE_BACKEND_OPENCV, std::make_pair("opencv", false)));
        mSupportedInferenceBackend.insert(std::make_pair(MV_INFERENCE_BACKEND_TFLITE, std::make_pair("tflite", false)));
        mSupportedInferenceBackend.insert(std::make_pair(MV_INFERENCE_BACKEND_ARMNN, std::make_pair("armnn", false)));
-    mSupportedInferenceBackend.insert(std::make_pair(MV_INFERENCE_BACKEND_VIVANTE, std::make_pair("nnstreamer", false)));
+    mSupportedInferenceBackend.insert(std::make_pair(MV_INFERENCE_BACKEND_MLAPI, std::make_pair("nnstreamer", false)));
        mSupportedInferenceBackend.insert(std::make_pair(MV_INFERENCE_BACKEND_NNFW, std::make_pair("nnstreamer", false)));
 
        CheckSupportedInferenceBackend();

diff --git a/test/testsuites/inference/inference_test_suite.c b/test/testsuites/inference/inference_test_suite.c
index 6415c3facf4c76ac2fd3452669db816fa1409ee7..a4ade66231b65d71fabb3b421905c1e541aa266a 100644 (file)
--- a/test/testsuites/inference/inference_test_suite.c
+++ b/test/testsuites/inference/inference_test_suite.c
@@ -943,7 +943,7 @@ int perform_vivante_inceptionv3_config(mv_engine_config_h *engine_cfg)
 
     mv_engine_config_set_int_attribute(handle,
                         MV_INFERENCE_BACKEND_TYPE,
-                        MV_INFERENCE_BACKEND_VIVANTE);
+                        MV_INFERENCE_BACKEND_MLAPI);
 
     mv_engine_config_set_int_attribute(handle,
                         MV_INFERENCE_TARGET_DEVICE_TYPE,