Removed IE and ngraph headers / cmake interfaces from package (openvinotoolkit#22203)

* Revert "Revert IE cmake config back"

* Update src/cmake/openvino.cmake

* Fixed for NVIDIA plugin

* Fixed tests compilation

* Use ilya's contrib repo

* Fixes for ONNX Runtime tests

* Use custom nVIDIA repo

* Disable ONNX Runtime

Author: ilya-lavrenov

.github/workflows/job_onnx_runtime.yml

@@ -80,7 +80,10 @@ jobs:
           popd
 
       - name: Install OpenVINO dependencies
-        run: ${INSTALL_DIR}/install_dependencies/install_openvino_dependencies.sh -c=core -c=dev -y
+        run: |
+          ${INSTALL_DIR}/install_dependencies/install_openvino_dependencies.sh -c=core -c=dev -y
+          # since we are on Ubuntu 22.04, but compiled OpenVINO on Ubuntu 20.04, we need to install `libtbb2`
+          apt-get install --assume-yes --no-install-recommends libtbb2
 
       - name: Clone ONNX Runtime
         run: |
@@ -139,13 +142,6 @@ jobs:
           ./onnxruntime_global_thread_pools_test
         working-directory: ${{ env.ONNX_RUNTIME_BUILD_DIR }}/RelWithDebInfo/RelWithDebInfo
 
-#      Test removed in onnxruntime 1.16.2 
-#      - name: Run onnxruntime_api_tests_without_env
-#        run: |
-#          source ${INSTALL_DIR}/setupvars.sh
-#          ./onnxruntime_api_tests_without_env
-#        working-directory: ${{ env.ONNX_RUNTIME_BUILD_DIR }}/RelWithDebInfo/RelWithDebInfo
-
       - name: Run pytorch-converted tests
         run: |
           source ${INSTALL_DIR}/setupvars.sh

.github/workflows/linux.yml

@@ -407,14 +407,16 @@ jobs:
 
   ONNX_Runtime:
     name: ONNX Runtime Integration
-    if: fromJSON(needs.smart_ci.outputs.affected_components).ONNX_RT ||
-        fromJSON(needs.smart_ci.outputs.affected_components).ONNX_FE
+    # Enable back once https://github.com/microsoft/onnxruntime/pull/19184 is merged
+    if: ${{ 'false' }}
+    # if: fromJSON(needs.smart_ci.outputs.affected_components).ONNX_RT ||
+    #     fromJSON(needs.smart_ci.outputs.affected_components).ONNX_FE
     needs: [ Build, Smart_CI ]
     uses: ./.github/workflows/job_onnx_runtime.yml
     with:
       runner: 'aks-linux-16-cores-32gb'
-      container: '{"image": "openvinogithubactions.azurecr.io/dockerhub/ubuntu:20.04", "volumes": ["/mount:/mount"], "options": "-e SCCACHE_AZURE_BLOB_CONTAINER -e SCCACHE_AZURE_CONNECTION_STRING"}'
-      sccache-azure-key-prefix: 'ubuntu20_x86_64_onnxruntime'
+      container: '{"image": "openvinogithubactions.azurecr.io/dockerhub/ubuntu:22.04", "volumes": ["/mount:/mount"], "options": "-e SCCACHE_AZURE_BLOB_CONTAINER -e SCCACHE_AZURE_CONNECTION_STRING"}'
+      sccache-azure-key-prefix: 'ubuntu22_x86_64_onnxruntime'
 
   ONNX_Models:
     name: ONNX Models Tests

.github/workflows/linux_arm64.yml

@@ -308,14 +308,16 @@ jobs:
 
   ONNX_Runtime:
     name: ONNX Runtime Integration
-    if: fromJSON(needs.smart_ci.outputs.affected_components).ONNX_RT ||
-        fromJSON(needs.smart_ci.outputs.affected_components).ONNX_FE
+    # Enable back once https://github.com/microsoft/onnxruntime/pull/19184 is merged
+    if: ${{ 'false' }}
+    # if: fromJSON(needs.smart_ci.outputs.affected_components).ONNX_RT ||
+    #     fromJSON(needs.smart_ci.outputs.affected_components).ONNX_FE
     needs: [ Build, Smart_CI ]
     uses: ./.github/workflows/job_onnx_runtime.yml
     with:
       runner: 'aks-linux-16-cores-arm'
-      container: '{"image": "openvinogithubactions.azurecr.io/dockerhub/ubuntu:20.04", "volumes": ["/mount:/mount"], "options": "-e SCCACHE_AZURE_BLOB_CONTAINER -e SCCACHE_AZURE_CONNECTION_STRING"}'
-      sccache-azure-key-prefix: 'ubuntu20_aarch64_onnxruntime'
+      container: '{"image": "openvinogithubactions.azurecr.io/dockerhub/ubuntu:22.04", "volumes": ["/mount:/mount"], "options": "-e SCCACHE_AZURE_BLOB_CONTAINER -e SCCACHE_AZURE_CONNECTION_STRING"}'
+      sccache-azure-key-prefix: 'ubuntu22_aarch64_onnxruntime'
 
   CXX_Unit_Tests:
     name: C++ unit tests

cmake/templates/InferenceEngineConfig-version.cmake.in

@@ -218,7 +218,7 @@ elif command -v cmake3 &> /dev/null; then
 fi
 
 current_cmake_ver=$($cmake_command --version | sed -ne 's/[^0-9]*\(\([0-9]\.\)\{0,4\}[0-9][^.]\).*/\1/p')
-required_cmake_ver=3.20.0
+required_cmake_ver=3.24.0
 if [ ! "$(printf '%s\n' "$required_cmake_ver" "$current_cmake_ver" | sort -V | head -n1)" = "$required_cmake_ver" ]; then
     installed_cmake_ver=3.26.0
     arch=$(uname -m)

cmake/templates/InferenceEngineConfig.cmake.in

@@ -184,27 +184,14 @@ string(REPLACE "$<CONFIG>" "" OPENVINO_LIB_DIR "${OV_CPACK_LIBRARYDIR}")
 set(OV_TBB_DIR "${OV_TBB_DIR_INSTALL}")
 set(OV_TBBBIND_DIR "${OV_TBBBIND_DIR_INSTALL}")
 
-configure_package_config_file("${OpenVINO_SOURCE_DIR}/cmake/templates/InferenceEngineConfig.cmake.in"
-                              "${CMAKE_BINARY_DIR}/share/InferenceEngineConfig.cmake"
-                              INSTALL_DESTINATION ${OV_CPACK_OPENVINO_CMAKEDIR}
-                              PATH_VARS ${PATH_VARS} ${INSTALL_PATH_VARS})
-
 configure_package_config_file("${OpenVINO_SOURCE_DIR}/cmake/templates/OpenVINOConfig.cmake.in"
                               "${CMAKE_BINARY_DIR}/share/OpenVINOConfig.cmake"
                               INSTALL_DESTINATION ${OV_CPACK_OPENVINO_CMAKEDIR}
                               PATH_VARS ${PATH_VARS} ${INSTALL_PATH_VARS})
 
-configure_file("${OpenVINO_SOURCE_DIR}/cmake/templates/InferenceEngineConfig-version.cmake.in"
-               "${CMAKE_BINARY_DIR}/InferenceEngineConfig-version.cmake" @ONLY)
 configure_file("${OpenVINO_SOURCE_DIR}/cmake/templates/OpenVINOConfig-version.cmake.in"
                "${CMAKE_BINARY_DIR}/OpenVINOConfig-version.cmake" @ONLY)
 
-install(FILES "${CMAKE_BINARY_DIR}/share/InferenceEngineConfig.cmake"
-              "${CMAKE_BINARY_DIR}/InferenceEngineConfig-version.cmake"
-        DESTINATION ${OV_CPACK_OPENVINO_CMAKEDIR}
-        COMPONENT ${OV_CPACK_COMP_CORE_DEV}
-        ${OV_CPACK_COMP_CORE_DEV_EXCLUDE_ALL})
-
 install(FILES "${CMAKE_BINARY_DIR}/share/OpenVINOConfig.cmake"
               "${CMAKE_BINARY_DIR}/OpenVINOConfig-version.cmake"
         DESTINATION ${OV_CPACK_OPENVINO_CMAKEDIR}

cmake/templates/ngraphConfig.cmake.in

@@ -157,17 +157,3 @@ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/
         FILES_MATCHING
             PATTERN "*.hpp"
             PATTERN "*.h")
-
-configure_package_config_file(${OpenVINO_SOURCE_DIR}/cmake/templates/ngraphConfig.cmake.in
-    ${CMAKE_BINARY_DIR}/ngraphConfig.cmake
-    INSTALL_DESTINATION ${OV_CPACK_OPENVINO_CMAKEDIR})
-
-write_basic_package_version_file(${CMAKE_BINARY_DIR}/ngraphConfigVersion.cmake
-    VERSION ${OpenVINO_VERSION_MAJOR}.${OpenVINO_VERSION_MINOR}.${OpenVINO_VERSION_PATCH}
-    COMPATIBILITY SameMajorVersion)
-
-install(FILES ${CMAKE_BINARY_DIR}/ngraphConfig.cmake
-              ${CMAKE_BINARY_DIR}/ngraphConfigVersion.cmake
-        DESTINATION ${OV_CPACK_OPENVINO_CMAKEDIR}
-        COMPONENT ${OV_CPACK_COMP_CORE_DEV}
-        ${OV_CPACK_COMP_CORE_DEV_EXCLUDE_ALL})

install_build_dependencies.sh

@@ -16,6 +16,8 @@
 #include "ie_blob.h"
 #include "ie_data.h"
 #include "ie_memcpy.h"
+#include "openvino/runtime/itensor.hpp"
+#include "openvino/runtime/so_ptr.hpp"
 
 IE_SUPPRESS_DEPRECATED_START
 /**
@@ -137,4 +139,15 @@ void CopyVectorToBlob(const InferenceEngine::Blob::Ptr outputBlob, const std::ve
         IE_THROW() << "Element size mismatch between blob and vector";
     ie_memcpy(outputBlob->buffer().as<T*>(), outputBlob->byteSize(), &inputVector[0], inputVector.size() * sizeof(T));
 }
+
+namespace ov {
+
+ov::SoPtr<ov::ITensor> make_tensor(const std::shared_ptr<InferenceEngine::Blob>& tensor, bool unwrap = false);
+
+OPENVINO_RUNTIME_API std::shared_ptr<InferenceEngine::Blob> tensor_to_blob(const ov::SoPtr<ov::ITensor>& tensor,
+                                                                           bool unwrap = true,
+                                                                           InferenceEngine::TensorDesc desc = {});
+
+}  // namespace ov
+
 IE_SUPPRESS_DEPRECATED_END