Moved current IE API to separate folder (openvinotoolkit#6735)

* Moved current IE API to separate folder * Fix install * Fix documentation * Fixed install path * Try to fix CI * Changed installation path * Use ONNXRuntime rel-1.8.1 version
andrei-cv · Aug 30, 2021 · ab0caa5 · ab0caa5
1 parent e92515e
commit ab0caa5
Show file tree

Hide file tree

Showing 56 changed files with 15 additions and 15 deletions.
diff --git a/.ci/azure/ci_utils/onnxruntime/version b/.ci/azure/ci_utils/onnxruntime/version
@@ -1 +1 @@
-rel-1.7.1
+rel-1.8.1
diff --git a/.ci/azure/linux_onnxruntime.yml b/.ci/azure/linux_onnxruntime.yml
@@ -16,7 +16,7 @@ jobs:
     WORK_DIR: $(Pipeline.Workspace)/_w
     MODELS_DIR: /mount/cinfsshare/onnxtestdata
     TMP_DIR: /mnt/tmp
-    INSTALL_DIR: $(WORK_DIR)/install_pkg
+    INSTALL_DIR: $(WORK_DIR)/install_pkg/openvino
     BUILD_DIR: $(WORK_DIR)/build
     ONNXRUNTIME_UTILS: $(REPO_DIR)/.ci/azure/ci_utils/onnxruntime
     ONNXRUNTIME_BUILD_DIR: $(ONNXRUNTIME_REPO_DIR)/build
@@ -29,6 +29,7 @@ jobs:
       echo Python info ; which python ; python --version
       echo Java info ; which java ; java -version
       echo gcc info ; which gcc ; gcc --version
+      echo cmake info ; which cmake ; cmake --version
       lsb_release
       env
       cat /proc/cpuinfo
@@ -113,7 +114,6 @@ jobs:
 
   - script: |
       source $(INSTALL_DIR)/bin/setupvars.sh
-      echo "2021.2" > $(INSTALL_DIR)/deployment_tools/inference_engine/version.txt
       CXXFLAGS="-Wno-error=deprecated-declarations" ./build.sh --config RelWithDebInfo --use_openvino CPU_FP32 --build_shared_lib --parallel --skip_tests --build_dir $(ONNXRUNTIME_BUILD_DIR)
     workingDirectory: $(ONNXRUNTIME_REPO_DIR)
     displayName: 'Build ONNX Runtime'

diff --git 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_version.hpp")
+        set(ie_version_hpp "${OpenVINO_SOURCE_DIR}/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
@@ -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_parallel.hpp
-inference-engine/include/ie_plugin_config.hpp
-inference-engine/include/vpu/myriad_config.hpp
-inference-engine/include/vpu/vpu_config.hpp
-inference-engine/include/vpu/vpu_plugin_config.hpp
+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
diff --git a/inference-engine/ie_bridges/c/src/CMakeLists.txt b/inference-engine/ie_bridges/c/src/CMakeLists.txt
@@ -14,7 +14,7 @@ add_library(${TARGET_NAME} SHARED ${HEADERS} ${SOURCES})
 target_link_libraries(${TARGET_NAME} PRIVATE inference_engine)
 
 target_include_directories(${TARGET_NAME} PUBLIC
-    $<INSTALL_INTERFACE:${IE_CPACK_IE_DIR}/include>
+    $<INSTALL_INTERFACE:${IE_CPACK_IE_DIR}/include/ie>
     $<BUILD_INTERFACE:${InferenceEngine_C_API_SOURCE_DIR}/include>)
 
 add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME})
@@ -40,5 +40,5 @@ install(TARGETS ${TARGET_NAME} EXPORT InferenceEngineTargets
         LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core_c)
 
 install(DIRECTORY ${InferenceEngine_C_API_SOURCE_DIR}/include/
-        DESTINATION ${IE_CPACK_IE_DIR}/include
+        DESTINATION ${IE_CPACK_IE_DIR}/include/ie
         COMPONENT core_c_dev)
