From: Wook Song <wook16.song@samsung.com>
Date: Fri, 10 Jul 2020 07:11:44 +0000 (+0900)
Subject: [Dist/Debian] Add a sub-package that provides the openvino filter
X-Git-Tag: accepted/tizen/unified/20200723.161155~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=134233deb7b14ce58e19bbfd887fe798888d3fa0;p=platform%2Fupstream%2Fnnstreamer.git

[Dist/Debian] Add a sub-package that provides the openvino filter

This patch adds a sub-package that provides the tensor filter for
OpenVino to Debian/Ubuntu.

Signed-off-by: Wook Song <wook16.song@samsung.com>
---

diff --git a/debian/control b/debian/control
index 33ecd0b..6073897 100644
--- a/debian/control
+++ b/debian/control
@@ -9,8 +9,8 @@ Build-Depends: gcc-9 | gcc-8 | gcc-7 | gcc-6 | gcc-5 (>=5.4),
  libgtest-dev, ssat, libpng-dev, libopencv-dev, liborc-0.4-dev,
  python, python-numpy, python3, python3-dev, python3-numpy,
  tensorflow-lite-dev, pytorch, libedgetpu1-std (>=12), libedgetpu-dev (>=12),
- libflatbuffers-dev, flatbuffers-compiler, protobuf-compiler17,
- tensorflow-dev [amd64], python2.7-dev, libprotobuf-dev [amd64 arm64 armhf],
+ openvino-dev, openvino-cpu-mkldnn [amd64], libflatbuffers-dev, flatbuffers-compiler,
+ protobuf-compiler17, tensorflow-dev [amd64], python2.7-dev, libprotobuf-dev [amd64 arm64 armhf]
 Standards-Version: 3.9.6
 Homepage: https://github.com/nnstreamer/nnstreamer
 
@@ -84,6 +84,13 @@ Depends: nnstreamer, libedgetpu1-std, ${shlibs:Depends}, ${misc:Depends}
 Description: NNStreamer Edge TPU support
  This package allows nnstreamer to support Edge TPU.
 
+Package: nnstreamer-openvino
+Architecture: any
+Multi-Arch: same
+Depends: nnstreamer, openvino, ${shlibs:Depends}, ${misc:Depends}
+Description: NNStreamer OpenVino support
+ This package allows nnstreamer to support OpenVino.
+
 Package: nnstreamer-dev
 Architecture: any
 Multi-Arch: same
diff --git a/debian/nnstreamer-openvino.install b/debian/nnstreamer-openvino.install
new file mode 100644
index 0000000..7942a67
--- /dev/null
+++ b/debian/nnstreamer-openvino.install
@@ -0,0 +1 @@
+/usr/lib/nnstreamer/filters/libnnstreamer_filter_openvino.so
diff --git a/debian/rules b/debian/rules
index 846e30f..2476ba0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -39,7 +39,8 @@ override_dh_auto_configure:
 	mkdir -p build
 	meson --buildtype=plain --prefix=/usr --sysconfdir=/etc --libdir=lib/$(DEB_HOST_MULTIARCH) --bindir=lib/nnstreamer/bin --includedir=include \
 	-Dinstall-example=true -Dtf-support=$(enable_tf) -Dtflite-support=enabled -Dpytorch-support=enabled -Dcaffe2-support=enabled \
-	-Dpython2-support=enabled -Dpython3-support=enabled -Denable-capi=true -Denable-edgetpu=true -Denable-tizen=false build
+	-Dpython2-support=enabled -Dpython3-support=enabled -Denable-capi=true -Denable-edgetpu=true -Denable-tizen=false \
+	-Denable-openvino=true build
 
 override_dh_auto_build:
 	ninja -C build
diff --git a/ext/nnstreamer/tensor_filter/meson.build b/ext/nnstreamer/tensor_filter/meson.build
index eda415f..911a46f 100644
--- a/ext/nnstreamer/tensor_filter/meson.build
+++ b/ext/nnstreamer/tensor_filter/meson.build
@@ -375,7 +375,7 @@ if get_option('enable-openvino')
     nnstreamer_filter_openvino_sources,
     cpp_args: openvino_cpp_args,
     dependencies: nnstreamer_filter_openvino_deps,
-    install: false,
+    install: true,
     install_dir: filter_subplugin_install_dir
   )
 
@@ -383,7 +383,7 @@ if get_option('enable-openvino')
     nnstreamer_filter_openvino_sources,
     cpp_args: openvino_cpp_args,
     dependencies: nnstreamer_filter_openvino_deps,
-    install: false,
+    install: true,
     install_dir: nnstreamer_libdir
   )