From: Dongju Chae Date: Mon, 23 Aug 2021 06:48:24 +0000 (+0900) Subject: [Docs] Update npu-engine version info X-Git-Tag: submit/tizen/20220103.094045~30 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=246b311cbdb8fb8e6abef2bb89e74dd74d25aad0;p=platform%2Fadaptation%2Fnpu%2Ftrix-engine.git [Docs] Update npu-engine version info This patch updates npu-engine version info. - npu-engine: v2.4.0 - testdata: v2.3.8 Signed-off-by: Dongju Chae --- diff --git a/docs/markdown/Artifactory.md b/docs/markdown/Artifactory.md index 8061f0d..f69dfdb 100644 --- a/docs/markdown/Artifactory.md +++ b/docs/markdown/Artifactory.md @@ -32,5 +32,5 @@ libmrpsim.a libmrpsim.so libnpu-engine.so pkgconfig $ ls /opt/trinity/bin apptests unittests $ ls /opt/trinity/share/npu-engine/testdata -TRIV221_8TOPS TRIV235_2TOPS +TRIV221_8TOPS TRIV238_2TOPS ``` diff --git a/docs/markdown/CommandLine.md b/docs/markdown/CommandLine.md index 098efdc..791cfac 100644 --- a/docs/markdown/CommandLine.md +++ b/docs/markdown/CommandLine.md @@ -37,6 +37,6 @@ Let's assume you are testing the application in Ubuntu 18.04. ```console $ sudo apt-get install npu-engine-example npu-engine-testdata $ cd /opt/trinity -$ ./bin/apptests/apptest_tvn_triv2_example share/npu-engine/testdata/TRIV235_2TOPS/MOBILENET_V1 +$ ./bin/apptests/apptest_tvn_triv2_example share/npu-engine/testdata/TRIV238_2TOPS/MOBILENET_V1 ... ``` diff --git a/docs/markdown/DBusApp.md b/docs/markdown/DBusApp.md index 1abac74..8eaffc1 100644 --- a/docs/markdown/DBusApp.md +++ b/docs/markdown/DBusApp.md @@ -48,7 +48,7 @@ sr.odl.NPUManager.conf sh-3.2# /usr/bin/dbus-daemon --system --nopidfile --syslog-only sh-3.2# /usr/lib64/npu-engine/bin/apptests/npumgr/dummy_npumgr sh-3.2# /usr/lib64/npu-engine/bin/apptests/npumgr/apptest_npumgr \ - /usr/share/npu-engine/testdata/TRIV235_2TOPS/MOBILENET_V1 + /usr/share/npu-engine/testdata/TRIV238_2TOPS/MOBILENET_V1 [ 25.222285] triv2 30410000.triv2: Execution Cycles: 114545 [APPTEST] /usr/lib64/npu-engine/bin/apptests/npumgr/apptest_npumgr: PASSED ``` diff --git a/docs/markdown/Debugging.md b/docs/markdown/Debugging.md index b68cfcc..9995e59 100644 --- a/docs/markdown/Debugging.md +++ b/docs/markdown/Debugging.md @@ -46,7 +46,7 @@ Please refer to the example program in [here](https://github.sec.samsung.net/AIP ```console $ cd /opt/trinity/ -$ ./bin/apptests/apptest_tvn_triv2_profile share/npu-engine/testdata/TRIV235_2TOPS/CONV_2D_300 +$ ./bin/apptests/apptest_tvn_triv2_profile share/npu-engine/testdata/TRIV238_2TOPS/CONV_2D_300 ... Total System Cycles : 22551 Dram Input Footprint (KB) : 36 diff --git a/docs/markdown/FastModels.md b/docs/markdown/FastModels.md index 45017c6..47d637e 100644 --- a/docs/markdown/FastModels.md +++ b/docs/markdown/FastModels.md @@ -166,7 +166,7 @@ libnpu-engine.a libnpu-engine.so sh-3.2# ls /usr/lib64/npu-engine/bin apptests unittests sh-3.2# ls /usr/share/npu-engine/testdata -TRIV221_8TOPS TRIV235_2TOPS +TRIV221_8TOPS TRIV238_2TOPS ``` ### Termination @@ -225,8 +225,8 @@ $ gbs build -A aarch64 --clean If the build has finished successfully, you should find the built packages like below. ```console $ ls ~/GBS-ROOT/local/repos/tizen/aarch64/RPMS/ -npu-engine-2.3.15-1.aarch64.rpm npu-engine-example-2.3.15-1.aarch64.rpm -npu-engine-devel-2.3.15-1.aarch64.rpm npu-engine-utils-2.3.15-1.aarch64.rpm +npu-engine-2.4.0-1.aarch64.rpm npu-engine-example-2.4.0-1.aarch64.rpm +npu-engine-devel-2.4.0-1.aarch64.rpm npu-engine-utils-2.4.0-1.aarch64.rpm ``` ## Library Linking diff --git a/docs/markdown/QuickStart.md b/docs/markdown/QuickStart.md index 43d73a8..5776ae2 100644 --- a/docs/markdown/QuickStart.md +++ b/docs/markdown/QuickStart.md @@ -29,10 +29,10 @@ The default installation paths are as follows: - `npu-engine-testdata`: `/opt/trinity/share/npu-engine/testdata` ```console -root# ls /opt/trinity/share/npu-engine/testdata/TRIV235_2TOPS/MOBILENET_V1 +root# ls /opt/trinity/share/npu-engine/testdata/TRIV238_2TOPS/MOBILENET_V1 input_fmap_0.bin model.tvn output_fmap_0.bin -root# apptest_tvn_triv2 /opt/trinity/share/npu-engine/testdata/TRIV235_2TOPS/MOBILENET_V1 +root# apptest_tvn_triv2 /opt/trinity/share/npu-engine/testdata/TRIV238_2TOPS/MOBILENET_V1 >>> Initializaing SPM with zero. It can be time-consuming... >>> Initializaing SPM with zero. It can be time-consuming... [Core Name: NPCore0], [File Name: /opt/trinity/share/mRPsim/decoder-triv2-cp.bin], [Ver: 1] diff --git a/docs/markdown/TestingGuide.md b/docs/markdown/TestingGuide.md index 7129bee..5918350 100644 --- a/docs/markdown/TestingGuide.md +++ b/docs/markdown/TestingGuide.md @@ -26,7 +26,7 @@ Then, you can change the source repository of `NPU_SystemService` to yours if th $ cd meta-trinity $ ls build conf COPYING.MIT hw README.md recipes-app recipes-bsp recipes-ddk recipes-devtools recipes-kernel -$ vim recipes-ddk/npu-engine/npu-engine_2.3.15.bb +$ vim recipes-ddk/npu-engine/npu-engine_2.4.0.bb [ ... ] SRC_URI = "git://git@github.sec.samsung.net/AIP/NPU_SystemService.git;protocol=ssh;branch=tizen" [ ... ] @@ -40,27 +40,27 @@ Once you build the patelinux project, packages are created on your local build d [ ... ] $ petalinux-build $ ls build/tmp/deploy/rpm/aarch64 | grep npu-engine -npu-engine-2.3.15-r0.aarch64.rpm -npu-engine-testcases-2.3.15-r0.aarch64.rpm +npu-engine-2.4.0-r0.aarch64.rpm +npu-engine-testcases-2.4.0-r0.aarch64.rpm ``` As our FPGA board supports `ssh` connection, the created packages can be simply copied. ``` $ cd build/tmp/deploy/rpm/aarch64/ -$ scp npu-engine-2.3.15-r0.aarch64.rpm root@[FPGA IP Address]:. -$ scp npu-engine-2.3.15-testcases-r0.aarch64.rpm root@[FPGA IP Address]:. +$ scp npu-engine-2.4.0-r0.aarch64.rpm root@[FPGA IP Address]:. +$ scp npu-engine-2.4.0-testcases-r0.aarch64.rpm root@[FPGA IP Address]:. ``` Then, you can install them using `rpm` command in the FPGA board. ``` $ ssh root@[FPGA IP Address] [ ... ] -# rpm -ivh npu-engine-2.3.15-r0.aarch64.rpm --force +# rpm -ivh npu-engine-2.4.0-r0.aarch64.rpm --force # ls -al /usr/lib/libnpu-engine.so rwxr-xr-x 1 root root 210872 May 28 05:27 /usr/lib/libnpu-engine.so -# rpm -ivh npu-engine-testcases-2.3.15-r0.aarch64.rpm --force +# rpm -ivh npu-engine-testcases-2.4.0-r0.aarch64.rpm --force # ls -al /usr/lib/npu-engine/bin/ drwxr-xr-x 2 root root 4096 May 28 05:24 apptests drwxr-xr-x 2 root root 4096 May 28 05:24 unittests @@ -161,9 +161,8 @@ drwxr-xr-x 5 root root 4096 May 28 05:27 .. -rwxr-xr-x 1 root root 38984 May 28 05:27 apptest_tvn_triv2_xml ``` -They may use test models stored in `/home/root/TRIV235_2TOPS` if necessary. -- `TRIV235_2TOPS/NHWC`: test models with NHWC format -- `TRIV235_2TOPS/TRIV2`: test models with TRIV2 format +They may use test models stored in `/home/root/TRIV238_2TOPS` if necessary. +- `TRIV238_2TOPS`: TRIV v2.3.8 (2-TOPS) test models with NHWC format Programs in `apptests` are linked to `libnpu-engine.so` and may require extra arguments. The below shows example command lines for each apptest. @@ -187,22 +186,19 @@ Options: -h Show help messages [APPTEST] apptest_tvn_triv2: SKIPPED -# apptest_tvn_triv2 TRIV235_2TOPS/NHWC/MOBILENET_V1 +# apptest_tvn_triv2 TRIV238_2TOPS/MOBILENET_V1 [APPTEST] apptest_tvn_triv2: PASSED -# apptest_tvn_triv2_bulk TRIV235_2TOPS/NHWC +# apptest_tvn_triv2_bulk TRIV238_2TOPS [APPTEST] apptest_tvn_triv2_bulk: PASSED (98), FAILED (0) -# apptest_tvn_triv2_bulk TRIV235_2TOPS/TRIV2 -t -[APPTEST] apptest_tvn_triv2_bulk: PASSED (98), FAILED (0) - -# apptest_tvn_triv2_dmabuf TRIV235_2TOPS/TRIV2/MOBILENET_V1 +# apptest_tvn_triv2_dmabuf TRIV238_2TOPS/MOBILENET_V1 [APPTEST] apptest_tvn_triv2_dmabuf: PASSED -# apptest_tvn_triv2_preempt TRIV235_2TOPS/NHWC +# apptest_tvn_triv2_preempt TRIV238_2TOPS [APPTEST] apptest_tvn_triv2_preempt: PASSED -# apptest_tvn_triv2_profile TRIV235_2TOPS/NHWC/MOBILENET_V1 -p visa +# apptest_tvn_triv2_profile TRIV238_2TOPS/MOBILENET_V1 -p visa [ ... ] [622] ADMA_IN Running Cycles : 477 @@ -221,7 +217,7 @@ Options: vISA Exec Seq : 23537 [APPTEST] apptest_tvn_triv2_profile: PASSED -# apptest_tvn_triv2_profile TRIV235_2TOPS/NHWC/MOBILENET_V1 -p layer +# apptest_tvn_triv2_profile TRIV238_2TOPS/MOBILENET_V1 -p layer [ ... ] [30] conv_dw_13_relu/Relu6 Running Cycles : 3005 @@ -245,10 +241,10 @@ Options: # cat model.xml - TRIV235_2TOPS/NHWC/MOBILENET_V1 + TRIV238_2TOPS/MOBILENET_V1 - TRIV235_2TOPS/NHWC/MOBILENET_V2 + TRIV238_2TOPS/MOBILENET_V2 # apptest_tvn_triv2_xml model.xml diff --git a/docs/markdown/TizenSample.md b/docs/markdown/TizenSample.md index cf7919b..6b3e128 100644 --- a/docs/markdown/TizenSample.md +++ b/docs/markdown/TizenSample.md @@ -30,9 +30,9 @@ List of devices attached emulator-26101 device m-0405-1 $ ls -1 RPMS libmrpsim-3.8.71-0.i686.rpm -nnstreamer-trix-engine-2.3.16-0.i686.rpm -npu-engine-2.3.16-0.i686.rpm -npu-engine-utils-2.3.16-0.i686.rpm +nnstreamer-trix-engine-2.4.0-0.i686.rpm +npu-engine-2.4.0-0.i686.rpm +npu-engine-utils-2.4.0-0.i686.rpm $ bash install.sh ... ``` diff --git a/docs/markdown/Ubuntu.md b/docs/markdown/Ubuntu.md index 0ca559a..8213ee4 100644 --- a/docs/markdown/Ubuntu.md +++ b/docs/markdown/Ubuntu.md @@ -31,13 +31,13 @@ $ debuild -us -uc If the build has finished successfully, you should find the built packages like below. ```console $ ls ../*.deb -../npu-engine_2.3.15_amd64.deb ../npu-engine-example_2.3.15_amd64.deb -../npu-engine-dev_2.3.15_amd64.deb ../npu-engine-utils_2.3.15_amd64.deb +../npu-engine_2.4.0_amd64.deb ../npu-engine-example_2.4.0_amd64.deb +../npu-engine-dev_2.4.0_amd64.deb ../npu-engine-utils_2.4.0_amd64.deb ``` Then, install your packages manually. ```console -$ dpkg -i ../npu-engine_2.3.15_amd64.deb +$ dpkg -i ../npu-engine_2.4.0_amd64.deb $ ls /opt/trinity/lib libnpu-engine.so ```