[onert/test] Move test libs (#14522)

This commit moves nnapi test libs into tests/nnapi and remain libs into tests/tools. It includes removing unused headers for nnapi test. ONE-DCO-1.0-Signed-off-by: Hyeongseok Oh <[email protected]>
Samsung · Jan 3, 2025 · 354827d · 354827d
1 parent 5bffe08
commit 354827d
Show file tree

Hide file tree

Showing 65 changed files with 4 additions and 1,981 deletions.
diff --git a/tests/nnapi/CMakeLists.txt b/tests/nnapi/CMakeLists.txt
@@ -37,9 +37,10 @@ if (GENERATE_RUNTIME_NNAPI_TESTS)
   add_dependencies(${RUNTIME_NNAPI_TEST} generate-runtime-nnapi-tests)
 endif(GENERATE_RUNTIME_NNAPI_TESTS)
 
-set(RUNTIME_NNAPI_TEST_SRC_INC ${CMAKE_CURRENT_SOURCE_DIR}/include
-                               ${CMAKE_CURRENT_SOURCE_DIR}/src)
-target_include_directories(${RUNTIME_NNAPI_TEST} PRIVATE ${RUNTIME_NNAPI_TEST_SRC_INC})
+# Bridge between onert API and NNAPI
+add_subdirectory(bridge)
+
+target_include_directories(${RUNTIME_NNAPI_TEST} PRIVATE src)
 
 # Define NNTEST_ONLY_PUBLIC_API to avoid android dependency
 target_compile_definitions(${RUNTIME_NNAPI_TEST} PRIVATE NNTEST_ONLY_PUBLIC_API)

diff --git a/tests/libs/nnapi/CMakeLists.txt → tests/nnapi/bridge/CMakeLists.txt b/tests/libs/nnapi/CMakeLists.txt → tests/nnapi/bridge/CMakeLists.txt
diff --git a/tests/libs/nnapi/compilation.cc → tests/nnapi/bridge/compilation.cc b/tests/libs/nnapi/compilation.cc → tests/nnapi/bridge/compilation.cc
diff --git a/tests/libs/nnapi/event.cc → tests/nnapi/bridge/event.cc b/tests/libs/nnapi/event.cc → tests/nnapi/bridge/event.cc
diff --git a/tests/libs/nnapi/execution.cc → tests/nnapi/bridge/execution.cc b/tests/libs/nnapi/execution.cc → tests/nnapi/bridge/execution.cc
diff --git a/tests/nnapi/.FORMATDENY → tests/nnapi/bridge/include/.FORMATDENY b/tests/nnapi/.FORMATDENY → tests/nnapi/bridge/include/.FORMATDENY
diff --git a/tests/libs/nnapi/include/NeuralNetworks.h → tests/nnapi/bridge/include/NeuralNetworks.h b/tests/libs/nnapi/include/NeuralNetworks.h → tests/nnapi/bridge/include/NeuralNetworks.h
diff --git a/tests/libs/nnapi/include/NeuralNetworksEx.h → ...s/nnapi/bridge/include/NeuralNetworksEx.h b/tests/libs/nnapi/include/NeuralNetworksEx.h → ...s/nnapi/bridge/include/NeuralNetworksEx.h
diff --git a/.../nnapi/include/NeuralNetworksExtensions.h → ...bridge/include/NeuralNetworksExtensions.h b/.../nnapi/include/NeuralNetworksExtensions.h → ...bridge/include/NeuralNetworksExtensions.h
diff --git a/tests/nnapi/include/NeuralNetworksWrapper.h → ...pi/bridge/include/NeuralNetworksWrapper.h b/tests/nnapi/include/NeuralNetworksWrapper.h → ...pi/bridge/include/NeuralNetworksWrapper.h
diff --git a/tests/libs/nnapi/memory.cc → tests/nnapi/bridge/memory.cc b/tests/libs/nnapi/memory.cc → tests/nnapi/bridge/memory.cc
diff --git a/tests/libs/nnapi/model.cc → tests/nnapi/bridge/model.cc b/tests/libs/nnapi/model.cc → tests/nnapi/bridge/model.cc
diff --git a/...api/wrapper/ANeuralNetworksCompilation.cc → ...dge/wrapper/ANeuralNetworksCompilation.cc b/...api/wrapper/ANeuralNetworksCompilation.cc → ...dge/wrapper/ANeuralNetworksCompilation.cc
diff --git a/...napi/wrapper/ANeuralNetworksCompilation.h → ...idge/wrapper/ANeuralNetworksCompilation.h b/...napi/wrapper/ANeuralNetworksCompilation.h → ...idge/wrapper/ANeuralNetworksCompilation.h
diff --git a/...ibs/nnapi/wrapper/ANeuralNetworksEvent.cc → ...pi/bridge/wrapper/ANeuralNetworksEvent.cc b/...ibs/nnapi/wrapper/ANeuralNetworksEvent.cc → ...pi/bridge/wrapper/ANeuralNetworksEvent.cc
diff --git a/...libs/nnapi/wrapper/ANeuralNetworksEvent.h → ...api/bridge/wrapper/ANeuralNetworksEvent.h b/...libs/nnapi/wrapper/ANeuralNetworksEvent.h → ...api/bridge/wrapper/ANeuralNetworksEvent.h
diff --git a/...nnapi/wrapper/ANeuralNetworksExecution.cc → ...ridge/wrapper/ANeuralNetworksExecution.cc b/...nnapi/wrapper/ANeuralNetworksExecution.cc → ...ridge/wrapper/ANeuralNetworksExecution.cc
diff --git a/.../nnapi/wrapper/ANeuralNetworksExecution.h → ...bridge/wrapper/ANeuralNetworksExecution.h b/.../nnapi/wrapper/ANeuralNetworksExecution.h → ...bridge/wrapper/ANeuralNetworksExecution.h
diff --git a/...bs/nnapi/wrapper/ANeuralNetworksMemory.cc → ...i/bridge/wrapper/ANeuralNetworksMemory.cc b/...bs/nnapi/wrapper/ANeuralNetworksMemory.cc → ...i/bridge/wrapper/ANeuralNetworksMemory.cc
diff --git a/...ibs/nnapi/wrapper/ANeuralNetworksMemory.h → ...pi/bridge/wrapper/ANeuralNetworksMemory.h b/...ibs/nnapi/wrapper/ANeuralNetworksMemory.h → ...pi/bridge/wrapper/ANeuralNetworksMemory.h
diff --git a/...ibs/nnapi/wrapper/ANeuralNetworksModel.cc → ...pi/bridge/wrapper/ANeuralNetworksModel.cc b/...ibs/nnapi/wrapper/ANeuralNetworksModel.cc → ...pi/bridge/wrapper/ANeuralNetworksModel.cc
diff --git a/...libs/nnapi/wrapper/ANeuralNetworksModel.h → ...api/bridge/wrapper/ANeuralNetworksModel.h b/...libs/nnapi/wrapper/ANeuralNetworksModel.h → ...api/bridge/wrapper/ANeuralNetworksModel.h
diff --git a/...napi/wrapper/ANeuralNetworksModel.test.cc → ...idge/wrapper/ANeuralNetworksModel.test.cc b/...napi/wrapper/ANeuralNetworksModel.test.cc → ...idge/wrapper/ANeuralNetworksModel.test.cc
diff --git a/tests/libs/nnapi/wrapper/NNAPIConvert.cc → tests/nnapi/bridge/wrapper/NNAPIConvert.cc b/tests/libs/nnapi/wrapper/NNAPIConvert.cc → tests/nnapi/bridge/wrapper/NNAPIConvert.cc
diff --git a/tests/libs/nnapi/wrapper/NNAPIConvert.h → tests/nnapi/bridge/wrapper/NNAPIConvert.h b/tests/libs/nnapi/wrapper/NNAPIConvert.h → tests/nnapi/bridge/wrapper/NNAPIConvert.h
diff --git a/tests/libs/nnapi/wrapper/OperationFactory.cc → .../nnapi/bridge/wrapper/OperationFactory.cc b/tests/libs/nnapi/wrapper/OperationFactory.cc → .../nnapi/bridge/wrapper/OperationFactory.cc
diff --git a/tests/libs/nnapi/wrapper/OperationFactory.h → ...s/nnapi/bridge/wrapper/OperationFactory.h b/tests/libs/nnapi/wrapper/OperationFactory.h → ...s/nnapi/bridge/wrapper/OperationFactory.h
diff --git a/tests/nnapi/include/NeuralNetworksExShim.h b/tests/nnapi/include/NeuralNetworksExShim.h
diff --git a/tests/nnapi/include/NeuralNetworksLoadHelpers.h b/tests/nnapi/include/NeuralNetworksLoadHelpers.h