Move test-related codes in tools into tests (#4058)

Move test-related codes in tools into tests
- nnapi_test
- tflite_run
- tflite_benchmark
- tflite_benchmark_model

Update cmake, root makefile, and spec file

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e643a5e..122014d 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -69,8 +69,8 @@ if("${TARGET_OS}" STREQUAL "android")
 
   add_subdirectory(libs)
   add_subdirectory(externals)
-  add_subdirectory(tools/nnapi_test)
-  add_subdirectory(tools/tflite_benchmark)
+  add_subdirectory(tests/tools/nnapi_test)
+  add_subdirectory(tests/tools/tflite_benchmark)
 
   add_subdirectory(runtimes)
 
@@ -79,9 +79,10 @@ else("${TARGET_OS}" STREQUAL "android") # General case (non-android build)
   if(NOT OBS_BUILD)
     add_subdirectory(externals)
     add_subdirectory(tools)
+    add_subdirectory(tests)
   else(NOT OBS_BUILD)
-    add_subdirectory(tools/tflite_benchmark)
-    add_subdirectory(tools/nnapi_test)
+    add_subdirectory(tests/tools/tflite_benchmark)
+    add_subdirectory(tests/tools/nnapi_test)
   endif(NOT OBS_BUILD)
 
   add_subdirectory(contrib)

diff --git a/Makefile b/Makefile
index c4733e1..d484f14 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -211,9 +211,9 @@ test_internal:
 build_test_suite: install_internal
        @echo "packaging test suite"
        @rm -rf $(INSTALL_ROOT)/test-suite.tar.gz
-       # Workaround for CI test: copy test script to old directory path
+# Workaround for CI test: copy test script to old directory path
        @cp -rf tests/scripts tools/test_driver
-       @tar -zcf test-suite.tar.gz tests/ tools/test_driver $(INSTALL_ALIAS) --dereference
+       @tar -zcf test-suite.tar.gz tests/scripts tests/framework tools/test_driver $(INSTALL_ALIAS) --dereference
        @rm -rf tools/test_driver
        @mv test-suite.tar.gz $(INSTALL_ROOT)/.
 
@@ -221,10 +221,10 @@ build_coverage_suite: install_internal
        @echo "packaging test-coverage suite"
        @rm -rf $(INSTALL_ROOT)/coverage-suite.tar.gz
        @find Product -name "*.gcno" > include_lists.txt
-       # Workaround for CI test: copy test script to old directory path
+# Workaround for CI test: copy test script to old directory path
        @cp -rf tests/scripts tools/test_driver
        @pwd | grep -o '/' | wc -l > tools/test_driver/build_path_depth.txt
-       @tar -zcf coverage-suite.tar.gz tests/ tools/test_driver $(INSTALL_ALIAS) --dereference -T include_lists.txt
+       @tar -zcf coverage-suite.tar.gz tests/scripts tests/framework tools/test_driver $(INSTALL_ALIAS) --dereference -T include_lists.txt
        @rm -rf include_lists.txt tools/test_driver/build_path_depth.txt
        @rm -rf tools/test_driver
        @mv coverage-suite.tar.gz $(INSTALL_ROOT)/.

diff --git a/packaging/nnfw.spec b/packaging/nnfw.spec
index 915c7d3..3649e8e 100644 (file)
--- a/packaging/nnfw.spec
+++ b/packaging/nnfw.spec
@@ -79,7 +79,7 @@ mv %{buildroot}%{_prefix}/bin %{buildroot}%{test_install_prefix}/Product/out
 cp -rf %{buildroot}%{_libdir} %{buildroot}%{test_install_prefix}/Product/out
 rm -rf %{buildroot}%{_libdir}/pureacl
 ## install tests
-cp -rf ./tests %{buildroot}%{test_install_prefix}/.
+cp -rf ./tests/framework %{buildroot}%{test_install_prefix}/framework
 ## install tools
 mkdir -p %{buildroot}%{test_install_prefix}/tools
 cp -rf ./tests/scripts %{buildroot}%{test_install_prefix}/tools

diff --git a/tools/tflite_benchmark_model/.FORMATDENY b/tests/.FORMATCHECKED
similarity index 100%
rename from tools/tflite_benchmark_model/.FORMATDENY
rename to tests/.FORMATCHECKED

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
new file mode 100644 (file)
index 0000000..f7c6b56
--- /dev/null
+++ b/tests/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory(tools)

diff --git a/tests/tools/CMakeLists.txt b/tests/tools/CMakeLists.txt
new file mode 100644 (file)
index 0000000..5ea6cda
--- /dev/null
+++ b/tests/tools/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectories()

diff --git a/tools/nnapi_test/CMakeLists.txt b/tests/tools/nnapi_test/CMakeLists.txt
similarity index 100%
rename from tools/nnapi_test/CMakeLists.txt
rename to tests/tools/nnapi_test/CMakeLists.txt

diff --git a/tools/nnapi_test/src/nnapi_test.cc b/tests/tools/nnapi_test/src/nnapi_test.cc
similarity index 100%
rename from tools/nnapi_test/src/nnapi_test.cc
rename to tests/tools/nnapi_test/src/nnapi_test.cc

diff --git a/tools/tflite_benchmark/CMakeLists.txt b/tests/tools/tflite_benchmark/CMakeLists.txt
similarity index 100%
rename from tools/tflite_benchmark/CMakeLists.txt
rename to tests/tools/tflite_benchmark/CMakeLists.txt

diff --git a/tools/tflite_benchmark/src/tflite_benchmark.cc b/tests/tools/tflite_benchmark/src/tflite_benchmark.cc
similarity index 100%
rename from tools/tflite_benchmark/src/tflite_benchmark.cc
rename to tests/tools/tflite_benchmark/src/tflite_benchmark.cc

diff --git a/tests/tools/tflite_benchmark_model/.FORMATDENY b/tests/tools/tflite_benchmark_model/.FORMATDENY
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tools/tflite_benchmark_model/CMakeLists.txt b/tests/tools/tflite_benchmark_model/CMakeLists.txt
similarity index 100%
rename from tools/tflite_benchmark_model/CMakeLists.txt
rename to tests/tools/tflite_benchmark_model/CMakeLists.txt

diff --git a/tools/tflite_benchmark_model/README.md b/tests/tools/tflite_benchmark_model/README.md
similarity index 100%
rename from tools/tflite_benchmark_model/README.md
rename to tests/tools/tflite_benchmark_model/README.md

diff --git a/tools/tflite_benchmark_model/benchmark_tflite_model.cc b/tests/tools/tflite_benchmark_model/benchmark_tflite_model.cc
similarity index 100%
rename from tools/tflite_benchmark_model/benchmark_tflite_model.cc
rename to tests/tools/tflite_benchmark_model/benchmark_tflite_model.cc

diff --git a/tools/tflite_benchmark_model/profile_summarizer.cc b/tests/tools/tflite_benchmark_model/profile_summarizer.cc
similarity index 100%
rename from tools/tflite_benchmark_model/profile_summarizer.cc
rename to tests/tools/tflite_benchmark_model/profile_summarizer.cc

diff --git a/tools/tflite_benchmark_model/stats_calculator.cc b/tests/tools/tflite_benchmark_model/stats_calculator.cc
similarity index 100%
rename from tools/tflite_benchmark_model/stats_calculator.cc
rename to tests/tools/tflite_benchmark_model/stats_calculator.cc

diff --git a/tools/tflite_run/CMakeLists.txt b/tests/tools/tflite_run/CMakeLists.txt
similarity index 100%
rename from tools/tflite_run/CMakeLists.txt
rename to tests/tools/tflite_run/CMakeLists.txt

diff --git a/tools/tflite_run/README.md b/tests/tools/tflite_run/README.md
similarity index 100%
rename from tools/tflite_run/README.md
rename to tests/tools/tflite_run/README.md

diff --git a/tools/tflite_run/src/args.cc b/tests/tools/tflite_run/src/args.cc
similarity index 100%
rename from tools/tflite_run/src/args.cc
rename to tests/tools/tflite_run/src/args.cc

diff --git a/tools/tflite_run/src/args.h b/tests/tools/tflite_run/src/args.h
similarity index 100%
rename from tools/tflite_run/src/args.h
rename to tests/tools/tflite_run/src/args.h

diff --git a/tools/tflite_run/src/bin_image.cc b/tests/tools/tflite_run/src/bin_image.cc
similarity index 100%
rename from tools/tflite_run/src/bin_image.cc
rename to tests/tools/tflite_run/src/bin_image.cc

diff --git a/tools/tflite_run/src/bin_image.h b/tests/tools/tflite_run/src/bin_image.h
similarity index 100%
rename from tools/tflite_run/src/bin_image.h
rename to tests/tools/tflite_run/src/bin_image.h

diff --git a/tools/tflite_run/src/tensor_dumper.cc b/tests/tools/tflite_run/src/tensor_dumper.cc
similarity index 100%
rename from tools/tflite_run/src/tensor_dumper.cc
rename to tests/tools/tflite_run/src/tensor_dumper.cc

diff --git a/tools/tflite_run/src/tensor_dumper.h b/tests/tools/tflite_run/src/tensor_dumper.h
similarity index 100%
rename from tools/tflite_run/src/tensor_dumper.h
rename to tests/tools/tflite_run/src/tensor_dumper.h

diff --git a/tools/tflite_run/src/tensor_loader.cc b/tests/tools/tflite_run/src/tensor_loader.cc
similarity index 100%
rename from tools/tflite_run/src/tensor_loader.cc
rename to tests/tools/tflite_run/src/tensor_loader.cc

diff --git a/tools/tflite_run/src/tensor_loader.h b/tests/tools/tflite_run/src/tensor_loader.h
similarity index 100%
rename from tools/tflite_run/src/tensor_loader.h
rename to tests/tools/tflite_run/src/tensor_loader.h

diff --git a/tools/tflite_run/src/tflite_run.cc b/tests/tools/tflite_run/src/tflite_run.cc
similarity index 100%
rename from tools/tflite_run/src/tflite_run.cc
rename to tests/tools/tflite_run/src/tflite_run.cc

diff --git a/tools/tflite_run/src/tflite_test.cc b/tests/tools/tflite_run/src/tflite_test.cc
similarity index 100%
rename from tools/tflite_run/src/tflite_test.cc
rename to tests/tools/tflite_run/src/tflite_test.cc

diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 286261a..9d8e64f 100644 (file)
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -1,6 +1,2 @@
-add_subdirectory(tflite_run)
-add_subdirectory(tflite_benchmark)
-add_subdirectory(tflite_benchmark_model)
-add_subdirectory(nnapi_test)
 add_subdirectory(nnapi_quickcheck)
 add_subdirectory(opencl_tool)