[Fix] Use v2.3.8 models for testing

This patch uses v2.3.8 models for testing.

Signed-off-by: Dongju Chae <dongju.chae@samsung.com>

diff --git a/.github/workflows/pr-checker-ubuntu.yml b/.github/workflows/pr-checker-ubuntu.yml
index 4334ed23123cec4abdf795254b8a9bc0f2dc0a0a..1c9b54f517591c69e0a5ace17a8b233f9ca7cfd4 100644 (file)
--- a/.github/workflows/pr-checker-ubuntu.yml
+++ b/.github/workflows/pr-checker-ubuntu.yml
@@ -40,7 +40,7 @@ jobs:
           dpkg -i ../npu-engine*.deb
       - name: Check reference models
         run: |
-          apptest_tvn_triv2_bulk /opt/trinity/share/npu-engine/testdata/TRIV235_2TOPS
+          apptest_tvn_triv2_bulk /opt/trinity/share/npu-engine/testdata/TRIV238_2TOPS
           apptest_tvn_triv2_bulk /opt/trinity/share/npu-engine/testdata/TRIV221_8TOPS -t
 
   build-focal:
@@ -71,5 +71,5 @@ jobs:
           dpkg -i ../npu-engine*.deb
       - name: Check reference models
         run: |
-          apptest_tvn_triv2_bulk /opt/trinity/share/npu-engine/testdata/TRIV235_2TOPS
+          apptest_tvn_triv2_bulk /opt/trinity/share/npu-engine/testdata/TRIV238_2TOPS
           apptest_tvn_triv2_bulk /opt/trinity/share/npu-engine/testdata/TRIV221_8TOPS -t

diff --git a/plugins/npumgr/dummy/sr.odl.NPUManager.conf b/plugins/npumgr/dummy/sr.odl.NPUManager.conf
index c8a5675ee3ad2690bd6722af8a385f50d53edcc6..f8c126f0e0e400225115b824dc59e24dd6f5f711 100644 (file)
--- a/plugins/npumgr/dummy/sr.odl.NPUManager.conf
+++ b/plugins/npumgr/dummy/sr.odl.NPUManager.conf
@@ -9,7 +9,7 @@
   Example command line for testing:
   $ /usr/lib64/npu-engine/bin/apptests/npumgr/dummy_npumgr
   $ /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
 -->
 
 <busconfig>

diff --git a/tests/apptests/tvn_triv2_xml.cc b/tests/apptests/tvn_triv2_xml.cc
index 0f9d8ef2be601bf38346395f089ef5d5ae04f927..fc884ec0c01d76faedf064546ba05a3027f5a8a2 100644 (file)
--- a/tests/apptests/tvn_triv2_xml.cc
+++ b/tests/apptests/tvn_triv2_xml.cc
@@ -17,10 +17,10 @@
  *
  * <testcases>
  *  <model name="mobilenet_v1" timeout="3000" priority="1">
- *   <dirpath>/usr/share/npu-engine/testdata/TRIV235_2TOPS/MOBILENET_V1</dirpath>
+ *   <dirpath>/usr/share/npu-engine/testdata/TRIV238_2TOPS/MOBILENET_V1</dirpath>
  *  </model>
  *  <model name="mobilenet_v2" timeout="1000" priority="2">
- *   <dirpath>/usr/share/npu-engine/testdata/TRIV235_2TOPS/MOBILENET_V2</dirpath>
+ *   <dirpath>/usr/share/npu-engine/testdata/TRIV238_2TOPS/MOBILENET_V2</dirpath>
  *  </model>
  *  ...
  * </testcases>

diff --git a/tests/plugins/nnstreamer/nnstreamer_test.cc b/tests/plugins/nnstreamer/nnstreamer_test.cc
index 366195c82b400767f2bb65e367a71f4f4d2a6e41..7e43ce5190be509f19e923eb3a7babdfe57ee023 100644 (file)
--- a/tests/plugins/nnstreamer/nnstreamer_test.cc
+++ b/tests/plugins/nnstreamer/nnstreamer_test.cc
@@ -65,7 +65,7 @@ make_pipeline_srnpu (srnpu_model model) {
   const gchar *input_dim = input_dims[model];
   const gchar *output_dim = output_dims[model];
   gchar *model_path =
-      g_strdup_printf ("%s/testdata/TRIV235_2TOPS/%s", NE_DATADIR, model_names[model]);
+      g_strdup_printf ("%s/testdata/TRIV238_2TOPS/%s", NE_DATADIR, model_names[model]);
   gchar *pipeline = g_strdup_printf (
       "filesrc location=%s/input_fmap_0.bin blocksize=-1 ! "
       "application/octet-stream "

diff --git a/tests/unittests/ne_libnpuhost_test.cc b/tests/unittests/ne_libnpuhost_test.cc
index 1c1bb781b9e9eff14cbf71d7e515177a825c4e73..4d8bd85af73e754b5d013671dbdf478a52f452c3 100644 (file)
--- a/tests/unittests/ne_libnpuhost_test.cc
+++ b/tests/unittests/ne_libnpuhost_test.cc
@@ -21,7 +21,7 @@
 #include <ne_test_utils.h>
 #include <ne_test_utils_gtest.h>
 
-#define BASIC_TEST_MODEL NE_DATADIR "/testdata/TRIV235_2TOPS/CONV_2D_000"
+#define BASIC_TEST_MODEL NE_DATADIR "/testdata/TRIV238_2TOPS/CONV_2D_000"
 
 /**
  * @brief test primitives supported in libnpuhost

diff --git a/utils/coverage/coverage.sh b/utils/coverage/coverage.sh
index 04fc0d9502579caed0c65bf7d1a41d92e4d28755..3853e1c25c0641ed62f2b8d39f7a865f45ab0a45 100755 (executable)
--- a/utils/coverage/coverage.sh
+++ b/utils/coverage/coverage.sh
@@ -54,8 +54,8 @@ popd
 # 2-2. With valid arguments for some apptests
 mkdir -p sample_models
 
-cp -rf ${INSTALL_PREFIX}/share/npu-engine/testdata/TRIV235_2TOPS/CONV* sample_models/
-cp -rf ${INSTALL_PREFIX}/share/npu-engine/testdata/TRIV235_2TOPS/TANH_300 sample_models/
+cp -rf ${INSTALL_PREFIX}/share/npu-engine/testdata/TRIV238_2TOPS/CONV* sample_models/
+cp -rf ${INSTALL_PREFIX}/share/npu-engine/testdata/TRIV238_2TOPS/TANH_300 sample_models/
 
 ./tests/apptests/apptest_tvn_triv2_bulk sample_models > /dev/null
 ./tests/apptests/apptest_tvn_triv2_dmabuf sample_models/CONV_2D_300 > /dev/null