diff --git a/...nce-engine/include/cldnn/cldnn_config.hpp → ...-engine/include/ie/cldnn/cldnn_config.hpp b/...nce-engine/include/cldnn/cldnn_config.hpp → ...-engine/include/ie/cldnn/cldnn_config.hpp
diff --git a/...rence-engine/include/cpp/ie_cnn_network.h → ...ce-engine/include/ie/cpp/ie_cnn_network.h b/...rence-engine/include/cpp/ie_cnn_network.h → ...ce-engine/include/ie/cpp/ie_cnn_network.h
diff --git a/...ine/include/cpp/ie_executable_network.hpp → .../include/ie/cpp/ie_executable_network.hpp b/...ine/include/cpp/ie_executable_network.hpp → .../include/ie/cpp/ie_executable_network.hpp
diff --git a/...e-engine/include/cpp/ie_infer_request.hpp → ...ngine/include/ie/cpp/ie_infer_request.hpp b/...e-engine/include/cpp/ie_infer_request.hpp → ...ngine/include/ie/cpp/ie_infer_request.hpp
diff --git a/...ce-engine/include/cpp/ie_memory_state.hpp → ...engine/include/ie/cpp/ie_memory_state.hpp b/...ce-engine/include/cpp/ie_memory_state.hpp → ...engine/include/ie/cpp/ie_memory_state.hpp
diff --git a/...gine/include/details/ie_blob_iterator.hpp → ...e/include/ie/details/ie_blob_iterator.hpp b/...gine/include/details/ie_blob_iterator.hpp → ...e/include/ie/details/ie_blob_iterator.hpp
diff --git a/...e-engine/include/details/ie_exception.hpp → ...ngine/include/ie/details/ie_exception.hpp b/...e-engine/include/details/ie_exception.hpp → ...ngine/include/ie/details/ie_exception.hpp
diff --git a/...gine/include/details/ie_pre_allocator.hpp → ...e/include/ie/details/ie_pre_allocator.hpp b/...gine/include/details/ie_pre_allocator.hpp → ...e/include/ie/details/ie_pre_allocator.hpp
diff --git a/...nce-engine/include/details/ie_so_loader.h → ...-engine/include/ie/details/ie_so_loader.h b/...nce-engine/include/details/ie_so_loader.h → ...-engine/include/ie/details/ie_so_loader.h
diff --git a/...-engine/include/details/ie_so_pointer.hpp → ...gine/include/ie/details/ie_so_pointer.hpp b/...-engine/include/details/ie_so_pointer.hpp → ...gine/include/ie/details/ie_so_pointer.hpp
diff --git a/inference-engine/include/gna/gna_config.hpp → ...ence-engine/include/ie/gna/gna_config.hpp b/inference-engine/include/gna/gna_config.hpp → ...ence-engine/include/ie/gna/gna_config.hpp
diff --git a/...clude/gpu/details/gpu_context_helpers.hpp → ...de/ie/gpu/details/gpu_context_helpers.hpp b/...clude/gpu/details/gpu_context_helpers.hpp → ...de/ie/gpu/details/gpu_context_helpers.hpp
diff --git a/inference-engine/include/gpu/gpu_config.hpp → ...ence-engine/include/ie/gpu/gpu_config.hpp b/inference-engine/include/gpu/gpu_config.hpp → ...ence-engine/include/ie/gpu/gpu_config.hpp
diff --git a/...engine/include/gpu/gpu_context_api_dx.hpp → ...ine/include/ie/gpu/gpu_context_api_dx.hpp b/...engine/include/gpu/gpu_context_api_dx.hpp → ...ine/include/ie/gpu/gpu_context_api_dx.hpp
diff --git a/...ngine/include/gpu/gpu_context_api_ocl.hpp → ...ne/include/ie/gpu/gpu_context_api_ocl.hpp b/...ngine/include/gpu/gpu_context_api_ocl.hpp → ...ne/include/ie/gpu/gpu_context_api_ocl.hpp
diff --git a/...engine/include/gpu/gpu_context_api_va.hpp → ...ine/include/ie/gpu/gpu_context_api_va.hpp b/...engine/include/gpu/gpu_context_api_va.hpp → ...ine/include/ie/gpu/gpu_context_api_va.hpp
diff --git a/...ce-engine/include/gpu/gpu_ocl_wrapper.hpp → ...engine/include/ie/gpu/gpu_ocl_wrapper.hpp b/...ce-engine/include/gpu/gpu_ocl_wrapper.hpp → ...engine/include/ie/gpu/gpu_ocl_wrapper.hpp
diff --git a/inference-engine/include/gpu/gpu_params.hpp → ...ence-engine/include/ie/gpu/gpu_params.hpp b/inference-engine/include/gpu/gpu_params.hpp → ...ence-engine/include/ie/gpu/gpu_params.hpp
diff --git a/...e/include/hetero/hetero_plugin_config.hpp → ...nclude/ie/hetero/hetero_plugin_config.hpp b/...e/include/hetero/hetero_plugin_config.hpp → ...nclude/ie/hetero/hetero_plugin_config.hpp
diff --git a/inference-engine/include/ie_allocator.hpp → inference-engine/include/ie/ie_allocator.hpp b/inference-engine/include/ie_allocator.hpp → inference-engine/include/ie/ie_allocator.hpp
diff --git a/inference-engine/include/ie_api.h → inference-engine/include/ie/ie_api.h b/inference-engine/include/ie_api.h → inference-engine/include/ie/ie_api.h
diff --git a/inference-engine/include/ie_blob.h → inference-engine/include/ie/ie_blob.h b/inference-engine/include/ie_blob.h → inference-engine/include/ie/ie_blob.h
diff --git a/inference-engine/include/ie_common.h → inference-engine/include/ie/ie_common.h b/inference-engine/include/ie_common.h → inference-engine/include/ie/ie_common.h
diff --git a/inference-engine/include/ie_compound_blob.h → ...ence-engine/include/ie/ie_compound_blob.h b/inference-engine/include/ie_compound_blob.h → ...ence-engine/include/ie/ie_compound_blob.h
diff --git a/inference-engine/include/ie_core.hpp → inference-engine/include/ie/ie_core.hpp b/inference-engine/include/ie_core.hpp → inference-engine/include/ie/ie_core.hpp
diff --git a/inference-engine/include/ie_data.h → inference-engine/include/ie/ie_data.h b/inference-engine/include/ie_data.h → inference-engine/include/ie/ie_data.h
diff --git a/inference-engine/include/ie_extension.h → inference-engine/include/ie/ie_extension.h b/inference-engine/include/ie_extension.h → inference-engine/include/ie/ie_extension.h
diff --git a/inference-engine/include/ie_icnn_network.hpp → ...nce-engine/include/ie/ie_icnn_network.hpp b/inference-engine/include/ie_icnn_network.hpp → ...nce-engine/include/ie/ie_icnn_network.hpp
diff --git a/...engine/include/ie_iexecutable_network.hpp → ...ine/include/ie/ie_iexecutable_network.hpp b/...engine/include/ie_iexecutable_network.hpp → ...ine/include/ie/ie_iexecutable_network.hpp
diff --git a/inference-engine/include/ie_iextension.h → inference-engine/include/ie/ie_iextension.h b/inference-engine/include/ie_iextension.h → inference-engine/include/ie/ie_iextension.h
diff --git a/...ence-engine/include/ie_iinfer_request.hpp → ...e-engine/include/ie/ie_iinfer_request.hpp b/...ence-engine/include/ie_iinfer_request.hpp → ...e-engine/include/ie/ie_iinfer_request.hpp
diff --git a/inference-engine/include/ie_input_info.hpp → ...rence-engine/include/ie/ie_input_info.hpp b/inference-engine/include/ie_input_info.hpp → ...rence-engine/include/ie/ie_input_info.hpp
diff --git a/inference-engine/include/ie_layouts.h → inference-engine/include/ie/ie_layouts.h b/inference-engine/include/ie_layouts.h → inference-engine/include/ie/ie_layouts.h
diff --git a/...rence-engine/include/ie_locked_memory.hpp → ...ce-engine/include/ie/ie_locked_memory.hpp b/...rence-engine/include/ie_locked_memory.hpp → ...ce-engine/include/ie/ie_locked_memory.hpp
diff --git a/inference-engine/include/ie_parallel.hpp → inference-engine/include/ie/ie_parallel.hpp b/inference-engine/include/ie_parallel.hpp → inference-engine/include/ie/ie_parallel.hpp
diff --git a/inference-engine/include/ie_parameter.hpp → inference-engine/include/ie/ie_parameter.hpp b/inference-engine/include/ie_parameter.hpp → inference-engine/include/ie/ie_parameter.hpp
diff --git a/...rence-engine/include/ie_plugin_config.hpp → ...ce-engine/include/ie/ie_plugin_config.hpp b/...rence-engine/include/ie_plugin_config.hpp → ...ce-engine/include/ie/ie_plugin_config.hpp
diff --git a/inference-engine/include/ie_precision.hpp → inference-engine/include/ie/ie_precision.hpp b/inference-engine/include/ie_precision.hpp → inference-engine/include/ie/ie_precision.hpp
diff --git a/inference-engine/include/ie_preprocess.hpp → ...rence-engine/include/ie/ie_preprocess.hpp b/inference-engine/include/ie_preprocess.hpp → ...rence-engine/include/ie/ie_preprocess.hpp
diff --git a/...ence-engine/include/ie_remote_context.hpp → ...e-engine/include/ie/ie_remote_context.hpp b/...ence-engine/include/ie_remote_context.hpp → ...e-engine/include/ie/ie_remote_context.hpp
diff --git a/...nce-engine/include/ie_transformations.hpp → ...-engine/include/ie/ie_transformations.hpp b/...nce-engine/include/ie_transformations.hpp → ...-engine/include/ie/ie_transformations.hpp
diff --git a/inference-engine/include/ie_version.hpp → inference-engine/include/ie/ie_version.hpp b/inference-engine/include/ie_version.hpp → inference-engine/include/ie/ie_version.hpp
diff --git a/...rence-engine/include/inference_engine.hpp → ...ce-engine/include/ie/inference_engine.hpp b/...rence-engine/include/inference_engine.hpp → ...ce-engine/include/ie/inference_engine.hpp
diff --git a/...lude/multi-device/multi_device_config.hpp → ...e/ie/multi-device/multi_device_config.hpp b/...lude/multi-device/multi_device_config.hpp → ...e/ie/multi-device/multi_device_config.hpp
diff --git a/inference-engine/include/vpu/hddl_config.hpp → ...nce-engine/include/ie/vpu/hddl_config.hpp b/inference-engine/include/vpu/hddl_config.hpp → ...nce-engine/include/ie/vpu/hddl_config.hpp
diff --git a/...engine/include/vpu/hddl_plugin_config.hpp → ...ine/include/ie/vpu/hddl_plugin_config.hpp b/...engine/include/vpu/hddl_plugin_config.hpp → ...ine/include/ie/vpu/hddl_plugin_config.hpp
diff --git a/...ence-engine/include/vpu/myriad_config.hpp → ...e-engine/include/ie/vpu/myriad_config.hpp b/...ence-engine/include/vpu/myriad_config.hpp → ...e-engine/include/ie/vpu/myriad_config.hpp
diff --git a/...gine/include/vpu/myriad_plugin_config.hpp → ...e/include/ie/vpu/myriad_plugin_config.hpp b/...gine/include/vpu/myriad_plugin_config.hpp → ...e/include/ie/vpu/myriad_plugin_config.hpp
diff --git a/inference-engine/include/vpu/vpu_config.hpp → ...ence-engine/include/ie/vpu/vpu_config.hpp b/inference-engine/include/vpu/vpu_config.hpp → ...ence-engine/include/ie/vpu/vpu_config.hpp
diff --git a/...-engine/include/vpu/vpu_plugin_config.hpp → ...gine/include/ie/vpu/vpu_plugin_config.hpp b/...-engine/include/vpu/vpu_plugin_config.hpp → ...gine/include/ie/vpu/vpu_plugin_config.hpp
diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt
@@ -77,7 +77,7 @@ endif()
 
 addVersionDefines(ie_version.cpp CI_BUILD_NUMBER)
 
