From: Wook Song Date: Fri, 3 Jan 2020 06:49:13 +0000 (+0900) Subject: [Dist/Debian] Add a sub-package to provide the CPU extension X-Git-Tag: accepted/tizen/unified/20200113.130523~7 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F18%2F221518%2F1;p=platform%2Fupstream%2Fdldt.git [Dist/Debian] Add a sub-package to provide the CPU extension This patch adds a sub-package to provide the CPU extension plug-in. Change-Id: I07e2599aff375934b4f549a7ae9f4eb8dd6e8daf Signed-off-by: Wook Song --- diff --git a/debian/control b/debian/control index d956e31..8e3380e 100644 --- a/debian/control +++ b/debian/control @@ -18,6 +18,7 @@ Priority: optional Architecture: any Multi-Arch: same Depends: ${shlibs:Depends}, ${misc:Depends}, libtbb +Recommends: libinference-engine-cpu-mkldnn [amd64] Description: OpenVINO™ Toolkit - Deep Learning Deployment Toolkit OpenVINO™ toolkit, short for Open Visual Inference and Neural network Optimization toolkit, provides developers with improved neural network @@ -38,3 +39,15 @@ Multi-Arch: same Depends: ${shlibs:Depends}, ${misc:Depends}, libinference-engine Description: OpenVINO™ Toolkit Development package This is development package for Intel® OpenVINO™ Toolkit. + +Package: libinference-engine-cpu-mkldnn +Section: libs +Priority: optional +Architecture: amd64 +Multi-Arch: same +Depends: ${shlibs:Depends}, ${misc:Depends}, libinference-engine +Description: CPU plugin for OpenVINO™ Toolkit + This package contains the CPU plugin, which was developed in order to provide + opportunity for high performance scoring of neural networks on CPU, using the + Intel® Math Kernel Library for Deep Neural Networks (Intel® MKL-DNN), + of the OpenVINO™ toolkit diff --git a/debian/libinference-engine-cpu-mkldnn.install b/debian/libinference-engine-cpu-mkldnn.install new file mode 100644 index 0000000..eef2eb8 --- /dev/null +++ b/debian/libinference-engine-cpu-mkldnn.install @@ -0,0 +1,2 @@ +/usr/lib/*/libcpu_extension.so +/usr/lib/*/libMKLDNNPlugin.so diff --git a/debian/libinference-engine.install b/debian/libinference-engine.install index a6474f3..48df406 100644 --- a/debian/libinference-engine.install +++ b/debian/libinference-engine.install @@ -1,2 +1,6 @@ -/usr/lib/*/*.so /usr/lib/*/*.xml +/usr/lib/*/libHeteroPlugin.so +/usr/lib/*/libmock_engine.so +/usr/lib/*/libinference_engine.so +/usr/lib/*/libmyriadPlugin.so +/usr/lib/*/libformat_reader.so diff --git a/debian/rules b/debian/rules index 867d56f..83901c2 100755 --- a/debian/rules +++ b/debian/rules @@ -17,6 +17,12 @@ DATADIR := $(PREFIX)/share DEBVERS := $(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p') VERSION := $(shell echo '$(DEBVERS)' | sed -e 's/^[[:digit:]]*://' -e 's/[~-].*//') +ifneq ($(filter $(DEB_HOST_ARCH),amd64),) +ENABLE_MKL_DNN=ON +else +ENABLE_MKL_DNN=OFF +endif + %: dh $@ --with quilt --parallel @@ -41,6 +47,7 @@ override_dh_auto_configure: -DSHARE_INSTALL_PREFIX:PATH=$(DATADIR) \ -DBUILD_SHARED_LIBS:BOOL=OFF -DBUILD_PKGCONFIG=OFF \ -DENABLE_VPU=ON -DENABLE_MYRIAD=ON -DENABLE_MYRIAD_MVNC_TESTS=OFF -DENABLE_MYRIAD_NO_BOOT=OFF \ + -DENABLE_MKL_DNN=$(ENABLE_MKL_DNN) -DENABLE_GNA=OFF \ -DUSE_TBB_SYSTEM_DEPS=ON -DBUILD_ADE_DOCUMENTATION=OFF -DBUILD_ADE_TUTORIAL=OFF \ -DBUILD_TESTING=OFF -DBUILD_TESTS=OFF \ -DCLDNN__INCLUDE_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=Release -DCOVERAGE=OFF \ @@ -48,8 +55,8 @@ override_dh_auto_configure: -DENABLE_AFFINITY_GENERATOR=OFF -DENABLE_ALTERNATIVE_TEMP=OFF -DENABLE_CLDNN=OFF \ -DENABLE_CLDNN_BUILD=OFF -DENABLE_CLDNN_TESTS=OFF -DENABLE_CPPCHECK=OFF -DENABLE_CPPLINT=OFF \ -DENABLE_CPPLINT_REPORT=OFF -DENABLE_CPP_CCT=OFF -DENABLE_DEBUG_SYMBOLS=OFF \ - -DENABLE_FUZZING=OFF -DENABLE_GAPI_TESTS=OFF -DENABLE_GNA=OFF -DENABLE_LTO=OFF \ - -DENABLE_MKL_DNN=OFF -DENABLE_OBJECT_DETECTION_TESTS=ON -DENABLE_OPENCV=OFF -DENABLE_PLUGIN_RPATH=OFF \ + -DENABLE_FUZZING=OFF -DENABLE_GAPI_TESTS=OFF -DENABLE_LTO=OFF \ + -DENABLE_OBJECT_DETECTION_TESTS=ON -DENABLE_OPENCV=OFF -DENABLE_PLUGIN_RPATH=OFF \ -DENABLE_PROFILING_ITT=OFF -DENABLE_PROFILING_RAW=OFF -DENABLE_PYTHON=OFF -DENABLE_ROCKHOPER=OFF \ -DENABLE_SAMPLES=OFF -DENABLE_SAMPLES_CORE=OFF -DENABLE_SEGMENTATION_TESTS=OFF -DENABLE_TESTS=ON \ -DTREAT_WARNING_AS_ERROR=OFF @@ -71,6 +78,9 @@ override_dh_auto_install: sed -i 's|@LIB_INSTALL_DIR@|$(PREFIX)/$(LIBDIR)|g' debian/tmp$(PREFIX)/$(LIBDIR)/pkgconfig/libinference-engine.pc.in sed -i 's|@INCLUDE_INSTALL_DIR@|$(PREFIX)/$(INCDIR)|g' debian/tmp$(PREFIX)/$(LIBDIR)/pkgconfig/libinference-engine.pc.in mv debian/tmp$(PREFIX)/$(LIBDIR)/pkgconfig/libinference-engine.pc.in debian/tmp$(PREFIX)/$(LIBDIR)/pkgconfig/libinference-engine.pc +ifneq ($(filter $(DEB_HOST_ARCH),amd64),) + cp -r $(SRC_ROOT)/inference-engine/src/extension/ext_list.hpp $(SRC_ROOT)/debian/tmp$(PREFIX)/$(INCDIR) +endif override_dh_auto_clean: dh_auto_clean --builddirectory=$(SRC_ROOT)/inference-engine/build --