From 1dcb3127aba938d911ce10083fa2ee1b216c6a3d Mon Sep 17 00:00:00 2001
From: =?utf8?q?=EC=98=A4=ED=98=95=EC=84=9D/=EB=8F=99=EC=9E=91=EC=A0=9C?=
 =?utf8?q?=EC=96=B4Lab=28SR=29/Staff=20Engineer/=EC=82=BC=EC=84=B1?=
 =?utf8?q?=EC=A0=84=EC=9E=90?= <hseok82.oh@samsung.com>
Date: Fri, 7 Sep 2018 13:01:00 +0900
Subject: [PATCH] Revise framework test list (#2636)

- Change directory structure: test/{tflite op name}/{testname}
- Add new framework tests to support more operators
- Update test list for neurun and benchmark_op

Signed-off-by: Hyeongseok Oh <hseok82.oh@samsung.com>
---
 .../{inceptionv3 => MODELS}/inception_module/config.sh  |  0
 .../{inceptionv3 => MODELS}/inception_nonslim/config.sh |  0
 .../{inceptionv3 => MODELS}/inception_slim/config.sh    |  0
 tests/framework/tests/{ => MODELS}/mobilenet/config.sh  |  0
 .../tests/{ => average_pool_2d}/avgpool1/config.sh      |  0
 .../tests/{ => average_pool_2d}/avgpool2/config.sh      |  0
 tests/framework/tests/concat/2D/config.sh               |  3 +++
 tests/framework/tests/{ => concat}/concat1/config.sh    |  0
 tests/framework/tests/{ => concat}/concat2/config.sh    |  0
 .../tests/{ => conv_2d}/convolution1/config.sh          |  0
 .../tests/{ => conv_2d}/convolution2/config.sh          |  0
 .../tests/{ => depthwise_conv_2d}/depthconv1/config.sh  |  0
 .../tests/{ => depthwise_conv_2d}/depthconv2/config.sh  |  0
 tests/framework/tests/embedding_lookup/config.sh        |  3 +++
 tests/framework/tests/floor/floor1/config.sh            |  2 ++
 tests/framework/tests/floor/floor2/config.sh            |  2 ++
 .../framework/tests/fullyconnected/{ => fc1}/config.sh  |  0
 .../tests/{mul => fullyconnected}/matmul2x2/config.sh   |  0
 tests/framework/tests/hashtable_lookup/config.sh        |  3 +++
 tests/framework/tests/l2_normalization/config.sh        |  3 +++
 .../framework/tests/{l2pool2d => l2_pool_2d}/config.sh  |  0
 .../tests/{ => max_pool_2d}/maxpool1/config.sh          |  0
 .../tests/{ => max_pool_2d}/maxpool2/config.sh          |  0
 tests/framework/tests/pad/4D_2D/config.sh               |  2 ++
 tests/framework/tests/pad/pad1/config.sh                |  3 +++
 tests/framework/tests/pad/pad2/config.sh                |  3 +++
 tests/framework/tests/reduce_mean/test1/config.sh       |  4 ++++
 tests/framework/tests/reduce_mean/test2/config.sh       |  4 ++++
 tests/framework/tests/reshape/3D/config.sh              |  2 ++
 tests/framework/tests/{ => reshape}/reshape1/config.sh  |  0
 tests/framework/tests/{ => reshape}/reshape2/config.sh  |  0
 tests/framework/tests/rnn/config.sh                     |  3 +++
 tests/framework/tests/space_to_depth/config.sh          |  2 ++
 tests/framework/tests/squeeze/config.sh                 |  3 +++
 tests/framework/tests/{topkv2 => topk_v2}/config.sh     |  0
 tests/framework/tests/tranpose/config.sh                |  3 +++
 tools/test_driver/benchmark_op_list.txt                 | 14 +++++++-------
 tools/test_driver/neurun_frameworktest_list.txt         | 17 +++++++++--------
 38 files changed, 61 insertions(+), 15 deletions(-)
 rename tests/framework/tests/{inceptionv3 => MODELS}/inception_module/config.sh (100%)
 rename tests/framework/tests/{inceptionv3 => MODELS}/inception_nonslim/config.sh (100%)
 rename tests/framework/tests/{inceptionv3 => MODELS}/inception_slim/config.sh (100%)
 rename tests/framework/tests/{ => MODELS}/mobilenet/config.sh (100%)
 rename tests/framework/tests/{ => average_pool_2d}/avgpool1/config.sh (100%)
 rename tests/framework/tests/{ => average_pool_2d}/avgpool2/config.sh (100%)
 create mode 100644 tests/framework/tests/concat/2D/config.sh
 rename tests/framework/tests/{ => concat}/concat1/config.sh (100%)
 rename tests/framework/tests/{ => concat}/concat2/config.sh (100%)
 rename tests/framework/tests/{ => conv_2d}/convolution1/config.sh (100%)
 rename tests/framework/tests/{ => conv_2d}/convolution2/config.sh (100%)
 rename tests/framework/tests/{ => depthwise_conv_2d}/depthconv1/config.sh (100%)
 rename tests/framework/tests/{ => depthwise_conv_2d}/depthconv2/config.sh (100%)
 create mode 100644 tests/framework/tests/embedding_lookup/config.sh
 create mode 100644 tests/framework/tests/floor/floor1/config.sh
 create mode 100644 tests/framework/tests/floor/floor2/config.sh
 rename tests/framework/tests/fullyconnected/{ => fc1}/config.sh (100%)
 rename tests/framework/tests/{mul => fullyconnected}/matmul2x2/config.sh (100%)
 create mode 100644 tests/framework/tests/hashtable_lookup/config.sh
 create mode 100644 tests/framework/tests/l2_normalization/config.sh
 rename tests/framework/tests/{l2pool2d => l2_pool_2d}/config.sh (100%)
 rename tests/framework/tests/{ => max_pool_2d}/maxpool1/config.sh (100%)
 rename tests/framework/tests/{ => max_pool_2d}/maxpool2/config.sh (100%)
 create mode 100644 tests/framework/tests/pad/4D_2D/config.sh
 create mode 100644 tests/framework/tests/pad/pad1/config.sh
 create mode 100644 tests/framework/tests/pad/pad2/config.sh
 create mode 100644 tests/framework/tests/reduce_mean/test1/config.sh
 create mode 100644 tests/framework/tests/reduce_mean/test2/config.sh
 create mode 100644 tests/framework/tests/reshape/3D/config.sh
 rename tests/framework/tests/{ => reshape}/reshape1/config.sh (100%)
 rename tests/framework/tests/{ => reshape}/reshape2/config.sh (100%)
 create mode 100644 tests/framework/tests/rnn/config.sh
 create mode 100644 tests/framework/tests/space_to_depth/config.sh
 create mode 100644 tests/framework/tests/squeeze/config.sh
 rename tests/framework/tests/{topkv2 => topk_v2}/config.sh (100%)
 create mode 100644 tests/framework/tests/tranpose/config.sh

diff --git a/tests/framework/tests/inceptionv3/inception_module/config.sh b/tests/framework/tests/MODELS/inception_module/config.sh
similarity index 100%
rename from tests/framework/tests/inceptionv3/inception_module/config.sh
rename to tests/framework/tests/MODELS/inception_module/config.sh
diff --git a/tests/framework/tests/inceptionv3/inception_nonslim/config.sh b/tests/framework/tests/MODELS/inception_nonslim/config.sh
similarity index 100%
rename from tests/framework/tests/inceptionv3/inception_nonslim/config.sh
rename to tests/framework/tests/MODELS/inception_nonslim/config.sh
diff --git a/tests/framework/tests/inceptionv3/inception_slim/config.sh b/tests/framework/tests/MODELS/inception_slim/config.sh
similarity index 100%
rename from tests/framework/tests/inceptionv3/inception_slim/config.sh
rename to tests/framework/tests/MODELS/inception_slim/config.sh
diff --git a/tests/framework/tests/mobilenet/config.sh b/tests/framework/tests/MODELS/mobilenet/config.sh
similarity index 100%
rename from tests/framework/tests/mobilenet/config.sh
rename to tests/framework/tests/MODELS/mobilenet/config.sh
diff --git a/tests/framework/tests/avgpool1/config.sh b/tests/framework/tests/average_pool_2d/avgpool1/config.sh
similarity index 100%
rename from tests/framework/tests/avgpool1/config.sh
rename to tests/framework/tests/average_pool_2d/avgpool1/config.sh
diff --git a/tests/framework/tests/avgpool2/config.sh b/tests/framework/tests/average_pool_2d/avgpool2/config.sh
similarity index 100%
rename from tests/framework/tests/avgpool2/config.sh
rename to tests/framework/tests/average_pool_2d/avgpool2/config.sh
diff --git a/tests/framework/tests/concat/2D/config.sh b/tests/framework/tests/concat/2D/config.sh
new file mode 100644
index 0000000..f36c498
--- /dev/null
+++ b/tests/framework/tests/concat/2D/config.sh
@@ -0,0 +1,3 @@
+MODELFILE_SERVER="http://npuarchive.mooo.com/archive/nnfw/nn_framework_test"
+MODELFILE_NAME="concat_test_2d.tflite"
+STATUS="disabled"
diff --git a/tests/framework/tests/concat1/config.sh b/tests/framework/tests/concat/concat1/config.sh
similarity index 100%
rename from tests/framework/tests/concat1/config.sh
rename to tests/framework/tests/concat/concat1/config.sh
diff --git a/tests/framework/tests/concat2/config.sh b/tests/framework/tests/concat/concat2/config.sh
similarity index 100%
rename from tests/framework/tests/concat2/config.sh
rename to tests/framework/tests/concat/concat2/config.sh
diff --git a/tests/framework/tests/convolution1/config.sh b/tests/framework/tests/conv_2d/convolution1/config.sh
similarity index 100%
rename from tests/framework/tests/convolution1/config.sh
rename to tests/framework/tests/conv_2d/convolution1/config.sh
diff --git a/tests/framework/tests/convolution2/config.sh b/tests/framework/tests/conv_2d/convolution2/config.sh
similarity index 100%
rename from tests/framework/tests/convolution2/config.sh
rename to tests/framework/tests/conv_2d/convolution2/config.sh
diff --git a/tests/framework/tests/depthconv1/config.sh b/tests/framework/tests/depthwise_conv_2d/depthconv1/config.sh
similarity index 100%
rename from tests/framework/tests/depthconv1/config.sh
rename to tests/framework/tests/depthwise_conv_2d/depthconv1/config.sh
diff --git a/tests/framework/tests/depthconv2/config.sh b/tests/framework/tests/depthwise_conv_2d/depthconv2/config.sh
similarity index 100%
rename from tests/framework/tests/depthconv2/config.sh
rename to tests/framework/tests/depthwise_conv_2d/depthconv2/config.sh
diff --git a/tests/framework/tests/embedding_lookup/config.sh b/tests/framework/tests/embedding_lookup/config.sh
new file mode 100644
index 0000000..935fdc5
--- /dev/null
+++ b/tests/framework/tests/embedding_lookup/config.sh
@@ -0,0 +1,3 @@
+MODELFILE_SERVER="http://npuarchive.mooo.com/archive/nnfw/nn_framework_test"
+MODELFILE_NAME="embedding_lookup_test1.tflite"
+STATUS="disabled"
diff --git a/tests/framework/tests/floor/floor1/config.sh b/tests/framework/tests/floor/floor1/config.sh
new file mode 100644
index 0000000..acb1e0c
--- /dev/null
+++ b/tests/framework/tests/floor/floor1/config.sh
@@ -0,0 +1,2 @@
+MODELFILE_SERVER="http://npuarchive.mooo.com/archive/nnfw/nn_framework_test"
+MODELFILE_NAME="floor_4d_4d_test.tflite"
diff --git a/tests/framework/tests/floor/floor2/config.sh b/tests/framework/tests/floor/floor2/config.sh
new file mode 100644
index 0000000..48c3320
--- /dev/null
+++ b/tests/framework/tests/floor/floor2/config.sh
@@ -0,0 +1,2 @@
+MODELFILE_SERVER="http://npuarchive.mooo.com/archive/nnfw/nn_framework_test"
+MODELFILE_NAME="floor_test_4d.tflite"
diff --git a/tests/framework/tests/fullyconnected/config.sh b/tests/framework/tests/fullyconnected/fc1/config.sh
similarity index 100%
rename from tests/framework/tests/fullyconnected/config.sh
rename to tests/framework/tests/fullyconnected/fc1/config.sh
diff --git a/tests/framework/tests/mul/matmul2x2/config.sh b/tests/framework/tests/fullyconnected/matmul2x2/config.sh
similarity index 100%
rename from tests/framework/tests/mul/matmul2x2/config.sh
rename to tests/framework/tests/fullyconnected/matmul2x2/config.sh
diff --git a/tests/framework/tests/hashtable_lookup/config.sh b/tests/framework/tests/hashtable_lookup/config.sh
new file mode 100644
index 0000000..dbb2a94
--- /dev/null
+++ b/tests/framework/tests/hashtable_lookup/config.sh
@@ -0,0 +1,3 @@
+MODELFILE_SERVER="http://npuarchive.mooo.com/archive/nnfw/nn_framework_test"
+MODELFILE_NAME="hashtable_lookup_test1.tflite"
+STATUS="disabled"
diff --git a/tests/framework/tests/l2_normalization/config.sh b/tests/framework/tests/l2_normalization/config.sh
new file mode 100644
index 0000000..8c15e73
--- /dev/null
+++ b/tests/framework/tests/l2_normalization/config.sh
@@ -0,0 +1,3 @@
+MODELFILE_SERVER="http://npuarchive.mooo.com/archive/nnfw/nn_framework_test"
+MODELFILE_NAME="l2_normalization_test1.tflite"
+STATUS="disabled"
diff --git a/tests/framework/tests/l2pool2d/config.sh b/tests/framework/tests/l2_pool_2d/config.sh
similarity index 100%
rename from tests/framework/tests/l2pool2d/config.sh
rename to tests/framework/tests/l2_pool_2d/config.sh
diff --git a/tests/framework/tests/maxpool1/config.sh b/tests/framework/tests/max_pool_2d/maxpool1/config.sh
similarity index 100%
rename from tests/framework/tests/maxpool1/config.sh
rename to tests/framework/tests/max_pool_2d/maxpool1/config.sh
diff --git a/tests/framework/tests/maxpool2/config.sh b/tests/framework/tests/max_pool_2d/maxpool2/config.sh
similarity index 100%
rename from tests/framework/tests/maxpool2/config.sh
rename to tests/framework/tests/max_pool_2d/maxpool2/config.sh
diff --git a/tests/framework/tests/pad/4D_2D/config.sh b/tests/framework/tests/pad/4D_2D/config.sh
new file mode 100644
index 0000000..36f50ca
--- /dev/null
+++ b/tests/framework/tests/pad/4D_2D/config.sh
@@ -0,0 +1,2 @@
+MODELFILE_SERVER="http://npuarchive.mooo.com/archive/nnfw/nn_framework_test"
+MODELFILE_NAME="pad_4d_2d_test.tflite"
diff --git a/tests/framework/tests/pad/pad1/config.sh b/tests/framework/tests/pad/pad1/config.sh
new file mode 100644
index 0000000..fa38736
--- /dev/null
+++ b/tests/framework/tests/pad/pad1/config.sh
@@ -0,0 +1,3 @@
+MODELFILE_SERVER="http://npuarchive.mooo.com/archive/nnfw/nn_framework_test"
+MODELFILE_NAME="pad_test.tflite"
+STATUS="disabled"
diff --git a/tests/framework/tests/pad/pad2/config.sh b/tests/framework/tests/pad/pad2/config.sh
new file mode 100644
index 0000000..be10289
--- /dev/null
+++ b/tests/framework/tests/pad/pad2/config.sh
@@ -0,0 +1,3 @@
+MODELFILE_SERVER="http://npuarchive.mooo.com/archive/nnfw/nn_framework_test"
+MODELFILE_NAME="pad_test2.tflite"
+STATUS="disabled"
diff --git a/tests/framework/tests/reduce_mean/test1/config.sh b/tests/framework/tests/reduce_mean/test1/config.sh
new file mode 100644
index 0000000..9f63cb8
--- /dev/null
+++ b/tests/framework/tests/reduce_mean/test1/config.sh
@@ -0,0 +1,4 @@
+# REDUCE_MEAN is supported after tensorflow 1.10
+MODELFILE_SERVER="http://npuarchive.mooo.com/archive/nnfw/nn_framework_test"
+MODELFILE_NAME="reduce_mean_test.tflite"
+STATUS="disabled"
diff --git a/tests/framework/tests/reduce_mean/test2/config.sh b/tests/framework/tests/reduce_mean/test2/config.sh
new file mode 100644
index 0000000..e5259ce
--- /dev/null
+++ b/tests/framework/tests/reduce_mean/test2/config.sh
@@ -0,0 +1,4 @@
+# REDUCE_MEAN is supported after tensorflow 1.10
+MODELFILE_SERVER="http://npuarchive.mooo.com/archive/nnfw/nn_framework_test"
+MODELFILE_NAME="reduce_mean_test_2.tflite"
+STATUS="disabled"
diff --git a/tests/framework/tests/reshape/3D/config.sh b/tests/framework/tests/reshape/3D/config.sh
new file mode 100644
index 0000000..709983b
--- /dev/null
+++ b/tests/framework/tests/reshape/3D/config.sh
@@ -0,0 +1,2 @@
+MODELFILE_SERVER="http://npuarchive.mooo.com/archive/nnfw/nn_framework_test"
+MODELFILE_NAME="reshape_test_3d.tflite"
diff --git a/tests/framework/tests/reshape1/config.sh b/tests/framework/tests/reshape/reshape1/config.sh
similarity index 100%
rename from tests/framework/tests/reshape1/config.sh
rename to tests/framework/tests/reshape/reshape1/config.sh
diff --git a/tests/framework/tests/reshape2/config.sh b/tests/framework/tests/reshape/reshape2/config.sh
similarity index 100%
rename from tests/framework/tests/reshape2/config.sh
rename to tests/framework/tests/reshape/reshape2/config.sh
diff --git a/tests/framework/tests/rnn/config.sh b/tests/framework/tests/rnn/config.sh
new file mode 100644
index 0000000..8643cd1
--- /dev/null
+++ b/tests/framework/tests/rnn/config.sh
@@ -0,0 +1,3 @@
+MODELFILE_SERVER="http://npuarchive.mooo.com/archive/nnfw/nn_framework_test"
+MODELFILE_NAME="rnn_basic_test1.tflite"
+STATUS="disabled"
diff --git a/tests/framework/tests/space_to_depth/config.sh b/tests/framework/tests/space_to_depth/config.sh
new file mode 100644
index 0000000..0e4e9a6
--- /dev/null
+++ b/tests/framework/tests/space_to_depth/config.sh
@@ -0,0 +1,2 @@
+MODELFILE_SERVER="http://npuarchive.mooo.com/archive/nnfw/nn_framework_test"
+MODELFILE_NAME="space_to_depth_test1.tflite"
diff --git a/tests/framework/tests/squeeze/config.sh b/tests/framework/tests/squeeze/config.sh
new file mode 100644
index 0000000..3bd01b4
--- /dev/null
+++ b/tests/framework/tests/squeeze/config.sh
@@ -0,0 +1,3 @@
+MODELFILE_SERVER="http://npuarchive.mooo.com/archive/nnfw/nn_framework_test"
+MODELFILE_NAME="squeeze_test.tflite"
+STATUS="disabled"
diff --git a/tests/framework/tests/topkv2/config.sh b/tests/framework/tests/topk_v2/config.sh
similarity index 100%
rename from tests/framework/tests/topkv2/config.sh
rename to tests/framework/tests/topk_v2/config.sh
diff --git a/tests/framework/tests/tranpose/config.sh b/tests/framework/tests/tranpose/config.sh
new file mode 100644
index 0000000..64abdea
--- /dev/null
+++ b/tests/framework/tests/tranpose/config.sh
@@ -0,0 +1,3 @@
+MODELFILE_SERVER="http://npuarchive.mooo.com/archive/nnfw/nn_framework_test"
+MODELFILE_NAME="transpose_4d.tflite"
+STATUS="disabled"
diff --git a/tools/test_driver/benchmark_op_list.txt b/tools/test_driver/benchmark_op_list.txt
index 3672bac..166ddb7 100644
--- a/tools/test_driver/benchmark_op_list.txt
+++ b/tools/test_driver/benchmark_op_list.txt
@@ -1,11 +1,11 @@
 add/4D
-avgpool1
-avgpool2
-concat1
-convolution1
-convolution2
+average_pool_2d/avgpool1
+average_pool_2d/avgpool1
+concat/concat1
+conv_2d/convolution1
+conv_2d/convolution2
 div/broadcast
-maxpool1
-maxpool2
+max_pool_2d/maxpool1
+max_pool_2d/maxpool2
 resize_bilinear
 softmax
diff --git a/tools/test_driver/neurun_frameworktest_list.txt b/tools/test_driver/neurun_frameworktest_list.txt
index ecc5f67..b97558b 100644
--- a/tools/test_driver/neurun_frameworktest_list.txt
+++ b/tools/test_driver/neurun_frameworktest_list.txt
@@ -1,9 +1,10 @@
-avgpool1
-avgpool2
-convolution1
-convolution2
-maxpool1
-maxpool2
+average_pool_2d/avgpool1
+average_pool_2d/avgpool1
+conv_2d/convolution1
+conv_2d/convolution2
+max_pool_2d/maxpool1
+max_pool_2d/maxpool2
 softmax
-reshape1
-inceptionv3
+reshape/reshape1
+MODELS/inception_nonslim
+MODELS/inception_slim
-- 
2.7.4