projects / platform / adaptation / npu / trix-engine.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c857149)
[tests] change to use TRIV 2.4.3 model
authorYelin Jeong <yelini.jeong@samsung.com>
Fri, 4 Aug 2023 02:04:10 +0000 (11:04 +0900)
committer추지호/SoC Architecture팀(SR)/삼성전자 <jiho.chu@samsung.com>
Mon, 7 Aug 2023 01:45:23 +0000 (10:45 +0900)
The latest libmrpsim package does not work well in TRIV242/LOGISTIC_000
So for using latest libmrpsim with npu-engine, now the default test path is TRIV243

Signed-off-by: Yelin Jeong <yelini.jeong@samsung.com>
tests/apptests/meson.build patch | blob | history
tests/utils/ne_test_utils.cc patch | blob | history
utils/resource/model_24.xml patch | blob | history
utils/trinity_test/check.sh patch | blob | history
utils/trinity_test/model.xml patch | blob | history

diff --git a/tests/apptests/meson.build b/tests/apptests/meson.build
index 53b22cfdeb98c62f73d73c8f9279a95ea726419c..22293a26c98c3f1120c5962f95eddede0d96cd3e 100644 (file)
--- a/tests/apptests/meson.build
+++ b/tests/apptests/meson.build
@@ -175,19 +175,19 @@ test('apptest_tvn_triv23_profile', apptest_tvn_triv2_profile, env: testenv, args
 test('apptest_tvn_triv23_dmabuf', apptest_tvn_triv2_dmabuf, env: testenv, args: [ join_paths(ne_datadir, 'testdata/TRIV238_2TOPS/CONV_2D_300') , '-v', '2.3'], timeout : 100, suite: ['fast-test'])
 test('apptest_tvn_triv23_xml', apptest_tvn_triv2_xml, env: testenv, args: [join_paths(meson.source_root(), 'utils/resource/model_23.xml'), '-v', '2.3'], timeout: 100, suite: ['fast-test'])
 
-test('apptest_tvn_triv23_bulk', apptest_tvn_triv2_bulk, env: testenv, args: [ join_paths(ne_datadir, 'testdata/TRIV238_2TOPS'), '-v', '2.3' ], timeout: 2000)
+test('apptest_tvn_triv23_bulk', apptest_tvn_triv2_bulk, env: testenv, args: [ join_paths(ne_datadir, 'testdata/TRIV238_2TOPS'), '-v', '2.3' ], timeout: 2500)
 
 # Test TRIV 2.4
 
-test('apptest_tvn_triv24', apptest_tvn_triv2, env: testenv, args: [ join_paths(ne_datadir, 'testdata/TRIV242/CONV_2D_300'), '-v', '2.4' ], timeout: 100, suite: ['fast-test'])
-test('apptest_tvn_triv24_interleave', apptest_tvn_triv2_interleave, env: testenv, args: [ '10', join_paths(ne_datadir, 'testdata/TRIV242/MAX_POOL_2D_000')+','+join_paths(ne_datadir, 'testdata/TRIV242/CONV_2D_300'), '2.4' ], suite: ['fast-test'])
-test('apptest_tvn_triv24_sigkill', apptest_tvn_triv2_sigkill, env: testenv, args: [ join_paths(ne_datadir, 'testdata/TRIV242/MOBILENET_V1'), '-v', '2.4' ], timeout : 200, suite: ['fast-test'])
-test('apptest_tvn_triv24_aging_0', apptest_tvn_triv2_aging, env: testenv, args: [ join_paths(ne_datadir, 'testdata/TRIV242/CONV_2D_300'), '1', '10', '-v', '2.4'], suite: ['fast-test'])
-test('apptest_tvn_triv24_aging_1', apptest_tvn_triv2_aging, env: testenv, args: [ join_paths(ne_datadir, 'testdata/TRIV242/CONV_2D_300'), '2', '10', '-v', '2.4'], suite: ['fast-test'])
-test('apptest_tvn_triv24_aging_2', apptest_tvn_triv2_aging, env: testenv, args: [ join_paths(ne_datadir, 'testdata/TRIV242/CONV_2D_300'), '3', '10', '-v', '2.4'], suite: ['fast-test'])
-test('apptest_tvn_triv24_aging_3', apptest_tvn_triv2_aging, env: testenv, args: [ join_paths(ne_datadir, 'testdata/TRIV242/CONV_2D_300'), '4', '10', '-v', '2.4'], suite: ['fast-test'])
-test('apptest_tvn_triv24_profile', apptest_tvn_triv2_profile, env: testenv, args: [ join_paths(ne_datadir, 'testdata/TRIV242/MOBILENET_V1'), '-p', 'visa', '-v', '2.4'], timeout: 100, suite: ['fast-test'])
-test('apptest_tvn_triv24_dmabuf', apptest_tvn_triv2_dmabuf, env: testenv, args: [ join_paths(ne_datadir, 'testdata/TRIV242/CONV_2D_300'), '-v', '2.4'], timeout : 100, suite: ['fast-test'])
+test('apptest_tvn_triv24', apptest_tvn_triv2, env: testenv, args: [ join_paths(ne_datadir, 'testdata/TRIV243/CONV_2D_300'), '-v', '2.4' ], timeout: 100, suite: ['fast-test'])
+test('apptest_tvn_triv24_interleave', apptest_tvn_triv2_interleave, env: testenv, args: [ '10', join_paths(ne_datadir, 'testdata/TRIV243/MAX_POOL_2D_000')+','+join_paths(ne_datadir, 'testdata/TRIV243/CONV_2D_300'), '2.4' ], suite: ['fast-test'])
+test('apptest_tvn_triv24_sigkill', apptest_tvn_triv2_sigkill, env: testenv, args: [ join_paths(ne_datadir, 'testdata/TRIV243/MOBILENET_V1'), '-v', '2.4' ], timeout : 200, suite: ['fast-test'])
+test('apptest_tvn_triv24_aging_0', apptest_tvn_triv2_aging, env: testenv, args: [ join_paths(ne_datadir, 'testdata/TRIV243/CONV_2D_300'), '1', '10', '-v', '2.4'], suite: ['fast-test'])
+test('apptest_tvn_triv24_aging_1', apptest_tvn_triv2_aging, env: testenv, args: [ join_paths(ne_datadir, 'testdata/TRIV243/CONV_2D_300'), '2', '10', '-v', '2.4'], suite: ['fast-test'])
+test('apptest_tvn_triv24_aging_2', apptest_tvn_triv2_aging, env: testenv, args: [ join_paths(ne_datadir, 'testdata/TRIV243/CONV_2D_300'), '3', '10', '-v', '2.4'], suite: ['fast-test'])
+test('apptest_tvn_triv24_aging_3', apptest_tvn_triv2_aging, env: testenv, args: [ join_paths(ne_datadir, 'testdata/TRIV243/CONV_2D_300'), '4', '10', '-v', '2.4'], suite: ['fast-test'])
+test('apptest_tvn_triv24_profile', apptest_tvn_triv2_profile, env: testenv, args: [ join_paths(ne_datadir, 'testdata/TRIV243/MOBILENET_V1'), '-p', 'visa', '-v', '2.4'], timeout: 100, suite: ['fast-test'])
+test('apptest_tvn_triv24_dmabuf', apptest_tvn_triv2_dmabuf, env: testenv, args: [ join_paths(ne_datadir, 'testdata/TRIV243/CONV_2D_300'), '-v', '2.4'], timeout : 100, suite: ['fast-test'])
 test('apptest_tvn_triv24_xml', apptest_tvn_triv2_xml, env: testenv, args: [join_paths(meson.source_root(), 'utils/resource/model_24.xml'), '-v', '2.4'], timeout: 100, suite: ['fast-test'])
 
-test('apptest_tvn_triv24_bulk', apptest_tvn_triv2_bulk, env: testenv, args: [ join_paths(ne_datadir, 'testdata/TRIV242'), '-v', '2.4'], timeout: 2000)
+test('apptest_tvn_triv24_bulk', apptest_tvn_triv2_bulk, env: testenv, args: [ join_paths(ne_datadir, 'testdata/TRIV243'), '-v', '2.4'], timeout: 2500)
diff --git a/tests/utils/ne_test_utils.cc b/tests/utils/ne_test_utils.cc
index 064aba989375eaba3d198c8d7b5cea336b61cca0..f335f33b39b73274a3be207c79aa8ed2aad3fcc3 100644 (file)
--- a/tests/utils/ne_test_utils.cc
+++ b/tests/utils/ne_test_utils.cc
@@ -911,7 +911,7 @@ UtilTestEnv::set_info () {
     devices_[0] = NPUCOND_TRIV24_CONN_UNKNOWN;
     devices_[1] = NPUCOND_TRIV24_CONN_SOCIP;
     version_ = 0x04020402;
-    model_ = "/testdata/TRIV242/CONV_2D_000";
+    model_ = "/testdata/TRIV243/CONV_2D_000";
     tops_ = 4;
   } else if (strcmp (npu_ver, "2.3") == 0) {
     devices_[0] = NPUCOND_TRIV23_CONN_UNKNOWN;
diff --git a/utils/resource/model_24.xml b/utils/resource/model_24.xml
index c6eeee938353d58fd2524895c91aa2086645f761..7a958747700b1f5e1463c25f150113659874ab70 100644 (file)
--- a/utils/resource/model_24.xml
+++ b/utils/resource/model_24.xml
@@ -1,8 +1,8 @@
 <testcases>
  <model name="mobilenet_v1" timeout="3000" priority="1">
-  <dirpath>/opt/trinity/share/npu-engine/testdata/TRIV242/MOBILENET_V1</dirpath>
+  <dirpath>/opt/trinity/share/npu-engine/testdata/TRIV243/MOBILENET_V1</dirpath>
  </model>
  <model name="mobilenet_v2" timeout="1000" priority="2">
-  <dirpath>/opt/trinity/share/npu-engine/testdata/TRIV242/MOBILENET_V2</dirpath>
+  <dirpath>/opt/trinity/share/npu-engine/testdata/TRIV243/MOBILENET_V2</dirpath>
  </model>
 </testcases>
diff --git a/utils/trinity_test/check.sh b/utils/trinity_test/check.sh
index 667a5a85ac10b230029ea7287540aa1be9377011..51486e2e4767c028fab1ca2c4315810496912147 100755 (executable)
--- a/utils/trinity_test/check.sh
+++ b/utils/trinity_test/check.sh
@@ -5,7 +5,7 @@ RPM_PATH=/mnt/RPMS
 LOG_PATH=/mnt/log
 TEST_PATH=/usr/lib64/npu-engine/bin/
 DEVICE_PATH=/dev/triv2-0
-MODEL_PATH=/usr/share/npu-engine/testdata/TRIV242
+MODEL_PATH=/usr/share/npu-engine/testdata/TRIV243
 
 function check_exit() {
   echo "$1" > ${LOG_PATH}/result.txt
diff --git a/utils/trinity_test/model.xml b/utils/trinity_test/model.xml
index dbd6dd1ccc0b7963caaf32f72b2a23e730cb6dcc..8d43c0fbc9b50107bd9ea52bfe9a357260258259 100644 (file)
--- a/utils/trinity_test/model.xml
+++ b/utils/trinity_test/model.xml
@@ -1,8 +1,8 @@
 <testcases>
  <model name="mobilenet_v1" timeout="3000" priority="1">
-  <dirpath>/usr/share/npu-engine/testdata/TRIV242/MOBILENET_V1</dirpath>
+  <dirpath>/usr/share/npu-engine/testdata/TRIV243/MOBILENET_V1</dirpath>
  </model>
  <model name="mobilenet_v2" timeout="1000" priority="2">
-  <dirpath>/usr/share/npu-engine/testdata/TRIV242/MOBILENET_V2</dirpath>
+  <dirpath>/usr/share/npu-engine/testdata/TRIV243/MOBILENET_V2</dirpath>
  </model>
 </testcases>
Domain: Machine Learning / ML Framework;