From 7ccc48110dddf8fc38f9a49c4c6877813388a87d Mon Sep 17 00:00:00 2001 From: Oleg Pipikin Date: Tue, 22 Mar 2022 09:52:38 +0300 Subject: [PATCH] Move common test utils (#11022) Co-authored-by: Ilya Churaev --- src/core/tests/CMakeLists.txt | 2 -- src/core/tests/frontend/shared/CMakeLists.txt | 1 + src/tests/CMakeLists.txt | 2 ++ src/{core => }/tests/engines_util/CMakeLists.txt | 1 + src/{core => }/tests/engines_util/engine_factory.hpp | 0 src/{core => }/tests/engines_util/engine_traits.hpp | 0 src/{core => }/tests/engines_util/execute_tools.cpp | 0 src/{core => }/tests/engines_util/execute_tools.hpp | 0 src/{core => }/tests/engines_util/random.hpp | 0 src/{core => }/tests/engines_util/shared_utils.cpp | 0 src/{core => }/tests/engines_util/shared_utils.hpp | 0 src/{core => }/tests/engines_util/test_case.cpp | 0 src/{core => }/tests/engines_util/test_case.hpp | 0 src/{core => }/tests/engines_util/test_case_engine.hpp | 0 src/{core => }/tests/engines_util/test_engines.hpp | 0 src/{core => }/tests/util/CMakeLists.txt | 1 + src/{core => }/tests/util/all_close.cpp | 0 src/{core => }/tests/util/all_close.hpp | 0 src/{core => }/tests/util/all_close_f.cpp | 0 src/{core => }/tests/util/all_close_f.hpp | 0 src/{core => }/tests/util/float_util.cpp | 0 src/{core => }/tests/util/float_util.hpp | 0 src/{core => }/tests/util/graph_comparator.cpp | 0 src/{core => }/tests/util/graph_comparator.hpp | 0 src/{core => }/tests/util/matcher.hpp | 0 src/{core => }/tests/util/ndarray.hpp | 0 src/{core => }/tests/util/test_common.cpp | 0 src/{core => }/tests/util/test_common.hpp | 0 src/{core => }/tests/util/test_control.cpp | 0 src/{core => }/tests/util/test_control.hpp | 0 src/{core => }/tests/util/test_tools.hpp | 0 src/{core => }/tests/util/type_prop.hpp | 0 src/{core => }/tests/util/visitor.hpp | 0 33 files changed, 5 insertions(+), 2 deletions(-) rename src/{core => }/tests/engines_util/CMakeLists.txt (87%) rename src/{core => }/tests/engines_util/engine_factory.hpp (100%) rename src/{core => }/tests/engines_util/engine_traits.hpp (100%) rename src/{core => }/tests/engines_util/execute_tools.cpp (100%) rename src/{core => }/tests/engines_util/execute_tools.hpp (100%) rename src/{core => }/tests/engines_util/random.hpp (100%) rename src/{core => }/tests/engines_util/shared_utils.cpp (100%) rename src/{core => }/tests/engines_util/shared_utils.hpp (100%) rename src/{core => }/tests/engines_util/test_case.cpp (100%) rename src/{core => }/tests/engines_util/test_case.hpp (100%) rename src/{core => }/tests/engines_util/test_case_engine.hpp (100%) rename src/{core => }/tests/engines_util/test_engines.hpp (100%) rename src/{core => }/tests/util/CMakeLists.txt (89%) rename src/{core => }/tests/util/all_close.cpp (100%) rename src/{core => }/tests/util/all_close.hpp (100%) rename src/{core => }/tests/util/all_close_f.cpp (100%) rename src/{core => }/tests/util/all_close_f.hpp (100%) rename src/{core => }/tests/util/float_util.cpp (100%) rename src/{core => }/tests/util/float_util.hpp (100%) rename src/{core => }/tests/util/graph_comparator.cpp (100%) rename src/{core => }/tests/util/graph_comparator.hpp (100%) rename src/{core => }/tests/util/matcher.hpp (100%) rename src/{core => }/tests/util/ndarray.hpp (100%) rename src/{core => }/tests/util/test_common.cpp (100%) rename src/{core => }/tests/util/test_common.hpp (100%) rename src/{core => }/tests/util/test_control.cpp (100%) rename src/{core => }/tests/util/test_control.hpp (100%) rename src/{core => }/tests/util/test_tools.hpp (100%) rename src/{core => }/tests/util/type_prop.hpp (100%) rename src/{core => }/tests/util/visitor.hpp (100%) diff --git a/src/core/tests/CMakeLists.txt b/src/core/tests/CMakeLists.txt index 81de58230c7..191edb661b5 100644 --- a/src/core/tests/CMakeLists.txt +++ b/src/core/tests/CMakeLists.txt @@ -13,8 +13,6 @@ set(OV_ONNX_NAMESPACE ngraph_onnx) if(ENABLE_TESTS) add_definitions("-DTEST_FILES=\"${TEST_MODEL_ZOO}/core/files\"") - add_subdirectory(util) - add_subdirectory(engines_util) if (ENABLE_OV_ONNX_FRONTEND) add_subdirectory(onnx_test_util) endif() diff --git a/src/core/tests/frontend/shared/CMakeLists.txt b/src/core/tests/frontend/shared/CMakeLists.txt index addd1ef23e8..ac2da5eaaa8 100644 --- a/src/core/tests/frontend/shared/CMakeLists.txt +++ b/src/core/tests/frontend/shared/CMakeLists.txt @@ -14,6 +14,7 @@ add_subdirectory(test_builtin_extensions_2) target_include_directories(${TARGET_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include) target_include_directories(${TARGET_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../..) + target_link_libraries(${TARGET_NAME} PUBLIC engines_test_util openvino::runtime offline_transformations cnpy commonTestUtils ngraph_test_util openvino::util nlohmann_json_schema_validator test_builtin_extensions_1 test_builtin_extensions_2) diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt index 0ec6788a581..ebfdf9c5e62 100644 --- a/src/tests/CMakeLists.txt +++ b/src/tests/CMakeLists.txt @@ -16,6 +16,8 @@ endif() add_subdirectory(ngraph_helpers) add_subdirectory(unit) add_subdirectory(ie_test_utils) +add_subdirectory(util) +add_subdirectory(engines_util) if(ENABLE_FUNCTIONAL_TESTS) add_subdirectory(functional) diff --git a/src/core/tests/engines_util/CMakeLists.txt b/src/tests/engines_util/CMakeLists.txt similarity index 87% rename from src/core/tests/engines_util/CMakeLists.txt rename to src/tests/engines_util/CMakeLists.txt index 3240725fd31..efd0cfb7ab4 100644 --- a/src/core/tests/engines_util/CMakeLists.txt +++ b/src/tests/engines_util/CMakeLists.txt @@ -10,5 +10,6 @@ ie_faster_build(engines_test_util UNITY) target_link_libraries(engines_test_util PUBLIC openvino::runtime openvino::runtime::dev gtest gmock ngraph_test_util) target_include_directories(engines_test_util PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) +target_include_directories(engines_test_util PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/..") add_clang_format_target(engines_test_util_clang FOR_SOURCES ${ENGINES_UTIL_SRC}) diff --git a/src/core/tests/engines_util/engine_factory.hpp b/src/tests/engines_util/engine_factory.hpp similarity index 100% rename from src/core/tests/engines_util/engine_factory.hpp rename to src/tests/engines_util/engine_factory.hpp diff --git a/src/core/tests/engines_util/engine_traits.hpp b/src/tests/engines_util/engine_traits.hpp similarity index 100% rename from src/core/tests/engines_util/engine_traits.hpp rename to src/tests/engines_util/engine_traits.hpp diff --git a/src/core/tests/engines_util/execute_tools.cpp b/src/tests/engines_util/execute_tools.cpp similarity index 100% rename from src/core/tests/engines_util/execute_tools.cpp rename to src/tests/engines_util/execute_tools.cpp diff --git a/src/core/tests/engines_util/execute_tools.hpp b/src/tests/engines_util/execute_tools.hpp similarity index 100% rename from src/core/tests/engines_util/execute_tools.hpp rename to src/tests/engines_util/execute_tools.hpp diff --git a/src/core/tests/engines_util/random.hpp b/src/tests/engines_util/random.hpp similarity index 100% rename from src/core/tests/engines_util/random.hpp rename to src/tests/engines_util/random.hpp diff --git a/src/core/tests/engines_util/shared_utils.cpp b/src/tests/engines_util/shared_utils.cpp similarity index 100% rename from src/core/tests/engines_util/shared_utils.cpp rename to src/tests/engines_util/shared_utils.cpp diff --git a/src/core/tests/engines_util/shared_utils.hpp b/src/tests/engines_util/shared_utils.hpp similarity index 100% rename from src/core/tests/engines_util/shared_utils.hpp rename to src/tests/engines_util/shared_utils.hpp diff --git a/src/core/tests/engines_util/test_case.cpp b/src/tests/engines_util/test_case.cpp similarity index 100% rename from src/core/tests/engines_util/test_case.cpp rename to src/tests/engines_util/test_case.cpp diff --git a/src/core/tests/engines_util/test_case.hpp b/src/tests/engines_util/test_case.hpp similarity index 100% rename from src/core/tests/engines_util/test_case.hpp rename to src/tests/engines_util/test_case.hpp diff --git a/src/core/tests/engines_util/test_case_engine.hpp b/src/tests/engines_util/test_case_engine.hpp similarity index 100% rename from src/core/tests/engines_util/test_case_engine.hpp rename to src/tests/engines_util/test_case_engine.hpp diff --git a/src/core/tests/engines_util/test_engines.hpp b/src/tests/engines_util/test_engines.hpp similarity index 100% rename from src/core/tests/engines_util/test_engines.hpp rename to src/tests/engines_util/test_engines.hpp diff --git a/src/core/tests/util/CMakeLists.txt b/src/tests/util/CMakeLists.txt similarity index 89% rename from src/core/tests/util/CMakeLists.txt rename to src/tests/util/CMakeLists.txt index 7a834e7290e..4ed029fa48f 100644 --- a/src/core/tests/util/CMakeLists.txt +++ b/src/tests/util/CMakeLists.txt @@ -10,6 +10,7 @@ ie_faster_build(ngraph_test_util UNITY) target_link_libraries(ngraph_test_util PUBLIC openvino::runtime gtest gmock) target_include_directories(ngraph_test_util PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) +target_include_directories(ngraph_test_util PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/..") file(GLOB_RECURSE all_util_src "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/*.hpp") add_clang_format_target(ngraph_test_util_clang FOR_SOURCES ${all_util_src}) diff --git a/src/core/tests/util/all_close.cpp b/src/tests/util/all_close.cpp similarity index 100% rename from src/core/tests/util/all_close.cpp rename to src/tests/util/all_close.cpp diff --git a/src/core/tests/util/all_close.hpp b/src/tests/util/all_close.hpp similarity index 100% rename from src/core/tests/util/all_close.hpp rename to src/tests/util/all_close.hpp diff --git a/src/core/tests/util/all_close_f.cpp b/src/tests/util/all_close_f.cpp similarity index 100% rename from src/core/tests/util/all_close_f.cpp rename to src/tests/util/all_close_f.cpp diff --git a/src/core/tests/util/all_close_f.hpp b/src/tests/util/all_close_f.hpp similarity index 100% rename from src/core/tests/util/all_close_f.hpp rename to src/tests/util/all_close_f.hpp diff --git a/src/core/tests/util/float_util.cpp b/src/tests/util/float_util.cpp similarity index 100% rename from src/core/tests/util/float_util.cpp rename to src/tests/util/float_util.cpp diff --git a/src/core/tests/util/float_util.hpp b/src/tests/util/float_util.hpp similarity index 100% rename from src/core/tests/util/float_util.hpp rename to src/tests/util/float_util.hpp diff --git a/src/core/tests/util/graph_comparator.cpp b/src/tests/util/graph_comparator.cpp similarity index 100% rename from src/core/tests/util/graph_comparator.cpp rename to src/tests/util/graph_comparator.cpp diff --git a/src/core/tests/util/graph_comparator.hpp b/src/tests/util/graph_comparator.hpp similarity index 100% rename from src/core/tests/util/graph_comparator.hpp rename to src/tests/util/graph_comparator.hpp diff --git a/src/core/tests/util/matcher.hpp b/src/tests/util/matcher.hpp similarity index 100% rename from src/core/tests/util/matcher.hpp rename to src/tests/util/matcher.hpp diff --git a/src/core/tests/util/ndarray.hpp b/src/tests/util/ndarray.hpp similarity index 100% rename from src/core/tests/util/ndarray.hpp rename to src/tests/util/ndarray.hpp diff --git a/src/core/tests/util/test_common.cpp b/src/tests/util/test_common.cpp similarity index 100% rename from src/core/tests/util/test_common.cpp rename to src/tests/util/test_common.cpp diff --git a/src/core/tests/util/test_common.hpp b/src/tests/util/test_common.hpp similarity index 100% rename from src/core/tests/util/test_common.hpp rename to src/tests/util/test_common.hpp diff --git a/src/core/tests/util/test_control.cpp b/src/tests/util/test_control.cpp similarity index 100% rename from src/core/tests/util/test_control.cpp rename to src/tests/util/test_control.cpp diff --git a/src/core/tests/util/test_control.hpp b/src/tests/util/test_control.hpp similarity index 100% rename from src/core/tests/util/test_control.hpp rename to src/tests/util/test_control.hpp diff --git a/src/core/tests/util/test_tools.hpp b/src/tests/util/test_tools.hpp similarity index 100% rename from src/core/tests/util/test_tools.hpp rename to src/tests/util/test_tools.hpp diff --git a/src/core/tests/util/type_prop.hpp b/src/tests/util/type_prop.hpp similarity index 100% rename from src/core/tests/util/type_prop.hpp rename to src/tests/util/type_prop.hpp diff --git a/src/core/tests/util/visitor.hpp b/src/tests/util/visitor.hpp similarity index 100% rename from src/core/tests/util/visitor.hpp rename to src/tests/util/visitor.hpp