mv_inference: add ARMNN backend support

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

diff --git a/include/mv_inference_type.h b/include/mv_inference_type.h
index 58c23c7d092068e470513abf8bb34e9551a4a956..780c84d591e32d89cb4d02488e5510fdee3e6926 100644 (file)
--- a/include/mv_inference_type.h
+++ b/include/mv_inference_type.h
@@ -43,6 +43,7 @@ typedef enum {
     MV_INFERENCE_BACKEND_NONE = -1, /**< None */
     MV_INFERENCE_BACKEND_OPENCV,    /**< OpenCV */
     MV_INFERENCE_BACKEND_TFLITE,    /**< TensorFlow-Lite */
+    MV_INFERENCE_BACKEND_ARMNN,     /**< ARMNN */
     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 d8954f7d76444af2fe1b38a5dcac2e361472b7f8..e2a2094ab6ef45cf35995e0135d424bf0f301ce1 100644 (file)
--- a/mv_inference/inference/src/Inference.cpp
+++ b/mv_inference/inference/src/Inference.cpp
@@ -59,6 +59,7 @@ Inference::Inference() :
        mBackend = NULL;
        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)));
 
        CheckSupportedInferenceBackend();
 

diff --git a/mv_inference/inference/src/mv_inference_open.cpp b/mv_inference/inference/src/mv_inference_open.cpp
index 4e40030fde35760985fd1b025c82f2688d725b56..e044849056b3d29653424ed213445f9679da6dae 100644 (file)
--- a/mv_inference/inference/src/mv_inference_open.cpp
+++ b/mv_inference/inference/src/mv_inference_open.cpp
@@ -118,7 +118,7 @@ int mv_inference_configure_model_open(mv_inference_h infer, mv_engine_config_h e
        }
 
        if ( (backendType > MV_INFERENCE_BACKEND_NONE  && backendType < MV_INFERENCE_BACKEND_MAX)
-               && (backendType != MV_INFERENCE_BACKEND_TFLITE)) {
+               && (backendType != MV_INFERENCE_BACKEND_TFLITE) && (backendType != MV_INFERENCE_BACKEND_ARMNN)) {
                if ( access(modelConfigFilePath, F_OK)) {
                        LOGE("modelConfigFilePath in [%s] ", modelConfigFilePath);
                        ret = MEDIA_VISION_ERROR_INVALID_PATH;