[Dist/Debian] Gernerate single layer data for application test

This patch removes the tarball containing pre-build single layer model
data for application data. Instead, those test data is generated at
build time by this patch.

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

diff --git a/debian/control b/debian/control
index a68d5c0..b81ad9d 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,9 @@ Section: libs
 Priority: optional
 Maintainer: MyungJoo Ham <myungjoo.ham@samsung.com>
 Build-Depends: ninja-build, meson (>=0.42), debhelper (>=9),
- gcc-9 | gcc-8 | gcc-7 | gcc-6 | gcc-5, libgtest-dev,
- libdrm-dev, libiniparser-dev, pkg-config, cmake, linux-fvp-headers, libnpuvision-dev
+ gcc-9 | gcc-8 | gcc-7 | gcc-6 | gcc-5, libgtest-dev, python,
+ libdrm-dev, libiniparser-dev, pkg-config, cmake, linux-fvp-headers,
+ libnpuvision-dev, libnpuvision-testdata, npu-decoder-testdata
 Standards-Version: 3.8.2
 Homepage: https://research.samsung.com
 

diff --git a/debian/libnpuengine-example.install b/debian/libnpuengine-example.install
index b5139b3..0fcfba0 100644 (file)
--- a/debian/libnpuengine-example.install
+++ b/debian/libnpuengine-example.install
@@ -1,2 +1,2 @@
 /opt/trinity/bin/*
-/opt/trinity/share/npu-engine/testdata/*
+/opt/trinity/share/npu-engine/testdata/multi.tar.gz

diff --git a/debian/rules b/debian/rules
index 5612a95..c9dc481 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -43,8 +43,14 @@ override_dh_auto_test:
        ./build/src/test/apptests/apptest_dmabuf_model
        ./build/src/test/apptests/apptest_dmabuf_buffers
        ./build/src/test/apptests/apptest_async_callbacks
+       # Gen model binaries
+       mkdir -p $(CURDIR)/single
+       find /opt/trinity/share/npuvision/testdata/* -type d -exec basename {} \; |\
+                       xargs -I{} mkdir -p single/{}
+       find /opt/trinity/share/npuvision/testdata/* -type d -exec basename {} \; |\
+                       xargs -I{} $(ROOT_DIR)/tools/gen-testdata/model_gen.py -s -o single/{} \
+                       /opt/trinity/share/npuvision/testdata/{}
        # single/multi-layer model test
-       tar zxf tools/gen-testdata/single.tar.gz
        tar zxf tools/gen-testdata/multi.tar.gz
        ./build/src/test/apptests/apptest_example_visa single
        ./build/src/test/apptests/apptest_example_visa multi

diff --git a/tools/gen-testdata/meson.build b/tools/gen-testdata/meson.build
index 1c77664..0f00c43 100644 (file)
--- a/tools/gen-testdata/meson.build
+++ b/tools/gen-testdata/meson.build
@@ -11,6 +11,6 @@ if get_option('enable_npu_emul') and npuvision_dep.found()
       install_dir : ne_bindir)
 endif
 
-testdata_archives = ['single.tar.gz', 'multi.tar.gz']
+testdata_archives = ['multi.tar.gz']
 install_data(testdata_archives,
   install_dir : join_paths(ne_datadir, 'testdata'))

diff --git a/tools/gen-testdata/single.tar.gz b/tools/gen-testdata/single.tar.gz
deleted file mode 100644 (file)
index 83a130b..0000000
Binary files a/tools/gen-testdata/single.tar.gz and /dev/null differ