-set (PUBLIC_HEADERS_DIR "${IE_MAIN_SOURCE_DIR}/include")
+set (PUBLIC_HEADERS_DIR "${IE_MAIN_SOURCE_DIR}/include/ie")
 
 file (GLOB_RECURSE PUBLIC_HEADERS
        ${PUBLIC_HEADERS_DIR}/*.hpp
@@ -167,7 +167,7 @@ target_link_libraries(${TARGET_NAME} PRIVATE pugixml::static openvino::itt ${CMA
 
 target_include_directories(${TARGET_NAME} INTERFACE
             $<BUILD_INTERFACE:${PUBLIC_HEADERS_DIR}>
-            $<INSTALL_INTERFACE:${IE_CPACK_IE_DIR}/include>
+            $<INSTALL_INTERFACE:${IE_CPACK_IE_DIR}/include/ie>
     PRIVATE $<TARGET_PROPERTY:${TARGET_NAME}_plugin_api,INTERFACE_INCLUDE_DIRECTORIES>
             $<TARGET_PROPERTY:${TARGET_NAME}_legacy,INTERFACE_INCLUDE_DIRECTORIES>)
 
@@ -269,7 +269,7 @@ endif()
 ie_cpack_add_component(core REQUIRED DEPENDS ${core_components})
 ie_cpack_add_component(core_dev REQUIRED core ngraph_dev)
 
-install(DIRECTORY "${PUBLIC_HEADERS_DIR}" DESTINATION ${IE_CPACK_IE_DIR}
+install(DIRECTORY "${PUBLIC_HEADERS_DIR}" DESTINATION ${IE_CPACK_IE_DIR}/include
         COMPONENT core_dev)
 
 install(TARGETS ${TARGET_NAME} EXPORT InferenceEngineTargets
@@ -307,7 +307,7 @@ configure_package_config_file("${OpenVINO_SOURCE_DIR}/cmake/templates/InferenceE
                                INSTALL_DESTINATION "${CMAKE_INSTALL_PREFIX}"
                                PATH_VARS ${PATH_VARS})
 
-set(IE_INCLUDE_DIR "include")
+set(IE_INCLUDE_DIR "include/ie")
 set(IE_NGRAPH_DIR "../ngraph/cmake")
 set(IE_TBB_DIR "${IE_TBB_DIR_INSTALL}")
 set(IE_PARALLEL_CMAKE "share/ie_parallel.cmake")