Move script for generate test (#5578)

Move script in externals/nnapi_test_generator to generate nnapi gtest
Update gitignore - remove deprecated directory

Signed-off-by: Hyeongseok Oh <hseok82.oh@samsung.com>

diff --git a/.gitignore b/.gitignore
index 178769d..4ffabc5 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -102,8 +102,6 @@ GRTAGS
 
 # Generated tests
 /tests/nnapi/src/generated
-/tests/runtime/neural_networks_test/generated
-/runtimes/tests/neural_networks_test/generated
 
 # Coverage
 /gcov

diff --git a/externals/nnapi_test_generator/README.md b/tests/nnapi/nnapi_test_generator/README.md
similarity index 79%
rename from externals/nnapi_test_generator/README.md
rename to tests/nnapi/nnapi_test_generator/README.md
index 37d3af0..469e467 100644 (file)
--- a/externals/nnapi_test_generator/README.md
+++ b/tests/nnapi/nnapi_test_generator/README.md
@@ -5,7 +5,7 @@ _nnapi test generator_ aims at generating NN public C API tests.
 To generate tests, run the following command.
 
 ```
-$ runtimes/tests/neural_networks_test/specs/generate_test.sh
+$ tests/nnapi/specs/generate_test.sh
 ```
 
 Original code is at https://android.googlesource.com/platform/frameworks/ml/+/efd22b6.

diff --git a/externals/nnapi_test_generator/include/TestHarness.h b/tests/nnapi/nnapi_test_generator/include/TestHarness.h
similarity index 100%
rename from externals/nnapi_test_generator/include/TestHarness.h
rename to tests/nnapi/nnapi_test_generator/include/TestHarness.h

diff --git a/externals/nnapi_test_generator/slicing.py b/tests/nnapi/nnapi_test_generator/slicing.py
similarity index 100%
rename from externals/nnapi_test_generator/slicing.py
rename to tests/nnapi/nnapi_test_generator/slicing.py

diff --git a/externals/nnapi_test_generator/test_generator.py b/tests/nnapi/nnapi_test_generator/test_generator.py
similarity index 100%
rename from externals/nnapi_test_generator/test_generator.py
rename to tests/nnapi/nnapi_test_generator/test_generator.py

diff --git a/externals/nnapi_test_generator/tests/P_conv/conv_1_h3_w2_SAME.mod.py b/tests/nnapi/nnapi_test_generator/tests/P_conv/conv_1_h3_w2_SAME.mod.py
similarity index 100%
rename from externals/nnapi_test_generator/tests/P_conv/conv_1_h3_w2_SAME.mod.py
rename to tests/nnapi/nnapi_test_generator/tests/P_conv/conv_1_h3_w2_SAME.mod.py

diff --git a/externals/nnapi_test_generator/tests/P_weird/stderr.txt.expect b/tests/nnapi/nnapi_test_generator/tests/P_conv/stderr.txt.expect
similarity index 100%
rename from externals/nnapi_test_generator/tests/P_weird/stderr.txt.expect
rename to tests/nnapi/nnapi_test_generator/tests/P_conv/stderr.txt.expect

diff --git a/externals/nnapi_test_generator/tests/P_conv/stdout.txt.expect b/tests/nnapi/nnapi_test_generator/tests/P_conv/stdout.txt.expect
similarity index 100%
rename from externals/nnapi_test_generator/tests/P_conv/stdout.txt.expect
rename to tests/nnapi/nnapi_test_generator/tests/P_conv/stdout.txt.expect

diff --git a/externals/nnapi_test_generator/tests/P_depthwise_conv/depthwise_conv.bin.mod.py b/tests/nnapi/nnapi_test_generator/tests/P_depthwise_conv/depthwise_conv.bin.mod.py
similarity index 100%
rename from externals/nnapi_test_generator/tests/P_depthwise_conv/depthwise_conv.bin.mod.py
rename to tests/nnapi/nnapi_test_generator/tests/P_depthwise_conv/depthwise_conv.bin.mod.py

diff --git a/externals/nnapi_test_generator/tests/P_quantized_conv/stderr.txt.expect b/tests/nnapi/nnapi_test_generator/tests/P_depthwise_conv/stderr.txt.expect
similarity index 100%
rename from externals/nnapi_test_generator/tests/P_quantized_conv/stderr.txt.expect
rename to tests/nnapi/nnapi_test_generator/tests/P_depthwise_conv/stderr.txt.expect

diff --git a/externals/nnapi_test_generator/tests/P_depthwise_conv/stdout.txt.expect b/tests/nnapi/nnapi_test_generator/tests/P_depthwise_conv/stdout.txt.expect
similarity index 100%
rename from externals/nnapi_test_generator/tests/P_depthwise_conv/stdout.txt.expect
rename to tests/nnapi/nnapi_test_generator/tests/P_depthwise_conv/stdout.txt.expect

diff --git a/externals/nnapi_test_generator/tests/P_explicit/explicit_add.mod.py b/tests/nnapi/nnapi_test_generator/tests/P_explicit/explicit_add.mod.py
similarity index 100%
rename from externals/nnapi_test_generator/tests/P_explicit/explicit_add.mod.py
rename to tests/nnapi/nnapi_test_generator/tests/P_explicit/explicit_add.mod.py

diff --git a/externals/nnapi_test_generator/tests/P_quantized_avgpool/stderr.txt.expect b/tests/nnapi/nnapi_test_generator/tests/P_explicit/stderr.txt.expect
similarity index 100%
rename from externals/nnapi_test_generator/tests/P_quantized_avgpool/stderr.txt.expect
rename to tests/nnapi/nnapi_test_generator/tests/P_explicit/stderr.txt.expect

diff --git a/externals/nnapi_test_generator/tests/P_explicit/stdout.txt.expect b/tests/nnapi/nnapi_test_generator/tests/P_explicit/stdout.txt.expect
similarity index 100%
rename from externals/nnapi_test_generator/tests/P_explicit/stdout.txt.expect
rename to tests/nnapi/nnapi_test_generator/tests/P_explicit/stdout.txt.expect

diff --git a/externals/nnapi_test_generator/tests/P_float/addfloat.mod.py b/tests/nnapi/nnapi_test_generator/tests/P_float/addfloat.mod.py
similarity index 100%
rename from externals/nnapi_test_generator/tests/P_float/addfloat.mod.py
rename to tests/nnapi/nnapi_test_generator/tests/P_float/addfloat.mod.py

diff --git a/externals/nnapi_test_generator/tests/P_lstm/stderr.txt.expect b/tests/nnapi/nnapi_test_generator/tests/P_float/stderr.txt.expect
similarity index 100%
rename from externals/nnapi_test_generator/tests/P_lstm/stderr.txt.expect
rename to tests/nnapi/nnapi_test_generator/tests/P_float/stderr.txt.expect

diff --git a/externals/nnapi_test_generator/tests/P_float/stdout.txt.expect b/tests/nnapi/nnapi_test_generator/tests/P_float/stdout.txt.expect
similarity index 100%
rename from externals/nnapi_test_generator/tests/P_float/stdout.txt.expect
rename to tests/nnapi/nnapi_test_generator/tests/P_float/stdout.txt.expect

diff --git a/externals/nnapi_test_generator/tests/P_full/addfloat.mod.py b/tests/nnapi/nnapi_test_generator/tests/P_full/addfloat.mod.py
similarity index 100%
rename from externals/nnapi_test_generator/tests/P_full/addfloat.mod.py
rename to tests/nnapi/nnapi_test_generator/tests/P_full/addfloat.mod.py

diff --git a/externals/nnapi_test_generator/tests/P_full/stderr.txt.expect b/tests/nnapi/nnapi_test_generator/tests/P_full/stderr.txt.expect
similarity index 100%
rename from externals/nnapi_test_generator/tests/P_full/stderr.txt.expect
rename to tests/nnapi/nnapi_test_generator/tests/P_full/stderr.txt.expect

diff --git a/externals/nnapi_test_generator/tests/P_full/stdout.txt.expect b/tests/nnapi/nnapi_test_generator/tests/P_full/stdout.txt.expect
similarity index 100%
rename from externals/nnapi_test_generator/tests/P_full/stdout.txt.expect
rename to tests/nnapi/nnapi_test_generator/tests/P_full/stdout.txt.expect

diff --git a/externals/nnapi_test_generator/tests/P_lstm/lstm.mod.py b/tests/nnapi/nnapi_test_generator/tests/P_lstm/lstm.mod.py
similarity index 100%
rename from externals/nnapi_test_generator/tests/P_lstm/lstm.mod.py
rename to tests/nnapi/nnapi_test_generator/tests/P_lstm/lstm.mod.py

diff --git a/externals/nnapi_test_generator/tests/P_float/stderr.txt.expect b/tests/nnapi/nnapi_test_generator/tests/P_lstm/stderr.txt.expect
similarity index 100%
rename from externals/nnapi_test_generator/tests/P_float/stderr.txt.expect
rename to tests/nnapi/nnapi_test_generator/tests/P_lstm/stderr.txt.expect

diff --git a/externals/nnapi_test_generator/tests/P_lstm/stdout.txt.expect b/tests/nnapi/nnapi_test_generator/tests/P_lstm/stdout.txt.expect
similarity index 100%
rename from externals/nnapi_test_generator/tests/P_lstm/stdout.txt.expect
rename to tests/nnapi/nnapi_test_generator/tests/P_lstm/stdout.txt.expect

diff --git a/externals/nnapi_test_generator/tests/P_quantized_avgpool/averpoolfloat.mod.py b/tests/nnapi/nnapi_test_generator/tests/P_quantized_avgpool/averpoolfloat.mod.py
similarity index 100%
rename from externals/nnapi_test_generator/tests/P_quantized_avgpool/averpoolfloat.mod.py
rename to tests/nnapi/nnapi_test_generator/tests/P_quantized_avgpool/averpoolfloat.mod.py

diff --git a/externals/nnapi_test_generator/tests/P_explicit/stderr.txt.expect b/tests/nnapi/nnapi_test_generator/tests/P_quantized_avgpool/stderr.txt.expect
similarity index 100%
rename from externals/nnapi_test_generator/tests/P_explicit/stderr.txt.expect
rename to tests/nnapi/nnapi_test_generator/tests/P_quantized_avgpool/stderr.txt.expect

diff --git a/externals/nnapi_test_generator/tests/P_quantized_avgpool/stdout.txt.expect b/tests/nnapi/nnapi_test_generator/tests/P_quantized_avgpool/stdout.txt.expect
similarity index 100%
rename from externals/nnapi_test_generator/tests/P_quantized_avgpool/stdout.txt.expect
rename to tests/nnapi/nnapi_test_generator/tests/P_quantized_avgpool/stdout.txt.expect

diff --git a/externals/nnapi_test_generator/tests/P_quantized_conv/quantized.mod.py b/tests/nnapi/nnapi_test_generator/tests/P_quantized_conv/quantized.mod.py
similarity index 100%
rename from externals/nnapi_test_generator/tests/P_quantized_conv/quantized.mod.py
rename to tests/nnapi/nnapi_test_generator/tests/P_quantized_conv/quantized.mod.py

diff --git a/externals/nnapi_test_generator/tests/P_depthwise_conv/stderr.txt.expect b/tests/nnapi/nnapi_test_generator/tests/P_quantized_conv/stderr.txt.expect
similarity index 100%
rename from externals/nnapi_test_generator/tests/P_depthwise_conv/stderr.txt.expect
rename to tests/nnapi/nnapi_test_generator/tests/P_quantized_conv/stderr.txt.expect

diff --git a/externals/nnapi_test_generator/tests/P_quantized_conv/stdout.txt.expect b/tests/nnapi/nnapi_test_generator/tests/P_quantized_conv/stdout.txt.expect
similarity index 100%
rename from externals/nnapi_test_generator/tests/P_quantized_conv/stdout.txt.expect
rename to tests/nnapi/nnapi_test_generator/tests/P_quantized_conv/stdout.txt.expect

diff --git a/externals/nnapi_test_generator/tests/P_vts_operands/stderr.txt.expect b/tests/nnapi/nnapi_test_generator/tests/P_vts_full/stderr.txt.expect
similarity index 100%
rename from externals/nnapi_test_generator/tests/P_vts_operands/stderr.txt.expect
rename to tests/nnapi/nnapi_test_generator/tests/P_vts_full/stderr.txt.expect

diff --git a/externals/nnapi_test_generator/tests/P_vts_full/stdout.txt.expect b/tests/nnapi/nnapi_test_generator/tests/P_vts_full/stdout.txt.expect
similarity index 100%
rename from externals/nnapi_test_generator/tests/P_vts_full/stdout.txt.expect
rename to tests/nnapi/nnapi_test_generator/tests/P_vts_full/stdout.txt.expect

diff --git a/externals/nnapi_test_generator/tests/P_vts_full/vts_full.mod.py b/tests/nnapi/nnapi_test_generator/tests/P_vts_full/vts_full.mod.py
similarity index 100%
rename from externals/nnapi_test_generator/tests/P_vts_full/vts_full.mod.py
rename to tests/nnapi/nnapi_test_generator/tests/P_vts_full/vts_full.mod.py

diff --git a/externals/nnapi_test_generator/tests/P_vts_operands/addfloat.mod.py b/tests/nnapi/nnapi_test_generator/tests/P_vts_operands/addfloat.mod.py
similarity index 100%
rename from externals/nnapi_test_generator/tests/P_vts_operands/addfloat.mod.py
rename to tests/nnapi/nnapi_test_generator/tests/P_vts_operands/addfloat.mod.py

diff --git a/externals/nnapi_test_generator/tests/P_vts_full/stderr.txt.expect b/tests/nnapi/nnapi_test_generator/tests/P_vts_operands/stderr.txt.expect
similarity index 100%
rename from externals/nnapi_test_generator/tests/P_vts_full/stderr.txt.expect
rename to tests/nnapi/nnapi_test_generator/tests/P_vts_operands/stderr.txt.expect

diff --git a/externals/nnapi_test_generator/tests/P_vts_operands/stdout.txt.expect b/tests/nnapi/nnapi_test_generator/tests/P_vts_operands/stdout.txt.expect
similarity index 100%
rename from externals/nnapi_test_generator/tests/P_vts_operands/stdout.txt.expect
rename to tests/nnapi/nnapi_test_generator/tests/P_vts_operands/stdout.txt.expect

diff --git a/externals/nnapi_test_generator/tests/P_conv/stderr.txt.expect b/tests/nnapi/nnapi_test_generator/tests/P_weird/stderr.txt.expect
similarity index 100%
rename from externals/nnapi_test_generator/tests/P_conv/stderr.txt.expect
rename to tests/nnapi/nnapi_test_generator/tests/P_weird/stderr.txt.expect

diff --git a/externals/nnapi_test_generator/tests/P_weird/stdout.txt.expect b/tests/nnapi/nnapi_test_generator/tests/P_weird/stdout.txt.expect
similarity index 100%
rename from externals/nnapi_test_generator/tests/P_weird/stdout.txt.expect
rename to tests/nnapi/nnapi_test_generator/tests/P_weird/stdout.txt.expect

diff --git a/externals/nnapi_test_generator/tests/P_weird/weird_add.mod.py b/tests/nnapi/nnapi_test_generator/tests/P_weird/weird_add.mod.py
similarity index 100%
rename from externals/nnapi_test_generator/tests/P_weird/weird_add.mod.py
rename to tests/nnapi/nnapi_test_generator/tests/P_weird/weird_add.mod.py

diff --git a/externals/nnapi_test_generator/tests/test.py b/tests/nnapi/nnapi_test_generator/tests/test.py
similarity index 100%
rename from externals/nnapi_test_generator/tests/test.py
rename to tests/nnapi/nnapi_test_generator/tests/test.py

diff --git a/externals/nnapi_test_generator/vts_generator.py b/tests/nnapi/nnapi_test_generator/vts_generator.py
similarity index 100%
rename from externals/nnapi_test_generator/vts_generator.py
rename to tests/nnapi/nnapi_test_generator/vts_generator.py

diff --git a/tests/nnapi/specs/generate_test.sh b/tests/nnapi/specs/generate_test.sh
index 2d7e5cc..a002d1e 100755 (executable)
--- a/tests/nnapi/specs/generate_test.sh
+++ b/tests/nnapi/specs/generate_test.sh
@@ -47,7 +47,7 @@ function generate_one_testcase {
   BASENAME=${BASENAME%".mod.py"};
   local EXAMPLE="-e $NNAPI_BASE/$TEST_DIR/src/generated/examples/$BASENAME.example.cpp"
 
-  $NNAPI_BASE/externals/nnapi_test_generator/test_generator.py ./`basename $1`\
+  $NNAPI_BASE/$TEST_DIR/nnapi_test_generator/test_generator.py ./`basename $1`\
     -m $NNAPI_BASE/$TEST_DIR/src/generated/models/$BASENAME.model.cpp $EXAMPLE
   ret=$?
   # Paste these lines into TestGenerated.cpp