From: MyungJoo Ham Date: Wed, 20 Jul 2022 07:43:41 +0000 (+0900) Subject: debian: nnfw and tf-1 is now optional. X-Git-Tag: accepted/tizen/unified/20220811.135951~13 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5ba03705cb21a988551e56b83630edf950d43c22;p=platform%2Fupstream%2Fnnstreamer.git debian: nnfw and tf-1 is now optional. We are (temporarily?) dropping nnfw and tensorflow-1 support from Ubuntu 22.04. Make dependencies to nnfw, tf-1 optional in Debian build scripts. Signed-off-by: MyungJoo Ham --- diff --git a/debian/control b/debian/control index 4c12cb1..62f7b3a 100644 --- a/debian/control +++ b/debian/control @@ -11,11 +11,11 @@ Build-Depends: gcc-9 | gcc-8 | gcc-7 | gcc-6 | gcc-5 (>=5.4), libflatbuffers-dev, flatbuffers-compiler, protobuf-compiler (>=3.12), libprotobuf-dev [amd64 arm64 armhf], libpaho-mqtt-dev, - tensorflow2-lite-dev, tensorflow-lite-dev, - tensorflow-dev [amd64], + tensorflow2-lite-dev, tensorflow-lite-dev | gcc, + tensorflow-dev [amd64] | gcc, pytorch, libedgetpu1-std (>=12), libedgetpu-dev (>=12), openvino-dev, openvino-cpu-mkldnn [amd64], - nnfw-dev [amd64], + nnfw-dev [amd64] | gcc, tvm-runtime-dev Standards-Version: 3.9.6 Homepage: https://github.com/nnstreamer/nnstreamer diff --git a/debian/control.ubuntu.ppa b/debian/control.ubuntu.ppa index b2c631d..beacf1c 100644 --- a/debian/control.ubuntu.ppa +++ b/debian/control.ubuntu.ppa @@ -8,12 +8,13 @@ Build-Depends: gcc-9 | gcc-8 | gcc-7 | gcc-6 | gcc-5 (>=5.4), gstreamer1.0-tools, gstreamer1.0-plugins-base, gstreamer1.0-plugins-good, libgtest-dev, ssat, libpng-dev, libopencv-dev, liborc-0.4-dev, python, python3, python3-dev, python3-numpy, - nnfw-dev [amd64], - tensorflow-lite-dev, pytorch, libedgetpu1-std (>=12), libedgetpu-dev (>=12), - tensorflow2-lite-dev, + nnfw-dev [amd64] | gcc, + tensorflow2-lite-dev, tensorflow-lite-dev | gcc, + tensorflow-dev [amd64] | gcc, + pytorch, libedgetpu1-std (>=12), libedgetpu-dev (>=12), openvino-dev, openvino-cpu-mkldnn [amd64], libflatbuffers-dev, flatbuffers-compiler, protobuf-compiler (>=3.12), libprotobuf-dev [amd64 arm64 armhf], - tensorflow-dev [amd64], libpaho-mqtt-dev, python2.7-dev, flex, bison, tvm-runtime-dev + libpaho-mqtt-dev, python2.7-dev, flex, bison, tvm-runtime-dev Standards-Version: 3.9.6 Homepage: https://github.com/nnstreamer/nnstreamer diff --git a/debian/rules b/debian/rules index 6dcfdaa..5c0c6e5 100755 --- a/debian/rules +++ b/debian/rules @@ -54,12 +54,16 @@ endif override_dh_auto_build: ninja -C ${BUILDDIR} + # A few modules are not avaiable in Ubuntu 22.04. Don't try to create them if not available. + if [ -f './build/ext/nnstreamer/tensor_filter/libnnstreamer_filter_nnfw.so' ]; then echo "NNFW exists" ; else rm debian/nnstreamer-nnfw.install; fi + if [ -f './build/ext/nnstreamer/tensor_filter/libnnstreamer_filter_tensorflow.so' ]; then echo "Tensorflow exists" ; else rm debian/nnstreamer-tensorflow.install; fi + if [ -f './build/ext/nnstreamer/tensor_filter/libnnstreamer_filter_tensorflow1-lite.so' ]; then echo "Tensorflow1-lite exists" ; else rm debian/nnstreamer-tensorflow-lite.install; fi override_dh_auto_test: ./packaging/run_unittests_binaries.sh ./tests ifeq ($(shell dpkg-vendor --derives-from Ubuntu && echo yes), yes) ifeq ($(DEB_HOST_ARCH), amd64) - ./packaging/run_unittests_binaries.sh ./tests/tizen_nnfw_runtime/unittest_nnfw_runtime_raw + if [ -f './tests/tizen_nnfw_runtime/unittest_nnfw_runtime_raw' ]; then ./packaging/run_unittests_binaries.sh ./tests/tizen_nnfw_runtime/unittest_nnfw_runtime_raw; fi endif cd tests && ssat -n -p=1 && cd .. else