[Dist/Debian] Generate multi-layer data for application test

This patch removes the tarball containing multi-layer data for
application test and makes those data be generated at the build-time.

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

diff --git a/debian/control b/debian/control
index b81ad9d..017efb1 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ 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, python,
  libdrm-dev, libiniparser-dev, pkg-config, cmake, linux-fvp-headers,
- libnpuvision-dev, libnpuvision-testdata, npu-decoder-testdata
+ libnpuvision-dev, libnpuvision-testdata, npu-decoder-testdata, npu-encoder
 Standards-Version: 3.8.2
 Homepage: https://research.samsung.com
 

diff --git a/debian/libnpuengine-example.install b/debian/libnpuengine-example.install
index 0fcfba0..b5139b3 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/multi.tar.gz
+/opt/trinity/share/npu-engine/testdata/*

diff --git a/debian/rules b/debian/rules
index c9dc481..36aface 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -22,6 +22,7 @@ export LC_ALL = C.UTF-8
 
 override_dh_auto_clean:
        rm -rf build
+       rm -rf debian/tmp
 
 override_dh_auto_configure:
        PKG_CONFIG_PATH=${NPU_TRINITY_INSTALL_PREFIX}/lib/pkgconfig meson --buildtype=plain --prefix=$(NPU_TRINITY_INSTALL_PREFIX) --sysconfdir=$(NPU_TRINITY_INSTALL_PREFIX)/etc --libdir=lib --bindir=bin --includedir=include build -Denable_npu_emul=true
@@ -43,21 +44,34 @@ 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
+       # Single-layer test data
        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/{}
+       # Multi-layer test data
+       mkdir -p $(CURDIR)/multi
+       cd multi && $(ROOT_DIR)/build/tools/gen-testdata/gen-testdata
+       find $(CURDIR)/multi -name 'testcase*' -type d -exec basename {} \; | \
+               xargs -I{} ${NPU_TRINITY_INSTALL_PREFIX}/bin/encoder multi/{}/program.asm multi/{}/program.bin
+       find $(CURDIR)/multi -name 'testcase*' -type d -exec basename {} \; |\
+               xargs -I{} $(ROOT_DIR)/tools/gen-testdata/model_gen.py multi/{}
+       find $(CURDIR)/multi -type f -regextype posix-basic -regex '.*[0-9]\.bin' -delete
+       find $(CURDIR)/multi -type f -name program.* -delete
+
        # single/multi-layer model test
-       tar zxf tools/gen-testdata/multi.tar.gz
        ./build/src/test/apptests/apptest_example_visa single
        ./build/src/test/apptests/apptest_example_visa multi
-       rm -rf single multi
 
 override_dh_auto_install:
        DESTDIR=$(CURDIR)/debian/tmp ninja -C build install
+       mkdir -p debian/tmp/${NPU_TRINITY_INSTALL_PREFIX}/share/npu-engine/testdata
+       mv single debian/tmp/${NPU_TRINITY_INSTALL_PREFIX}/share/npu-engine/testdata
+       mv multi debian/tmp/${NPU_TRINITY_INSTALL_PREFIX}/share/npu-engine/testdata
 
 override_dh_install:
        dh_install --sourcedir=debian/tmp --list-missing

diff --git a/tools/gen-testdata/meson.build b/tools/gen-testdata/meson.build
index 136a668..8086925 100644 (file)
--- a/tools/gen-testdata/meson.build
+++ b/tools/gen-testdata/meson.build
@@ -3,12 +3,4 @@
 gen_testdata_tool = executable('gen-testdata',
     'testdata_gen.cpp',
     dependencies : dependency('libnpuvision'),
-    install : true,
-    install_dir : ne_bindir)
-
-install_data('model_gen.py',
-    install_dir : ne_bindir)
-
-testdata_archives = ['multi.tar.gz']
-install_data(testdata_archives,
-  install_dir : join_paths(ne_datadir, 'testdata'))
+    install : false)

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