[nnfw] Adding nnfw support with nnapi

Support nnfw. If enable-nnfw is on, it will use nnfw.

**Self evaluation:**
1. Build test:	 [X]Passed [ ]Failed [ ]Skipped
2. Run test:	 [X]Passed [ ]Failed [ ]Skipped

Signed-off-by: jijoong.moon <jijoong.moon@samsung.com>

diff --git a/ext/nnstreamer/tensor_filter/meson.build b/ext/nnstreamer/tensor_filter/meson.build
index dc14810..b0de81b 100644 (file)
--- a/ext/nnstreamer/tensor_filter/meson.build
+++ b/ext/nnstreamer/tensor_filter/meson.build
@@ -41,6 +41,15 @@ if get_option('enable-tensorflow-lite')
 
   nnstreamer_filter_tflite_deps = [tflite_dep, thread_dep, libdl_dep, glib_dep, gst_dep, nnstreamer_dep]
 
+  if get_option('enable-nnfw')
+    nnapi_lib = dependency('nnfw', required: true)
+    if nnapi_lib.found()
+      nnstreamer_filter_tflite_deps += nnapi_lib
+    else
+      error('Cannot find nnfw')
+    endif
+  endif
+
   shared_library('nnstreamer_filter_tensorflow-lite',
     nnstreamer_filter_tflite_sources,
     cpp_args: ['-Wno-sign-compare'],

diff --git a/ext/nnstreamer/tensor_filter/tensor_filter_tensorflow_lite_core.cc b/ext/nnstreamer/tensor_filter/tensor_filter_tensorflow_lite_core.cc
index 46291b1..f70fff2 100644 (file)
--- a/ext/nnstreamer/tensor_filter/tensor_filter_tensorflow_lite_core.cc
+++ b/ext/nnstreamer/tensor_filter/tensor_filter_tensorflow_lite_core.cc
@@ -129,8 +129,19 @@ TFLiteCore::loadModel ()
       return -2;
     }
 
-    /* Set inference path of tensorflow-lite */
-    interpreter->UseNNAPI (use_nnapi);
+    interpreter->UseNNAPI(use_nnapi);
+
+#ifdef ENABLE_NNFW
+    if(use_nnapi){
+      nnfw_delegate.reset(new ::nnfw::tflite::NNAPIDelegate);
+      if(nnfw_delegate->BuildGraph(interpreter.get()) != kTfLiteOk){
+       GST_ERROR("Fail to BuildGraph");
+       return -3;
+      }
+    }
+#endif
+
+    g_message ("interpreter->UseNNAPI: %d" , use_nnapi);
 
     /** set allocation type to dynamic for in/out tensors */
     int tensor_idx;
@@ -330,10 +341,24 @@ TFLiteCore::invoke (const GstTensorMemory * input, GstTensorMemory * output)
     tensors_idx.push_back (tensor_idx);
   }
 
+#ifdef ENABLE_NNFW
+  if(use_nnapi){
+    if(nnfw_delegate->Invoke(interpreter.get()) != kTfLiteOk){
+      GST_ERROR ("Failed to invoke");
+      return -3;
+    }
+  }else{
+    if (interpreter->Invoke () != kTfLiteOk) {
+      GST_ERROR ("Failed to invoke");
+      return -3;
+    }
+  }
+#else
   if (interpreter->Invoke () != kTfLiteOk) {
     GST_ERROR ("Failed to invoke");
     return -3;
   }
+#endif
 
   /** if it is not `nullptr`, tensorflow makes `free()` the memory itself. */
   int tensorSize = tensors_idx.size ();

diff --git a/ext/nnstreamer/tensor_filter/tensor_filter_tensorflow_lite_core.h b/ext/nnstreamer/tensor_filter/tensor_filter_tensorflow_lite_core.h
index af66825..3cf882d 100644 (file)
--- a/ext/nnstreamer/tensor_filter/tensor_filter_tensorflow_lite_core.h
+++ b/ext/nnstreamer/tensor_filter/tensor_filter_tensorflow_lite_core.h
@@ -34,6 +34,10 @@
 #include <tensorflow/contrib/lite/model.h>
 #include <tensorflow/contrib/lite/kernels/register.h>
 
+#ifdef ENABLE_NNFW
+#include "tflite/ext/nnapi_delegate.h"
+#endif
+
 /**
  * @brief      ring cache structure
  */
@@ -63,6 +67,10 @@ private:
   std::unique_ptr <tflite::Interpreter> interpreter;
   std::unique_ptr <tflite::FlatBufferModel> model;
 
+#ifdef ENABLE_NNFW
+  std::unique_ptr <nnfw::tflite::NNAPIDelegate> nnfw_delegate;
+#endif
+
   tensor_type getTensorType (TfLiteType tfType);
   int getTensorDim (int tensor_idx, tensor_dim dim);
 };

diff --git a/meson.build b/meson.build
index a3defb9..d2b1660 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -211,6 +211,12 @@ if get_option('enable-tizen')
   add_project_arguments('-D__TIZEN__=1', language: ['c', 'cpp'])
 endif
 
+# nnfw
+if get_option('enable-nnfw')
+    add_project_arguments('-DENABLE_NNFW=1', language: ['c', 'cpp'])
+endif
+
+
 # Build nnstreamer (common, plugins)
 subdir('gst')
 

diff --git a/meson_options.txt b/meson_options.txt
index d842d3f..341a2ef 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -17,3 +17,4 @@ option('enable-python', type: 'boolean', value: true)
 option('enable-tizen', type: 'boolean', value: false)
 option('enable-element-restriction', type: 'boolean', value: false) # true to restrict gst-elements in api
 option('restricted-elements', type: 'string', value: '')
+option('enable-nnfw', type: 'boolean', value: false)

diff --git a/packaging/nnstreamer.spec b/packaging/nnstreamer.spec
index de87acb..906feca 100644 (file)
--- a/packaging/nnstreamer.spec
+++ b/packaging/nnstreamer.spec
@@ -181,7 +181,7 @@ mkdir -p build
 %define enable_tf false
 %endif
 
-meson --buildtype=plain --prefix=%{_prefix} --sysconfdir=%{_sysconfdir} --libdir=%{_libdir} --bindir=%{nnstexampledir} --includedir=%{_includedir} -Dinstall-example=true -Denable-tensorflow=%{enable_tf} -Denable-pytorch=false -Denable-caffe2=false %{api} -Denable-env-var=false -Denable-symbolic-link=false -Denable-tizen=true build
+meson --buildtype=plain --prefix=%{_prefix} --sysconfdir=%{_sysconfdir} --libdir=%{_libdir} --bindir=%{nnstexampledir} --includedir=%{_includedir} -Dinstall-example=true -Denable-tensorflow=%{enable_tf} -Denable-pytorch=false -Denable-caffe2=false %{api} -Denable-env-var=false -Denable-symbolic-link=false -Denable-tizen=true build -Denable-nnfw=false
 
 ninja -C build %{?_smp_mflags}