From fc393036779fa49b7b6baf15bf589de7e27635ac Mon Sep 17 00:00:00 2001 From: Ilya Churaev Date: Fri, 6 Aug 2021 10:05:51 +0300 Subject: [PATCH] Moved IE public headers to IE library (#6941) * Moved IE public headers to IE library * Fixed documentation * Fixed fast build * Fixed doc --- CODEOWNERS | 12 +++--- cmake/developer_package/version.cmake | 2 +- docs/doxygen/doxygen-ignore.txt | 10 ++--- docs/doxygen/ie_docs.config | 2 +- .../src/inference_engine/CMakeLists.txt | 40 +++++++++---------- .../include/ie/cldnn/cldnn_config.hpp | 0 .../include/ie/cpp/ie_cnn_network.h | 0 .../include/ie/cpp/ie_executable_network.hpp | 0 .../include/ie/cpp/ie_infer_request.hpp | 0 .../include/ie/cpp/ie_memory_state.hpp | 0 .../include/ie/details/ie_blob_iterator.hpp | 0 .../include/ie/details/ie_exception.hpp | 0 .../include/ie/details/ie_pre_allocator.hpp | 0 .../include/ie/details/ie_so_loader.h | 0 .../include/ie/details/ie_so_pointer.hpp | 0 .../include/ie/gna/gna_config.hpp | 0 .../ie/gpu/details/gpu_context_helpers.hpp | 0 .../include/ie/gpu/gpu_config.hpp | 0 .../include/ie/gpu/gpu_context_api_dx.hpp | 0 .../include/ie/gpu/gpu_context_api_ocl.hpp | 0 .../include/ie/gpu/gpu_context_api_va.hpp | 0 .../include/ie/gpu/gpu_ocl_wrapper.hpp | 0 .../include/ie/gpu/gpu_params.hpp | 0 .../ie/hetero/hetero_plugin_config.hpp | 0 .../include/ie/ie_allocator.hpp | 0 .../inference_engine}/include/ie/ie_api.h | 0 .../inference_engine}/include/ie/ie_blob.h | 0 .../inference_engine}/include/ie/ie_common.h | 0 .../include/ie/ie_compound_blob.h | 0 .../inference_engine}/include/ie/ie_core.hpp | 0 .../inference_engine}/include/ie/ie_data.h | 0 .../include/ie/ie_extension.h | 0 .../include/ie/ie_icnn_network.hpp | 0 .../include/ie/ie_iexecutable_network.hpp | 0 .../include/ie/ie_iextension.h | 0 .../include/ie/ie_iinfer_request.hpp | 0 .../include/ie/ie_input_info.hpp | 0 .../inference_engine}/include/ie/ie_layouts.h | 0 .../include/ie/ie_locked_memory.hpp | 0 .../include/ie/ie_parallel.hpp | 0 .../include/ie/ie_parameter.hpp | 0 .../include/ie/ie_plugin_config.hpp | 0 .../include/ie/ie_precision.hpp | 0 .../include/ie/ie_preprocess.hpp | 0 .../include/ie/ie_remote_context.hpp | 0 .../include/ie/ie_transformations.hpp | 0 .../include/ie/ie_version.hpp | 0 .../include/ie/inference_engine.hpp | 0 .../ie/multi-device/multi_device_config.hpp | 0 .../include/ie/vpu/hddl_config.hpp | 0 .../include/ie/vpu/hddl_plugin_config.hpp | 0 .../include/ie/vpu/myriad_config.hpp | 0 .../include/ie/vpu/myriad_plugin_config.hpp | 0 .../include/ie/vpu/vpu_config.hpp | 0 .../include/ie/vpu/vpu_plugin_config.hpp | 0 .../{ => src}/blob_factory.cpp | 0 .../{ => src}/blob_transform.cpp | 0 .../{ => src}/cnn_network_ngraph_impl.cpp | 0 .../{ => src}/cnn_network_ngraph_impl.hpp | 0 .../{ => src}/compilation_context.cpp | 0 .../{ => src}/compilation_context.hpp | 0 .../{ => src}/cpp/exception2status.hpp | 0 .../{ => src}/cpp/ie_cnn_network.cpp | 0 .../{ => src}/cpp/ie_executable_network.cpp | 0 .../cpp/ie_executable_network_base.hpp | 0 .../cpp/ie_infer_async_request_base.hpp | 0 .../{ => src}/cpp/ie_infer_request.cpp | 0 .../{ => src}/cpp/ie_plugin.hpp | 0 .../{ => src}/cpp/ie_variable_state.cpp | 0 .../ie_iexecutable_network_internal.cpp | 0 .../interface/ie_iinfer_request_internal.cpp | 0 .../interface/ie_iplugin_internal.cpp | 0 .../interface/ie_ivariable_state_internal.cpp | 0 .../cpu_x86_sse42/blob_transform_sse42.cpp | 0 .../cpu_x86_sse42/blob_transform_sse42.hpp | 0 .../inference_engine/{ => src}/file_utils.cpp | 0 .../{ => src}/ie_blob_common.cpp | 0 .../{ => src}/ie_cache_guard.cpp | 0 .../{ => src}/ie_cache_guard.hpp | 0 .../{ => src}/ie_cache_manager.hpp | 0 .../inference_engine/{ => src}/ie_common.cpp | 0 .../{ => src}/ie_compound_blob.cpp | 0 .../inference_engine/{ => src}/ie_core.cpp | 0 .../inference_engine/{ => src}/ie_data.cpp | 0 .../src/inference_engine/{ => src}/ie_itt.hpp | 0 .../inference_engine/{ => src}/ie_layouts.cpp | 0 .../inference_engine/{ => src}/ie_memcpy.cpp | 0 .../{ => src}/ie_network_reader.cpp | 0 .../{ => src}/ie_network_reader.hpp | 0 .../{ => src}/ie_ngraph_utils.cpp | 0 .../{ => src}/ie_system_conf.cpp | 0 .../{ => src}/ie_transformations.cpp | 0 .../inference_engine/{ => src}/ie_version.cpp | 0 .../os/lin/lin_shared_object_loader.cpp | 0 .../{ => src}/os/lin/lin_system_conf.cpp | 0 .../os/win/win_shared_object_loader.cpp | 0 .../{ => src}/os/win/win_system_conf.cpp | 0 .../{ => src}/precision_utils.cpp | 0 .../inference_engine/{ => src}/precomp.hpp | 0 .../{ => src}/system_allocator.cpp | 0 .../{ => src}/system_allocator.hpp | 0 .../threading/ie_cpu_streams_executor.cpp | 0 .../threading/ie_executor_manager.cpp | 0 .../threading/ie_istreams_executor.cpp | 0 .../{ => src}/threading/ie_itask_executor.cpp | 0 .../threading/ie_parallel_custom_arena.cpp | 0 .../threading/ie_parallel_custom_arena.hpp | 0 .../threading/ie_thread_affinity.cpp | 0 .../threading/ie_thread_affinity.hpp | 0 .../{ => src}/xml_parse_utils.cpp | 0 .../src/legacy_api/CMakeLists.txt | 2 +- .../inference_engine/CMakeLists.txt | 4 +- .../functional_test_utils/precision_utils.hpp | 2 +- .../behavior/vpu/CMakeLists.txt | 2 +- 114 files changed, 38 insertions(+), 38 deletions(-) rename inference-engine/{ => src/inference_engine}/include/ie/cldnn/cldnn_config.hpp (100%) rename inference-engine/{ => src/inference_engine}/include/ie/cpp/ie_cnn_network.h (100%) rename inference-engine/{ => src/inference_engine}/include/ie/cpp/ie_executable_network.hpp (100%) rename inference-engine/{ => src/inference_engine}/include/ie/cpp/ie_infer_request.hpp (100%) rename inference-engine/{ => src/inference_engine}/include/ie/cpp/ie_memory_state.hpp (100%) rename inference-engine/{ => src/inference_engine}/include/ie/details/ie_blob_iterator.hpp (100%) rename inference-engine/{ => src/inference_engine}/include/ie/details/ie_exception.hpp (100%) rename inference-engine/{ => src/inference_engine}/include/ie/details/ie_pre_allocator.hpp (100%) rename inference-engine/{ => src/inference_engine}/include/ie/details/ie_so_loader.h (100%) rename inference-engine/{ => src/inference_engine}/include/ie/details/ie_so_pointer.hpp (100%) rename inference-engine/{ => src/inference_engine}/include/ie/gna/gna_config.hpp (100%) rename inference-engine/{ => src/inference_engine}/include/ie/gpu/details/gpu_context_helpers.hpp (100%) rename inference-engine/{ => src/inference_engine}/include/ie/gpu/gpu_config.hpp (100%) rename inference-engine/{ => src/inference_engine}/include/ie/gpu/gpu_context_api_dx.hpp (100%) rename inference-engine/{ => src/inference_engine}/include/ie/gpu/gpu_context_api_ocl.hpp (100%) rename inference-engine/{ => src/inference_engine}/include/ie/gpu/gpu_context_api_va.hpp (100%) rename inference-engine/{ => src/inference_engine}/include/ie/gpu/gpu_ocl_wrapper.hpp (100%) rename inference-engine/{ => src/inference_engine}/include/ie/gpu/gpu_params.hpp (100%) rename inference-engine/{ => src/inference_engine}/include/ie/hetero/hetero_plugin_config.hpp (100%) rename inference-engine/{ => src/inference_engine}/include/ie/ie_allocator.hpp (100%) rename inference-engine/{ => src/inference_engine}/include/ie/ie_api.h (100%) rename inference-engine/{ => src/inference_engine}/include/ie/ie_blob.h (100%) rename inference-engine/{ => src/inference_engine}/include/ie/ie_common.h (100%) rename inference-engine/{ => src/inference_engine}/include/ie/ie_compound_blob.h (100%) rename inference-engine/{ => src/inference_engine}/include/ie/ie_core.hpp (100%) rename inference-engine/{ => src/inference_engine}/include/ie/ie_data.h (100%) rename inference-engine/{ => src/inference_engine}/include/ie/ie_extension.h (100%) rename inference-engine/{ => src/inference_engine}/include/ie/ie_icnn_network.hpp (100%) rename inference-engine/{ => src/inference_engine}/include/ie/ie_iexecutable_network.hpp (100%) rename inference-engine/{ => src/inference_engine}/include/ie/ie_iextension.h (100%) rename inference-engine/{ => src/inference_engine}/include/ie/ie_iinfer_request.hpp (100%) rename inference-engine/{ => src/inference_engine}/include/ie/ie_input_info.hpp (100%) rename inference-engine/{ => src/inference_engine}/include/ie/ie_layouts.h (100%) rename inference-engine/{ => src/inference_engine}/include/ie/ie_locked_memory.hpp (100%) rename inference-engine/{ => src/inference_engine}/include/ie/ie_parallel.hpp (100%) rename inference-engine/{ => src/inference_engine}/include/ie/ie_parameter.hpp (100%) rename inference-engine/{ => src/inference_engine}/include/ie/ie_plugin_config.hpp (100%) rename inference-engine/{ => src/inference_engine}/include/ie/ie_precision.hpp (100%) rename inference-engine/{ => src/inference_engine}/include/ie/ie_preprocess.hpp (100%) rename inference-engine/{ => src/inference_engine}/include/ie/ie_remote_context.hpp (100%) rename inference-engine/{ => src/inference_engine}/include/ie/ie_transformations.hpp (100%) rename inference-engine/{ => src/inference_engine}/include/ie/ie_version.hpp (100%) rename inference-engine/{ => src/inference_engine}/include/ie/inference_engine.hpp (100%) rename inference-engine/{ => src/inference_engine}/include/ie/multi-device/multi_device_config.hpp (100%) rename inference-engine/{ => src/inference_engine}/include/ie/vpu/hddl_config.hpp (100%) rename inference-engine/{ => src/inference_engine}/include/ie/vpu/hddl_plugin_config.hpp (100%) rename inference-engine/{ => src/inference_engine}/include/ie/vpu/myriad_config.hpp (100%) rename inference-engine/{ => src/inference_engine}/include/ie/vpu/myriad_plugin_config.hpp (100%) rename inference-engine/{ => src/inference_engine}/include/ie/vpu/vpu_config.hpp (100%) rename inference-engine/{ => src/inference_engine}/include/ie/vpu/vpu_plugin_config.hpp (100%) rename inference-engine/src/inference_engine/{ => src}/blob_factory.cpp (100%) rename inference-engine/src/inference_engine/{ => src}/blob_transform.cpp (100%) rename inference-engine/src/inference_engine/{ => src}/cnn_network_ngraph_impl.cpp (100%) rename inference-engine/src/inference_engine/{ => src}/cnn_network_ngraph_impl.hpp (100%) rename inference-engine/src/inference_engine/{ => src}/compilation_context.cpp (100%) rename inference-engine/src/inference_engine/{ => src}/compilation_context.hpp (100%) rename inference-engine/src/inference_engine/{ => src}/cpp/exception2status.hpp (100%) rename inference-engine/src/inference_engine/{ => src}/cpp/ie_cnn_network.cpp (100%) rename inference-engine/src/inference_engine/{ => src}/cpp/ie_executable_network.cpp (100%) rename inference-engine/src/inference_engine/{ => src}/cpp/ie_executable_network_base.hpp (100%) rename inference-engine/src/inference_engine/{ => src}/cpp/ie_infer_async_request_base.hpp (100%) rename inference-engine/src/inference_engine/{ => src}/cpp/ie_infer_request.cpp (100%) rename inference-engine/src/inference_engine/{ => src}/cpp/ie_plugin.hpp (100%) rename inference-engine/src/inference_engine/{ => src}/cpp/ie_variable_state.cpp (100%) rename inference-engine/src/inference_engine/{ => src}/cpp_interfaces/interface/ie_iexecutable_network_internal.cpp (100%) rename inference-engine/src/inference_engine/{ => src}/cpp_interfaces/interface/ie_iinfer_request_internal.cpp (100%) rename inference-engine/src/inference_engine/{ => src}/cpp_interfaces/interface/ie_iplugin_internal.cpp (100%) rename inference-engine/src/inference_engine/{ => src}/cpp_interfaces/interface/ie_ivariable_state_internal.cpp (100%) rename inference-engine/src/inference_engine/{ => src}/cpu_x86_sse42/blob_transform_sse42.cpp (100%) rename inference-engine/src/inference_engine/{ => src}/cpu_x86_sse42/blob_transform_sse42.hpp (100%) rename inference-engine/src/inference_engine/{ => src}/file_utils.cpp (100%) rename inference-engine/src/inference_engine/{ => src}/ie_blob_common.cpp (100%) rename inference-engine/src/inference_engine/{ => src}/ie_cache_guard.cpp (100%) rename inference-engine/src/inference_engine/{ => src}/ie_cache_guard.hpp (100%) rename inference-engine/src/inference_engine/{ => src}/ie_cache_manager.hpp (100%) rename inference-engine/src/inference_engine/{ => src}/ie_common.cpp (100%) rename inference-engine/src/inference_engine/{ => src}/ie_compound_blob.cpp (100%) rename inference-engine/src/inference_engine/{ => src}/ie_core.cpp (100%) rename inference-engine/src/inference_engine/{ => src}/ie_data.cpp (100%) rename inference-engine/src/inference_engine/{ => src}/ie_itt.hpp (100%) rename inference-engine/src/inference_engine/{ => src}/ie_layouts.cpp (100%) rename inference-engine/src/inference_engine/{ => src}/ie_memcpy.cpp (100%) rename inference-engine/src/inference_engine/{ => src}/ie_network_reader.cpp (100%) rename inference-engine/src/inference_engine/{ => src}/ie_network_reader.hpp (100%) rename inference-engine/src/inference_engine/{ => src}/ie_ngraph_utils.cpp (100%) rename inference-engine/src/inference_engine/{ => src}/ie_system_conf.cpp (100%) rename inference-engine/src/inference_engine/{ => src}/ie_transformations.cpp (100%) rename inference-engine/src/inference_engine/{ => src}/ie_version.cpp (100%) rename inference-engine/src/inference_engine/{ => src}/os/lin/lin_shared_object_loader.cpp (100%) rename inference-engine/src/inference_engine/{ => src}/os/lin/lin_system_conf.cpp (100%) rename inference-engine/src/inference_engine/{ => src}/os/win/win_shared_object_loader.cpp (100%) rename inference-engine/src/inference_engine/{ => src}/os/win/win_system_conf.cpp (100%) rename inference-engine/src/inference_engine/{ => src}/precision_utils.cpp (100%) rename inference-engine/src/inference_engine/{ => src}/precomp.hpp (100%) rename inference-engine/src/inference_engine/{ => src}/system_allocator.cpp (100%) rename inference-engine/src/inference_engine/{ => src}/system_allocator.hpp (100%) rename inference-engine/src/inference_engine/{ => src}/threading/ie_cpu_streams_executor.cpp (100%) rename inference-engine/src/inference_engine/{ => src}/threading/ie_executor_manager.cpp (100%) rename inference-engine/src/inference_engine/{ => src}/threading/ie_istreams_executor.cpp (100%) rename inference-engine/src/inference_engine/{ => src}/threading/ie_itask_executor.cpp (100%) rename inference-engine/src/inference_engine/{ => src}/threading/ie_parallel_custom_arena.cpp (100%) rename inference-engine/src/inference_engine/{ => src}/threading/ie_parallel_custom_arena.hpp (100%) rename inference-engine/src/inference_engine/{ => src}/threading/ie_thread_affinity.cpp (100%) rename inference-engine/src/inference_engine/{ => src}/threading/ie_thread_affinity.hpp (100%) rename inference-engine/src/inference_engine/{ => src}/xml_parse_utils.cpp (100%) diff --git a/CODEOWNERS b/CODEOWNERS index d47170c4716..2894fac8ff3 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -30,13 +30,13 @@ azure-pipelines.yml @openvinotoolkit/openvino-admins # IE GPU: /inference-engine/src/cldnn_engine/ @openvinotoolkit/openvino-ie-gpu-maintainers @openvinotoolkit/openvino-ie-gpu-developers -/inference-engine/include/gpu/ @openvinotoolkit/openvino-ie-gpu-maintainers @openvinotoolkit/openvino-ie-gpu-developers -/inference-engine/include/cldnn/ @openvinotoolkit/openvino-ie-gpu-maintainers @openvinotoolkit/openvino-ie-gpu-developers +/inference-engine/src/inference_engine/include/gpu/ @openvinotoolkit/openvino-ie-gpu-maintainers @openvinotoolkit/openvino-ie-gpu-developers +/inference-engine/src/inference_engine/include/cldnn/ @openvinotoolkit/openvino-ie-gpu-maintainers @openvinotoolkit/openvino-ie-gpu-developers /inference-engine/thirdparty/clDNN/ @openvinotoolkit/openvino-ie-gpu-maintainers @openvinotoolkit/openvino-ie-gpu-developers # IE VPU: /inference-engine/src/vpu/ @openvinotoolkit/openvino-ie-vpu-maintainers -/inference-engine/include/vpu/ @openvinotoolkit/openvino-ie-vpu-maintainers +/inference-engine/src/inference_engine/include/vpu/ @openvinotoolkit/openvino-ie-vpu-maintainers /inference-engine/thirdparty/movidius/ @openvinotoolkit/openvino-ie-vpu-maintainers /inference-engine/tests_deprecated/unit/engines/vpu/ @openvinotoolkit/openvino-ie-vpu-maintainers @openvinotoolkit/openvino-ie-tests-maintainers /inference-engine/tests_deprecated/functional/vpu/ @openvinotoolkit/openvino-ie-vpu-maintainers @openvinotoolkit/openvino-ie-tests-maintainers @@ -49,11 +49,11 @@ azure-pipelines.yml @openvinotoolkit/openvino-admins # IE GNA: /inference-engine/src/gna_plugin/ @openvinotoolkit/openvino-ie-gna-maintainers -/inference-engine/include/gna/ @openvinotoolkit/openvino-ie-gna-maintainers +/inference-engine/src/inference_engine/include/gna/ @openvinotoolkit/openvino-ie-gna-maintainers # IE MULTI: /inference-engine/src/multi_device/ @openvinotoolkit/openvino-ie-multi-maintainers -/inference-engine/include/multi-device/ @openvinotoolkit/openvino-ie-multi-maintainers +/inference-engine/src/inference_engine/include/multi-device/ @openvinotoolkit/openvino-ie-multi-maintainers # IE Tests: /inference-engine/tests/ @openvinotoolkit/openvino-ie-tests-maintainers @@ -77,4 +77,4 @@ azure-pipelines.yml @openvinotoolkit/openvino-admins # Control 3d party dependencies *requirements* @openvino-configuration-mgmt *setup.py @openvino-configuration-mgmt -/scripts/install_dependencies/ @openvino-configuration-mgmt \ No newline at end of file +/scripts/install_dependencies/ @openvino-configuration-mgmt diff --git a/cmake/developer_package/version.cmake b/cmake/developer_package/version.cmake index 8e6433034d0..cfd3e22e71a 100644 --- a/cmake/developer_package/version.cmake +++ b/cmake/developer_package/version.cmake @@ -42,7 +42,7 @@ macro(ie_parse_ci_build_number) return() endif() - set(ie_version_hpp "${OpenVINO_SOURCE_DIR}/inference-engine/include/ie/ie_version.hpp") + set(ie_version_hpp "${OpenVINO_SOURCE_DIR}/inference-engine/src/inference_engine/include/ie/ie_version.hpp") if(NOT EXISTS ${ie_version_hpp}) message(FATAL_ERROR "File ie_version.hpp with IE_VERSION definitions is not found") endif() diff --git a/docs/doxygen/doxygen-ignore.txt b/docs/doxygen/doxygen-ignore.txt index 9dc1d61cdb3..c2bc8a0825c 100644 --- a/docs/doxygen/doxygen-ignore.txt +++ b/docs/doxygen/doxygen-ignore.txt @@ -16,8 +16,8 @@ openvino/docs/optimization_guide/dldt_optimization_guide.md openvino/docs/IE_DG/ShapeInference.md build/docs/openvino_docs.xml openvino/docs/install_guides/installing-openvino-linux-ivad-vpu.md -inference-engine/include/ie/ie_parallel.hpp -inference-engine/include/ie/ie_plugin_config.hpp -inference-engine/include/ie/vpu/myriad_config.hpp -inference-engine/include/ie/vpu/vpu_config.hpp -inference-engine/include/ie/vpu/vpu_plugin_config.hpp +inference-engine/src/inference_engine/include/ie/ie_parallel.hpp +inference-engine/src/inference_engine/include/ie/ie_plugin_config.hpp +inference-engine/src/inference_engine/include/ie/vpu/myriad_config.hpp +inference-engine/src/inference_engine/include/ie/vpu/vpu_config.hpp +inference-engine/src/inference_engine/include/ie/vpu/vpu_plugin_config.hpp diff --git a/docs/doxygen/ie_docs.config b/docs/doxygen/ie_docs.config index bbd203c931c..792d001bdcf 100644 --- a/docs/doxygen/ie_docs.config +++ b/docs/doxygen/ie_docs.config @@ -824,7 +824,7 @@ WARN_LOGFILE = "@DOCS_BUILD_DIR@/ie_docs.log" # Note: If this tag is empty the current directory is searched. INPUT = "@DOCS_BUILD_DIR@" \ - "@IE_SOURCE_DIR@/include" + "@IE_SOURCE_DIR@/src/inference_engine/include" # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt index 8e8a8270903..1152c12392e 100644 --- a/inference-engine/src/inference_engine/CMakeLists.txt +++ b/inference-engine/src/inference_engine/CMakeLists.txt @@ -12,11 +12,11 @@ if(THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO") endif() file (GLOB LIBRARY_SRC - ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/cpp/*.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/threading/*.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/cpp/*.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/cpp_interfaces/interface/*.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/cpp/*.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/threading/*.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/cpp/*.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/cpp_interfaces/interface/*.cpp ) # TODO: WA for OneHot pass usage in reshape @@ -30,38 +30,38 @@ set(LEGACY_LIBRARY_SHARED_SRCS set_source_files_properties(${LEGACY_LIBRARY_SHARED_SRCS} PROPERTIES COMPILE_DEFINITIONS "USE_STATIC_IE") -set(IE_STATIC_DEPENDENT_FILES ${CMAKE_CURRENT_SOURCE_DIR}/file_utils.cpp) +set(IE_STATIC_DEPENDENT_FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/file_utils.cpp) list(REMOVE_ITEM LIBRARY_SRC ${IE_STATIC_DEPENDENT_FILES}) file (GLOB LIBRARY_HEADERS - ${CMAKE_CURRENT_SOURCE_DIR}/*.h - ${CMAKE_CURRENT_SOURCE_DIR}/*.hpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/*.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/*.hpp ) if (LINUX) file (GLOB LIBRARY_SRC ${LIBRARY_SRC} - ${CMAKE_CURRENT_SOURCE_DIR}/os/lin/*.cpp) + ${CMAKE_CURRENT_SOURCE_DIR}/src/os/lin/*.cpp) file (GLOB LIBRARY_HEADERS ${LIBRARY_HEADERS} - ${CMAKE_CURRENT_SOURCE_DIR}/os/lin/*.hpp) + ${CMAKE_CURRENT_SOURCE_DIR}/src/os/lin/*.hpp) elseif (UNIX) list (APPEND LIBRARY_SRC - ${CMAKE_CURRENT_SOURCE_DIR}/os/lin/lin_shared_object_loader.cpp) + ${CMAKE_CURRENT_SOURCE_DIR}/src/os/lin/lin_shared_object_loader.cpp) endif() if (WIN32) file (GLOB LIBRARY_SRC ${LIBRARY_SRC} - ${CMAKE_CURRENT_SOURCE_DIR}/os/win/*.cpp) + ${CMAKE_CURRENT_SOURCE_DIR}/src/os/win/*.cpp) file (GLOB LIBRARY_HEADERS ${LIBRARY_HEADERS} - ${CMAKE_CURRENT_SOURCE_DIR}/os/win/*.hpp) + ${CMAKE_CURRENT_SOURCE_DIR}/src/os/win/*.hpp) endif() if(ENABLE_SSE42) - file(GLOB SSE_SRC ${CMAKE_CURRENT_SOURCE_DIR}/cpu_x86_sse42/*.cpp) - file(GLOB SSE_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/cpu_x86_sse42/*.hpp) + file(GLOB SSE_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/cpu_x86_sse42/*.cpp) + file(GLOB SSE_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/src/cpu_x86_sse42/*.hpp) list(APPEND LIBRARY_HEADERS ${SSE_HEADERS}) list(APPEND LIBRARY_SRC ${SSE_SRC}) @@ -75,9 +75,9 @@ if(ENABLE_SSE42) endif() endif() -addVersionDefines(ie_version.cpp CI_BUILD_NUMBER) +addVersionDefines(src/ie_version.cpp CI_BUILD_NUMBER) -set (PUBLIC_HEADERS_DIR "${IE_MAIN_SOURCE_DIR}/include/ie") +set (PUBLIC_HEADERS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include/ie") file (GLOB_RECURSE PUBLIC_HEADERS ${PUBLIC_HEADERS_DIR}/*.hpp @@ -116,7 +116,7 @@ add_library(${TARGET_NAME}_obj OBJECT ${PUBLIC_HEADERS}) ie_faster_build(${TARGET_NAME}_obj - UNITY PCH PRIVATE "precomp.hpp" + UNITY PCH PRIVATE "src/precomp.hpp" ) target_compile_definitions(${TARGET_NAME}_obj PRIVATE IMPLEMENT_INFERENCE_ENGINE_API @@ -128,7 +128,7 @@ target_include_directories(${TARGET_NAME}_obj SYSTEM PRIVATE $ $) -target_include_directories(${TARGET_NAME}_obj PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}" +target_include_directories(${TARGET_NAME}_obj PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/src" "${IE_MAIN_SOURCE_DIR}/src/readers/ir_reader" # for ie_ir_version.hpp $ $ @@ -195,7 +195,7 @@ if (TBBBIND_2_4_FOUND) target_link_libraries(${TARGET_NAME}_s PRIVATE ${TBBBIND_2_4_IMPORTED_TARGETS}) endif() -target_include_directories(${TARGET_NAME}_s PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" +target_include_directories(${TARGET_NAME}_s PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/src" $ "${IE_MAIN_SOURCE_DIR}/src/legacy_api/src") diff --git a/inference-engine/include/ie/cldnn/cldnn_config.hpp b/inference-engine/src/inference_engine/include/ie/cldnn/cldnn_config.hpp similarity index 100% rename from inference-engine/include/ie/cldnn/cldnn_config.hpp rename to inference-engine/src/inference_engine/include/ie/cldnn/cldnn_config.hpp diff --git a/inference-engine/include/ie/cpp/ie_cnn_network.h b/inference-engine/src/inference_engine/include/ie/cpp/ie_cnn_network.h similarity index 100% rename from inference-engine/include/ie/cpp/ie_cnn_network.h rename to inference-engine/src/inference_engine/include/ie/cpp/ie_cnn_network.h diff --git a/inference-engine/include/ie/cpp/ie_executable_network.hpp b/inference-engine/src/inference_engine/include/ie/cpp/ie_executable_network.hpp similarity index 100% rename from inference-engine/include/ie/cpp/ie_executable_network.hpp rename to inference-engine/src/inference_engine/include/ie/cpp/ie_executable_network.hpp diff --git a/inference-engine/include/ie/cpp/ie_infer_request.hpp b/inference-engine/src/inference_engine/include/ie/cpp/ie_infer_request.hpp similarity index 100% rename from inference-engine/include/ie/cpp/ie_infer_request.hpp rename to inference-engine/src/inference_engine/include/ie/cpp/ie_infer_request.hpp diff --git a/inference-engine/include/ie/cpp/ie_memory_state.hpp b/inference-engine/src/inference_engine/include/ie/cpp/ie_memory_state.hpp similarity index 100% rename from inference-engine/include/ie/cpp/ie_memory_state.hpp rename to inference-engine/src/inference_engine/include/ie/cpp/ie_memory_state.hpp diff --git a/inference-engine/include/ie/details/ie_blob_iterator.hpp b/inference-engine/src/inference_engine/include/ie/details/ie_blob_iterator.hpp similarity index 100% rename from inference-engine/include/ie/details/ie_blob_iterator.hpp rename to inference-engine/src/inference_engine/include/ie/details/ie_blob_iterator.hpp diff --git a/inference-engine/include/ie/details/ie_exception.hpp b/inference-engine/src/inference_engine/include/ie/details/ie_exception.hpp similarity index 100% rename from inference-engine/include/ie/details/ie_exception.hpp rename to inference-engine/src/inference_engine/include/ie/details/ie_exception.hpp diff --git a/inference-engine/include/ie/details/ie_pre_allocator.hpp b/inference-engine/src/inference_engine/include/ie/details/ie_pre_allocator.hpp similarity index 100% rename from inference-engine/include/ie/details/ie_pre_allocator.hpp rename to inference-engine/src/inference_engine/include/ie/details/ie_pre_allocator.hpp diff --git a/inference-engine/include/ie/details/ie_so_loader.h b/inference-engine/src/inference_engine/include/ie/details/ie_so_loader.h similarity index 100% rename from inference-engine/include/ie/details/ie_so_loader.h rename to inference-engine/src/inference_engine/include/ie/details/ie_so_loader.h diff --git a/inference-engine/include/ie/details/ie_so_pointer.hpp b/inference-engine/src/inference_engine/include/ie/details/ie_so_pointer.hpp similarity index 100% rename from inference-engine/include/ie/details/ie_so_pointer.hpp rename to inference-engine/src/inference_engine/include/ie/details/ie_so_pointer.hpp diff --git a/inference-engine/include/ie/gna/gna_config.hpp b/inference-engine/src/inference_engine/include/ie/gna/gna_config.hpp similarity index 100% rename from inference-engine/include/ie/gna/gna_config.hpp rename to inference-engine/src/inference_engine/include/ie/gna/gna_config.hpp diff --git a/inference-engine/include/ie/gpu/details/gpu_context_helpers.hpp b/inference-engine/src/inference_engine/include/ie/gpu/details/gpu_context_helpers.hpp similarity index 100% rename from inference-engine/include/ie/gpu/details/gpu_context_helpers.hpp rename to inference-engine/src/inference_engine/include/ie/gpu/details/gpu_context_helpers.hpp diff --git a/inference-engine/include/ie/gpu/gpu_config.hpp b/inference-engine/src/inference_engine/include/ie/gpu/gpu_config.hpp similarity index 100% rename from inference-engine/include/ie/gpu/gpu_config.hpp rename to inference-engine/src/inference_engine/include/ie/gpu/gpu_config.hpp diff --git a/inference-engine/include/ie/gpu/gpu_context_api_dx.hpp b/inference-engine/src/inference_engine/include/ie/gpu/gpu_context_api_dx.hpp similarity index 100% rename from inference-engine/include/ie/gpu/gpu_context_api_dx.hpp rename to inference-engine/src/inference_engine/include/ie/gpu/gpu_context_api_dx.hpp diff --git a/inference-engine/include/ie/gpu/gpu_context_api_ocl.hpp b/inference-engine/src/inference_engine/include/ie/gpu/gpu_context_api_ocl.hpp similarity index 100% rename from inference-engine/include/ie/gpu/gpu_context_api_ocl.hpp rename to inference-engine/src/inference_engine/include/ie/gpu/gpu_context_api_ocl.hpp diff --git a/inference-engine/include/ie/gpu/gpu_context_api_va.hpp b/inference-engine/src/inference_engine/include/ie/gpu/gpu_context_api_va.hpp similarity index 100% rename from inference-engine/include/ie/gpu/gpu_context_api_va.hpp rename to inference-engine/src/inference_engine/include/ie/gpu/gpu_context_api_va.hpp diff --git a/inference-engine/include/ie/gpu/gpu_ocl_wrapper.hpp b/inference-engine/src/inference_engine/include/ie/gpu/gpu_ocl_wrapper.hpp similarity index 100% rename from inference-engine/include/ie/gpu/gpu_ocl_wrapper.hpp rename to inference-engine/src/inference_engine/include/ie/gpu/gpu_ocl_wrapper.hpp diff --git a/inference-engine/include/ie/gpu/gpu_params.hpp b/inference-engine/src/inference_engine/include/ie/gpu/gpu_params.hpp similarity index 100% rename from inference-engine/include/ie/gpu/gpu_params.hpp rename to inference-engine/src/inference_engine/include/ie/gpu/gpu_params.hpp diff --git a/inference-engine/include/ie/hetero/hetero_plugin_config.hpp b/inference-engine/src/inference_engine/include/ie/hetero/hetero_plugin_config.hpp similarity index 100% rename from inference-engine/include/ie/hetero/hetero_plugin_config.hpp rename to inference-engine/src/inference_engine/include/ie/hetero/hetero_plugin_config.hpp diff --git a/inference-engine/include/ie/ie_allocator.hpp b/inference-engine/src/inference_engine/include/ie/ie_allocator.hpp similarity index 100% rename from inference-engine/include/ie/ie_allocator.hpp rename to inference-engine/src/inference_engine/include/ie/ie_allocator.hpp diff --git a/inference-engine/include/ie/ie_api.h b/inference-engine/src/inference_engine/include/ie/ie_api.h similarity index 100% rename from inference-engine/include/ie/ie_api.h rename to inference-engine/src/inference_engine/include/ie/ie_api.h diff --git a/inference-engine/include/ie/ie_blob.h b/inference-engine/src/inference_engine/include/ie/ie_blob.h similarity index 100% rename from inference-engine/include/ie/ie_blob.h rename to inference-engine/src/inference_engine/include/ie/ie_blob.h diff --git a/inference-engine/include/ie/ie_common.h b/inference-engine/src/inference_engine/include/ie/ie_common.h similarity index 100% rename from inference-engine/include/ie/ie_common.h rename to inference-engine/src/inference_engine/include/ie/ie_common.h diff --git a/inference-engine/include/ie/ie_compound_blob.h b/inference-engine/src/inference_engine/include/ie/ie_compound_blob.h similarity index 100% rename from inference-engine/include/ie/ie_compound_blob.h rename to inference-engine/src/inference_engine/include/ie/ie_compound_blob.h diff --git a/inference-engine/include/ie/ie_core.hpp b/inference-engine/src/inference_engine/include/ie/ie_core.hpp similarity index 100% rename from inference-engine/include/ie/ie_core.hpp rename to inference-engine/src/inference_engine/include/ie/ie_core.hpp diff --git a/inference-engine/include/ie/ie_data.h b/inference-engine/src/inference_engine/include/ie/ie_data.h similarity index 100% rename from inference-engine/include/ie/ie_data.h rename to inference-engine/src/inference_engine/include/ie/ie_data.h diff --git a/inference-engine/include/ie/ie_extension.h b/inference-engine/src/inference_engine/include/ie/ie_extension.h similarity index 100% rename from inference-engine/include/ie/ie_extension.h rename to inference-engine/src/inference_engine/include/ie/ie_extension.h diff --git a/inference-engine/include/ie/ie_icnn_network.hpp b/inference-engine/src/inference_engine/include/ie/ie_icnn_network.hpp similarity index 100% rename from inference-engine/include/ie/ie_icnn_network.hpp rename to inference-engine/src/inference_engine/include/ie/ie_icnn_network.hpp diff --git a/inference-engine/include/ie/ie_iexecutable_network.hpp b/inference-engine/src/inference_engine/include/ie/ie_iexecutable_network.hpp similarity index 100% rename from inference-engine/include/ie/ie_iexecutable_network.hpp rename to inference-engine/src/inference_engine/include/ie/ie_iexecutable_network.hpp diff --git a/inference-engine/include/ie/ie_iextension.h b/inference-engine/src/inference_engine/include/ie/ie_iextension.h similarity index 100% rename from inference-engine/include/ie/ie_iextension.h rename to inference-engine/src/inference_engine/include/ie/ie_iextension.h diff --git a/inference-engine/include/ie/ie_iinfer_request.hpp b/inference-engine/src/inference_engine/include/ie/ie_iinfer_request.hpp similarity index 100% rename from inference-engine/include/ie/ie_iinfer_request.hpp rename to inference-engine/src/inference_engine/include/ie/ie_iinfer_request.hpp diff --git a/inference-engine/include/ie/ie_input_info.hpp b/inference-engine/src/inference_engine/include/ie/ie_input_info.hpp similarity index 100% rename from inference-engine/include/ie/ie_input_info.hpp rename to inference-engine/src/inference_engine/include/ie/ie_input_info.hpp diff --git a/inference-engine/include/ie/ie_layouts.h b/inference-engine/src/inference_engine/include/ie/ie_layouts.h similarity index 100% rename from inference-engine/include/ie/ie_layouts.h rename to inference-engine/src/inference_engine/include/ie/ie_layouts.h diff --git a/inference-engine/include/ie/ie_locked_memory.hpp b/inference-engine/src/inference_engine/include/ie/ie_locked_memory.hpp similarity index 100% rename from inference-engine/include/ie/ie_locked_memory.hpp rename to inference-engine/src/inference_engine/include/ie/ie_locked_memory.hpp diff --git a/inference-engine/include/ie/ie_parallel.hpp b/inference-engine/src/inference_engine/include/ie/ie_parallel.hpp similarity index 100% rename from inference-engine/include/ie/ie_parallel.hpp rename to inference-engine/src/inference_engine/include/ie/ie_parallel.hpp diff --git a/inference-engine/include/ie/ie_parameter.hpp b/inference-engine/src/inference_engine/include/ie/ie_parameter.hpp similarity index 100% rename from inference-engine/include/ie/ie_parameter.hpp rename to inference-engine/src/inference_engine/include/ie/ie_parameter.hpp diff --git a/inference-engine/include/ie/ie_plugin_config.hpp b/inference-engine/src/inference_engine/include/ie/ie_plugin_config.hpp similarity index 100% rename from inference-engine/include/ie/ie_plugin_config.hpp rename to inference-engine/src/inference_engine/include/ie/ie_plugin_config.hpp diff --git a/inference-engine/include/ie/ie_precision.hpp b/inference-engine/src/inference_engine/include/ie/ie_precision.hpp similarity index 100% rename from inference-engine/include/ie/ie_precision.hpp rename to inference-engine/src/inference_engine/include/ie/ie_precision.hpp diff --git a/inference-engine/include/ie/ie_preprocess.hpp b/inference-engine/src/inference_engine/include/ie/ie_preprocess.hpp similarity index 100% rename from inference-engine/include/ie/ie_preprocess.hpp rename to inference-engine/src/inference_engine/include/ie/ie_preprocess.hpp diff --git a/inference-engine/include/ie/ie_remote_context.hpp b/inference-engine/src/inference_engine/include/ie/ie_remote_context.hpp similarity index 100% rename from inference-engine/include/ie/ie_remote_context.hpp rename to inference-engine/src/inference_engine/include/ie/ie_remote_context.hpp diff --git a/inference-engine/include/ie/ie_transformations.hpp b/inference-engine/src/inference_engine/include/ie/ie_transformations.hpp similarity index 100% rename from inference-engine/include/ie/ie_transformations.hpp rename to inference-engine/src/inference_engine/include/ie/ie_transformations.hpp diff --git a/inference-engine/include/ie/ie_version.hpp b/inference-engine/src/inference_engine/include/ie/ie_version.hpp similarity index 100% rename from inference-engine/include/ie/ie_version.hpp rename to inference-engine/src/inference_engine/include/ie/ie_version.hpp diff --git a/inference-engine/include/ie/inference_engine.hpp b/inference-engine/src/inference_engine/include/ie/inference_engine.hpp similarity index 100% rename from inference-engine/include/ie/inference_engine.hpp rename to inference-engine/src/inference_engine/include/ie/inference_engine.hpp diff --git a/inference-engine/include/ie/multi-device/multi_device_config.hpp b/inference-engine/src/inference_engine/include/ie/multi-device/multi_device_config.hpp similarity index 100% rename from inference-engine/include/ie/multi-device/multi_device_config.hpp rename to inference-engine/src/inference_engine/include/ie/multi-device/multi_device_config.hpp diff --git a/inference-engine/include/ie/vpu/hddl_config.hpp b/inference-engine/src/inference_engine/include/ie/vpu/hddl_config.hpp similarity index 100% rename from inference-engine/include/ie/vpu/hddl_config.hpp rename to inference-engine/src/inference_engine/include/ie/vpu/hddl_config.hpp diff --git a/inference-engine/include/ie/vpu/hddl_plugin_config.hpp b/inference-engine/src/inference_engine/include/ie/vpu/hddl_plugin_config.hpp similarity index 100% rename from inference-engine/include/ie/vpu/hddl_plugin_config.hpp rename to inference-engine/src/inference_engine/include/ie/vpu/hddl_plugin_config.hpp diff --git a/inference-engine/include/ie/vpu/myriad_config.hpp b/inference-engine/src/inference_engine/include/ie/vpu/myriad_config.hpp similarity index 100% rename from inference-engine/include/ie/vpu/myriad_config.hpp rename to inference-engine/src/inference_engine/include/ie/vpu/myriad_config.hpp diff --git a/inference-engine/include/ie/vpu/myriad_plugin_config.hpp b/inference-engine/src/inference_engine/include/ie/vpu/myriad_plugin_config.hpp similarity index 100% rename from inference-engine/include/ie/vpu/myriad_plugin_config.hpp rename to inference-engine/src/inference_engine/include/ie/vpu/myriad_plugin_config.hpp diff --git a/inference-engine/include/ie/vpu/vpu_config.hpp b/inference-engine/src/inference_engine/include/ie/vpu/vpu_config.hpp similarity index 100% rename from inference-engine/include/ie/vpu/vpu_config.hpp rename to inference-engine/src/inference_engine/include/ie/vpu/vpu_config.hpp diff --git a/inference-engine/include/ie/vpu/vpu_plugin_config.hpp b/inference-engine/src/inference_engine/include/ie/vpu/vpu_plugin_config.hpp similarity index 100% rename from inference-engine/include/ie/vpu/vpu_plugin_config.hpp rename to inference-engine/src/inference_engine/include/ie/vpu/vpu_plugin_config.hpp diff --git a/inference-engine/src/inference_engine/blob_factory.cpp b/inference-engine/src/inference_engine/src/blob_factory.cpp similarity index 100% rename from inference-engine/src/inference_engine/blob_factory.cpp rename to inference-engine/src/inference_engine/src/blob_factory.cpp diff --git a/inference-engine/src/inference_engine/blob_transform.cpp b/inference-engine/src/inference_engine/src/blob_transform.cpp similarity index 100% rename from inference-engine/src/inference_engine/blob_transform.cpp rename to inference-engine/src/inference_engine/src/blob_transform.cpp diff --git a/inference-engine/src/inference_engine/cnn_network_ngraph_impl.cpp b/inference-engine/src/inference_engine/src/cnn_network_ngraph_impl.cpp similarity index 100% rename from inference-engine/src/inference_engine/cnn_network_ngraph_impl.cpp rename to inference-engine/src/inference_engine/src/cnn_network_ngraph_impl.cpp diff --git a/inference-engine/src/inference_engine/cnn_network_ngraph_impl.hpp b/inference-engine/src/inference_engine/src/cnn_network_ngraph_impl.hpp similarity index 100% rename from inference-engine/src/inference_engine/cnn_network_ngraph_impl.hpp rename to inference-engine/src/inference_engine/src/cnn_network_ngraph_impl.hpp diff --git a/inference-engine/src/inference_engine/compilation_context.cpp b/inference-engine/src/inference_engine/src/compilation_context.cpp similarity index 100% rename from inference-engine/src/inference_engine/compilation_context.cpp rename to inference-engine/src/inference_engine/src/compilation_context.cpp diff --git a/inference-engine/src/inference_engine/compilation_context.hpp b/inference-engine/src/inference_engine/src/compilation_context.hpp similarity index 100% rename from inference-engine/src/inference_engine/compilation_context.hpp rename to inference-engine/src/inference_engine/src/compilation_context.hpp diff --git a/inference-engine/src/inference_engine/cpp/exception2status.hpp b/inference-engine/src/inference_engine/src/cpp/exception2status.hpp similarity index 100% rename from inference-engine/src/inference_engine/cpp/exception2status.hpp rename to inference-engine/src/inference_engine/src/cpp/exception2status.hpp diff --git a/inference-engine/src/inference_engine/cpp/ie_cnn_network.cpp b/inference-engine/src/inference_engine/src/cpp/ie_cnn_network.cpp similarity index 100% rename from inference-engine/src/inference_engine/cpp/ie_cnn_network.cpp rename to inference-engine/src/inference_engine/src/cpp/ie_cnn_network.cpp diff --git a/inference-engine/src/inference_engine/cpp/ie_executable_network.cpp b/inference-engine/src/inference_engine/src/cpp/ie_executable_network.cpp similarity index 100% rename from inference-engine/src/inference_engine/cpp/ie_executable_network.cpp rename to inference-engine/src/inference_engine/src/cpp/ie_executable_network.cpp diff --git a/inference-engine/src/inference_engine/cpp/ie_executable_network_base.hpp b/inference-engine/src/inference_engine/src/cpp/ie_executable_network_base.hpp similarity index 100% rename from inference-engine/src/inference_engine/cpp/ie_executable_network_base.hpp rename to inference-engine/src/inference_engine/src/cpp/ie_executable_network_base.hpp diff --git a/inference-engine/src/inference_engine/cpp/ie_infer_async_request_base.hpp b/inference-engine/src/inference_engine/src/cpp/ie_infer_async_request_base.hpp similarity index 100% rename from inference-engine/src/inference_engine/cpp/ie_infer_async_request_base.hpp rename to inference-engine/src/inference_engine/src/cpp/ie_infer_async_request_base.hpp diff --git a/inference-engine/src/inference_engine/cpp/ie_infer_request.cpp b/inference-engine/src/inference_engine/src/cpp/ie_infer_request.cpp similarity index 100% rename from inference-engine/src/inference_engine/cpp/ie_infer_request.cpp rename to inference-engine/src/inference_engine/src/cpp/ie_infer_request.cpp diff --git a/inference-engine/src/inference_engine/cpp/ie_plugin.hpp b/inference-engine/src/inference_engine/src/cpp/ie_plugin.hpp similarity index 100% rename from inference-engine/src/inference_engine/cpp/ie_plugin.hpp rename to inference-engine/src/inference_engine/src/cpp/ie_plugin.hpp diff --git a/inference-engine/src/inference_engine/cpp/ie_variable_state.cpp b/inference-engine/src/inference_engine/src/cpp/ie_variable_state.cpp similarity index 100% rename from inference-engine/src/inference_engine/cpp/ie_variable_state.cpp rename to inference-engine/src/inference_engine/src/cpp/ie_variable_state.cpp diff --git a/inference-engine/src/inference_engine/cpp_interfaces/interface/ie_iexecutable_network_internal.cpp b/inference-engine/src/inference_engine/src/cpp_interfaces/interface/ie_iexecutable_network_internal.cpp similarity index 100% rename from inference-engine/src/inference_engine/cpp_interfaces/interface/ie_iexecutable_network_internal.cpp rename to inference-engine/src/inference_engine/src/cpp_interfaces/interface/ie_iexecutable_network_internal.cpp diff --git a/inference-engine/src/inference_engine/cpp_interfaces/interface/ie_iinfer_request_internal.cpp b/inference-engine/src/inference_engine/src/cpp_interfaces/interface/ie_iinfer_request_internal.cpp similarity index 100% rename from inference-engine/src/inference_engine/cpp_interfaces/interface/ie_iinfer_request_internal.cpp rename to inference-engine/src/inference_engine/src/cpp_interfaces/interface/ie_iinfer_request_internal.cpp diff --git a/inference-engine/src/inference_engine/cpp_interfaces/interface/ie_iplugin_internal.cpp b/inference-engine/src/inference_engine/src/cpp_interfaces/interface/ie_iplugin_internal.cpp similarity index 100% rename from inference-engine/src/inference_engine/cpp_interfaces/interface/ie_iplugin_internal.cpp rename to inference-engine/src/inference_engine/src/cpp_interfaces/interface/ie_iplugin_internal.cpp diff --git a/inference-engine/src/inference_engine/cpp_interfaces/interface/ie_ivariable_state_internal.cpp b/inference-engine/src/inference_engine/src/cpp_interfaces/interface/ie_ivariable_state_internal.cpp similarity index 100% rename from inference-engine/src/inference_engine/cpp_interfaces/interface/ie_ivariable_state_internal.cpp rename to inference-engine/src/inference_engine/src/cpp_interfaces/interface/ie_ivariable_state_internal.cpp diff --git a/inference-engine/src/inference_engine/cpu_x86_sse42/blob_transform_sse42.cpp b/inference-engine/src/inference_engine/src/cpu_x86_sse42/blob_transform_sse42.cpp similarity index 100% rename from inference-engine/src/inference_engine/cpu_x86_sse42/blob_transform_sse42.cpp rename to inference-engine/src/inference_engine/src/cpu_x86_sse42/blob_transform_sse42.cpp diff --git a/inference-engine/src/inference_engine/cpu_x86_sse42/blob_transform_sse42.hpp b/inference-engine/src/inference_engine/src/cpu_x86_sse42/blob_transform_sse42.hpp similarity index 100% rename from inference-engine/src/inference_engine/cpu_x86_sse42/blob_transform_sse42.hpp rename to inference-engine/src/inference_engine/src/cpu_x86_sse42/blob_transform_sse42.hpp diff --git a/inference-engine/src/inference_engine/file_utils.cpp b/inference-engine/src/inference_engine/src/file_utils.cpp similarity index 100% rename from inference-engine/src/inference_engine/file_utils.cpp rename to inference-engine/src/inference_engine/src/file_utils.cpp diff --git a/inference-engine/src/inference_engine/ie_blob_common.cpp b/inference-engine/src/inference_engine/src/ie_blob_common.cpp similarity index 100% rename from inference-engine/src/inference_engine/ie_blob_common.cpp rename to inference-engine/src/inference_engine/src/ie_blob_common.cpp diff --git a/inference-engine/src/inference_engine/ie_cache_guard.cpp b/inference-engine/src/inference_engine/src/ie_cache_guard.cpp similarity index 100% rename from inference-engine/src/inference_engine/ie_cache_guard.cpp rename to inference-engine/src/inference_engine/src/ie_cache_guard.cpp diff --git a/inference-engine/src/inference_engine/ie_cache_guard.hpp b/inference-engine/src/inference_engine/src/ie_cache_guard.hpp similarity index 100% rename from inference-engine/src/inference_engine/ie_cache_guard.hpp rename to inference-engine/src/inference_engine/src/ie_cache_guard.hpp diff --git a/inference-engine/src/inference_engine/ie_cache_manager.hpp b/inference-engine/src/inference_engine/src/ie_cache_manager.hpp similarity index 100% rename from inference-engine/src/inference_engine/ie_cache_manager.hpp rename to inference-engine/src/inference_engine/src/ie_cache_manager.hpp diff --git a/inference-engine/src/inference_engine/ie_common.cpp b/inference-engine/src/inference_engine/src/ie_common.cpp similarity index 100% rename from inference-engine/src/inference_engine/ie_common.cpp rename to inference-engine/src/inference_engine/src/ie_common.cpp diff --git a/inference-engine/src/inference_engine/ie_compound_blob.cpp b/inference-engine/src/inference_engine/src/ie_compound_blob.cpp similarity index 100% rename from inference-engine/src/inference_engine/ie_compound_blob.cpp rename to inference-engine/src/inference_engine/src/ie_compound_blob.cpp diff --git a/inference-engine/src/inference_engine/ie_core.cpp b/inference-engine/src/inference_engine/src/ie_core.cpp similarity index 100% rename from inference-engine/src/inference_engine/ie_core.cpp rename to inference-engine/src/inference_engine/src/ie_core.cpp diff --git a/inference-engine/src/inference_engine/ie_data.cpp b/inference-engine/src/inference_engine/src/ie_data.cpp similarity index 100% rename from inference-engine/src/inference_engine/ie_data.cpp rename to inference-engine/src/inference_engine/src/ie_data.cpp diff --git a/inference-engine/src/inference_engine/ie_itt.hpp b/inference-engine/src/inference_engine/src/ie_itt.hpp similarity index 100% rename from inference-engine/src/inference_engine/ie_itt.hpp rename to inference-engine/src/inference_engine/src/ie_itt.hpp diff --git a/inference-engine/src/inference_engine/ie_layouts.cpp b/inference-engine/src/inference_engine/src/ie_layouts.cpp similarity index 100% rename from inference-engine/src/inference_engine/ie_layouts.cpp rename to inference-engine/src/inference_engine/src/ie_layouts.cpp diff --git a/inference-engine/src/inference_engine/ie_memcpy.cpp b/inference-engine/src/inference_engine/src/ie_memcpy.cpp similarity index 100% rename from inference-engine/src/inference_engine/ie_memcpy.cpp rename to inference-engine/src/inference_engine/src/ie_memcpy.cpp diff --git a/inference-engine/src/inference_engine/ie_network_reader.cpp b/inference-engine/src/inference_engine/src/ie_network_reader.cpp similarity index 100% rename from inference-engine/src/inference_engine/ie_network_reader.cpp rename to inference-engine/src/inference_engine/src/ie_network_reader.cpp diff --git a/inference-engine/src/inference_engine/ie_network_reader.hpp b/inference-engine/src/inference_engine/src/ie_network_reader.hpp similarity index 100% rename from inference-engine/src/inference_engine/ie_network_reader.hpp rename to inference-engine/src/inference_engine/src/ie_network_reader.hpp diff --git a/inference-engine/src/inference_engine/ie_ngraph_utils.cpp b/inference-engine/src/inference_engine/src/ie_ngraph_utils.cpp similarity index 100% rename from inference-engine/src/inference_engine/ie_ngraph_utils.cpp rename to inference-engine/src/inference_engine/src/ie_ngraph_utils.cpp diff --git a/inference-engine/src/inference_engine/ie_system_conf.cpp b/inference-engine/src/inference_engine/src/ie_system_conf.cpp similarity index 100% rename from inference-engine/src/inference_engine/ie_system_conf.cpp rename to inference-engine/src/inference_engine/src/ie_system_conf.cpp diff --git a/inference-engine/src/inference_engine/ie_transformations.cpp b/inference-engine/src/inference_engine/src/ie_transformations.cpp similarity index 100% rename from inference-engine/src/inference_engine/ie_transformations.cpp rename to inference-engine/src/inference_engine/src/ie_transformations.cpp diff --git a/inference-engine/src/inference_engine/ie_version.cpp b/inference-engine/src/inference_engine/src/ie_version.cpp similarity index 100% rename from inference-engine/src/inference_engine/ie_version.cpp rename to inference-engine/src/inference_engine/src/ie_version.cpp diff --git a/inference-engine/src/inference_engine/os/lin/lin_shared_object_loader.cpp b/inference-engine/src/inference_engine/src/os/lin/lin_shared_object_loader.cpp similarity index 100% rename from inference-engine/src/inference_engine/os/lin/lin_shared_object_loader.cpp rename to inference-engine/src/inference_engine/src/os/lin/lin_shared_object_loader.cpp diff --git a/inference-engine/src/inference_engine/os/lin/lin_system_conf.cpp b/inference-engine/src/inference_engine/src/os/lin/lin_system_conf.cpp similarity index 100% rename from inference-engine/src/inference_engine/os/lin/lin_system_conf.cpp rename to inference-engine/src/inference_engine/src/os/lin/lin_system_conf.cpp diff --git a/inference-engine/src/inference_engine/os/win/win_shared_object_loader.cpp b/inference-engine/src/inference_engine/src/os/win/win_shared_object_loader.cpp similarity index 100% rename from inference-engine/src/inference_engine/os/win/win_shared_object_loader.cpp rename to inference-engine/src/inference_engine/src/os/win/win_shared_object_loader.cpp diff --git a/inference-engine/src/inference_engine/os/win/win_system_conf.cpp b/inference-engine/src/inference_engine/src/os/win/win_system_conf.cpp similarity index 100% rename from inference-engine/src/inference_engine/os/win/win_system_conf.cpp rename to inference-engine/src/inference_engine/src/os/win/win_system_conf.cpp diff --git a/inference-engine/src/inference_engine/precision_utils.cpp b/inference-engine/src/inference_engine/src/precision_utils.cpp similarity index 100% rename from inference-engine/src/inference_engine/precision_utils.cpp rename to inference-engine/src/inference_engine/src/precision_utils.cpp diff --git a/inference-engine/src/inference_engine/precomp.hpp b/inference-engine/src/inference_engine/src/precomp.hpp similarity index 100% rename from inference-engine/src/inference_engine/precomp.hpp rename to inference-engine/src/inference_engine/src/precomp.hpp diff --git a/inference-engine/src/inference_engine/system_allocator.cpp b/inference-engine/src/inference_engine/src/system_allocator.cpp similarity index 100% rename from inference-engine/src/inference_engine/system_allocator.cpp rename to inference-engine/src/inference_engine/src/system_allocator.cpp diff --git a/inference-engine/src/inference_engine/system_allocator.hpp b/inference-engine/src/inference_engine/src/system_allocator.hpp similarity index 100% rename from inference-engine/src/inference_engine/system_allocator.hpp rename to inference-engine/src/inference_engine/src/system_allocator.hpp diff --git a/inference-engine/src/inference_engine/threading/ie_cpu_streams_executor.cpp b/inference-engine/src/inference_engine/src/threading/ie_cpu_streams_executor.cpp similarity index 100% rename from inference-engine/src/inference_engine/threading/ie_cpu_streams_executor.cpp rename to inference-engine/src/inference_engine/src/threading/ie_cpu_streams_executor.cpp diff --git a/inference-engine/src/inference_engine/threading/ie_executor_manager.cpp b/inference-engine/src/inference_engine/src/threading/ie_executor_manager.cpp similarity index 100% rename from inference-engine/src/inference_engine/threading/ie_executor_manager.cpp rename to inference-engine/src/inference_engine/src/threading/ie_executor_manager.cpp diff --git a/inference-engine/src/inference_engine/threading/ie_istreams_executor.cpp b/inference-engine/src/inference_engine/src/threading/ie_istreams_executor.cpp similarity index 100% rename from inference-engine/src/inference_engine/threading/ie_istreams_executor.cpp rename to inference-engine/src/inference_engine/src/threading/ie_istreams_executor.cpp diff --git a/inference-engine/src/inference_engine/threading/ie_itask_executor.cpp b/inference-engine/src/inference_engine/src/threading/ie_itask_executor.cpp similarity index 100% rename from inference-engine/src/inference_engine/threading/ie_itask_executor.cpp rename to inference-engine/src/inference_engine/src/threading/ie_itask_executor.cpp diff --git a/inference-engine/src/inference_engine/threading/ie_parallel_custom_arena.cpp b/inference-engine/src/inference_engine/src/threading/ie_parallel_custom_arena.cpp similarity index 100% rename from inference-engine/src/inference_engine/threading/ie_parallel_custom_arena.cpp rename to inference-engine/src/inference_engine/src/threading/ie_parallel_custom_arena.cpp diff --git a/inference-engine/src/inference_engine/threading/ie_parallel_custom_arena.hpp b/inference-engine/src/inference_engine/src/threading/ie_parallel_custom_arena.hpp similarity index 100% rename from inference-engine/src/inference_engine/threading/ie_parallel_custom_arena.hpp rename to inference-engine/src/inference_engine/src/threading/ie_parallel_custom_arena.hpp diff --git a/inference-engine/src/inference_engine/threading/ie_thread_affinity.cpp b/inference-engine/src/inference_engine/src/threading/ie_thread_affinity.cpp similarity index 100% rename from inference-engine/src/inference_engine/threading/ie_thread_affinity.cpp rename to inference-engine/src/inference_engine/src/threading/ie_thread_affinity.cpp diff --git a/inference-engine/src/inference_engine/threading/ie_thread_affinity.hpp b/inference-engine/src/inference_engine/src/threading/ie_thread_affinity.hpp similarity index 100% rename from inference-engine/src/inference_engine/threading/ie_thread_affinity.hpp rename to inference-engine/src/inference_engine/src/threading/ie_thread_affinity.hpp diff --git a/inference-engine/src/inference_engine/xml_parse_utils.cpp b/inference-engine/src/inference_engine/src/xml_parse_utils.cpp similarity index 100% rename from inference-engine/src/inference_engine/xml_parse_utils.cpp rename to inference-engine/src/inference_engine/src/xml_parse_utils.cpp diff --git a/inference-engine/src/legacy_api/CMakeLists.txt b/inference-engine/src/legacy_api/CMakeLists.txt index 28afe337e38..9de8bf16910 100644 --- a/inference-engine/src/legacy_api/CMakeLists.txt +++ b/inference-engine/src/legacy_api/CMakeLists.txt @@ -39,7 +39,7 @@ target_compile_definitions(${TARGET_NAME}_obj PRIVATE IMPLEMENT_INFERENCE_ENGINE target_include_directories(${TARGET_NAME}_obj PRIVATE ${PUBLIC_HEADERS_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src - ${IE_MAIN_SOURCE_DIR}/src/inference_engine # For CNNNetworkNGraphImpl + ${IE_MAIN_SOURCE_DIR}/src/inference_engine/src # For CNNNetworkNGraphImpl $ $ $ diff --git a/inference-engine/tests/functional/inference_engine/CMakeLists.txt b/inference-engine/tests/functional/inference_engine/CMakeLists.txt index a277a0c3eb8..6b556455897 100644 --- a/inference-engine/tests/functional/inference_engine/CMakeLists.txt +++ b/inference-engine/tests/functional/inference_engine/CMakeLists.txt @@ -4,7 +4,7 @@ set(TARGET_NAME ieFuncTests) -set(INCLUDES ${IE_MAIN_SOURCE_DIR}/src/inference_engine) +set(INCLUDES ${IE_MAIN_SOURCE_DIR}/src/inference_engine/src) set(LINK_LIBRARIES gmock @@ -110,7 +110,7 @@ function(ie_headers_compilation_with_custom_flags) cmake_parse_arguments(IE_TEST "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) if(IE_TEST_PLUGIN_API) - set(IE_TEST_INCLUDE_DIRECTORY + set(IE_TEST_INCLUDE_DIRECTORY $) else() set(IE_TEST_INCLUDE_DIRECTORY diff --git a/inference-engine/tests/ie_test_utils/functional_test_utils/include/functional_test_utils/precision_utils.hpp b/inference-engine/tests/ie_test_utils/functional_test_utils/include/functional_test_utils/precision_utils.hpp index ff7ba66412f..6cec9ea30e9 100644 --- a/inference-engine/tests/ie_test_utils/functional_test_utils/include/functional_test_utils/precision_utils.hpp +++ b/inference-engine/tests/ie_test_utils/functional_test_utils/include/functional_test_utils/precision_utils.hpp @@ -13,7 +13,7 @@ namespace FuncTestUtils { namespace PrecisionUtils { -// Copied from inference-engine/src/inference_engine/ie_ngraph_utils.hpp +// Copied from inference-engine/src/inference_engine/src/ie_ngraph_utils.hpp inline ::ngraph::element::Type convertIE2nGraphPrc(const InferenceEngine::Precision& precision) { InferenceEngine::Precision::ePrecision pType = precision; switch (pType) { diff --git a/inference-engine/tests_deprecated/behavior/vpu/CMakeLists.txt b/inference-engine/tests_deprecated/behavior/vpu/CMakeLists.txt index 848a17c4367..a2956a887dd 100644 --- a/inference-engine/tests_deprecated/behavior/vpu/CMakeLists.txt +++ b/inference-engine/tests_deprecated/behavior/vpu/CMakeLists.txt @@ -57,7 +57,7 @@ function(enable_vpu TARGET_NAME FLAG_NAME PLUGIN_NAME) target_include_directories(${TARGET_NAME} PRIVATE $ ${CMAKE_CURRENT_SOURCE_DIR}/myriad_tests - ${IE_MAIN_SOURCE_DIR}/src/inference_engine + ${IE_MAIN_SOURCE_DIR}/src/inference_engine/src ${XLINK_INCLUDE} ${XLINK_PLATFORM_INCLUDE}) target_link_libraries(${TARGET_NAME} PRIVATE mvnc)