From 8bf50807ee3fd8c3de1ad3edbc08159fd94133e6 Mon Sep 17 00:00:00 2001 From: Vitaliy Urusovskij Date: Tue, 20 Feb 2024 17:26:53 +0400 Subject: [PATCH] Additional cleaning of `InferenceEngine` (#22959) --- scripts/setupvars/setupvars.bat | 2 -- scripts/setupvars/setupvars.sh | 2 -- src/bindings/python/CMakeLists.txt | 3 +-- src/core/CMakeLists.txt | 21 ++++++++----------- src/core/src/op/util/framework_node.cpp | 2 +- .../front/tf/GNMT_DynamicSequenceLengths.py | 2 +- 6 files changed, 12 insertions(+), 20 deletions(-) diff --git a/scripts/setupvars/setupvars.bat b/scripts/setupvars/setupvars.bat index b1fd8f91f5a..7aec4a6bcc4 100644 --- a/scripts/setupvars/setupvars.bat +++ b/scripts/setupvars/setupvars.bat @@ -33,8 +33,6 @@ if exist "%INTEL_OPENVINO_DIR%\extras\opencv\setupvars.bat" ( :opencv_done :: OpenVINO runtime -set "InferenceEngine_DIR=%INTEL_OPENVINO_DIR%\runtime\cmake" -set "ngraph_DIR=%INTEL_OPENVINO_DIR%\runtime\cmake" set "OpenVINO_DIR=%INTEL_OPENVINO_DIR%\runtime\cmake" set "OPENVINO_LIB_PATHS=%INTEL_OPENVINO_DIR%\runtime\bin\intel64\Release;%INTEL_OPENVINO_DIR%\runtime\bin\intel64\Debug;%OPENVINO_LIB_PATHS%" diff --git a/scripts/setupvars/setupvars.sh b/scripts/setupvars/setupvars.sh index dc04ea0334d..cc569d69bcb 100755 --- a/scripts/setupvars/setupvars.sh +++ b/scripts/setupvars/setupvars.sh @@ -32,8 +32,6 @@ shift done if [ -e "$INSTALLDIR/runtime" ]; then - export InferenceEngine_DIR=$INSTALLDIR/runtime/cmake - export ngraph_DIR=$INSTALLDIR/runtime/cmake export OpenVINO_DIR=$INSTALLDIR/runtime/cmake system_type=$(/bin/ls "$INSTALLDIR/runtime/lib/") diff --git a/src/bindings/python/CMakeLists.txt b/src/bindings/python/CMakeLists.txt index 26fdc4eefb2..d13cb2e99db 100644 --- a/src/bindings/python/CMakeLists.txt +++ b/src/bindings/python/CMakeLists.txt @@ -18,8 +18,7 @@ project(OpenVINOPython DESCRIPTION "OpenVINO Runtime Python bindings") # if(NOT DEFINED OpenVINO_SOURCE_DIR) - find_package(OpenVINODeveloperPackage REQUIRED - PATHS "${InferenceEngineDeveloperPackage_DIR}") + find_package(OpenVINODeveloperPackage REQUIRED) # we assume that OpenVINODeveloperPackage is generated in OpenVINO build tree set(OpenVINO_BINARY_DIR "${OpenVINODeveloperPackage_DIR}") diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index a98d3aa0b61..9606d8cbefb 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -18,19 +18,16 @@ file(GLOB_RECURSE DEV_HEADERS ${OV_CORE_DEV_API_PATH}/*.hpp) add_subdirectory(reference) add_subdirectory(shape_inference) -# TODO: remove with InferenceEngine::Blob removal -if(ON) - set(MIXED_SRC - "${CMAKE_CURRENT_SOURCE_DIR}/src/runtime/allocator.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/src/runtime/itensor.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/src/runtime/tensor.cpp") +set(MIXED_SRC + "${CMAKE_CURRENT_SOURCE_DIR}/src/runtime/allocator.cpp" + "${CMAKE_CURRENT_SOURCE_DIR}/src/runtime/itensor.cpp" + "${CMAKE_CURRENT_SOURCE_DIR}/src/runtime/tensor.cpp") - set_property(SOURCE ${MIXED_SRC} - APPEND PROPERTY INCLUDE_DIRECTORIES - $/src - $/dev_api - $/include) -endif() +set_property(SOURCE ${MIXED_SRC} + APPEND PROPERTY INCLUDE_DIRECTORIES + $/src + $/dev_api + $/include) # Create named folders for the sources within the .vcproj # Empty name lists them directly under the .vcproj diff --git a/src/core/src/op/util/framework_node.cpp b/src/core/src/op/util/framework_node.cpp index 8bc241ce71a..8936407d6e3 100644 --- a/src/core/src/op/util/framework_node.cpp +++ b/src/core/src/op/util/framework_node.cpp @@ -132,7 +132,7 @@ void ov::op::util::FrameworkNode::validate_and_infer_types() { out << "Input descriptor for " << get_friendly_name() << " node has been changed:" << std::endl; out << "Before: " << std::get<0>(m_inputs_desc[i]) << ", " << std::get<1>(m_inputs_desc[i]) << std::endl; out << "After: " << input_pshape << ", " << input_type << std::endl; - out << "Please specify InferenceEngine Extensions to support this case."; + out << "Please specify OpenVINO Extensions to support this case."; return out.str(); }; diff --git a/tools/mo/openvino/tools/mo/front/tf/GNMT_DynamicSequenceLengths.py b/tools/mo/openvino/tools/mo/front/tf/GNMT_DynamicSequenceLengths.py index 51a0555053d..4cc67879613 100644 --- a/tools/mo/openvino/tools/mo/front/tf/GNMT_DynamicSequenceLengths.py +++ b/tools/mo/openvino/tools/mo/front/tf/GNMT_DynamicSequenceLengths.py @@ -134,5 +134,5 @@ class GNMT_sequence_lengths(FrontReplacementPattern): "Model can not be translated in a reshape-able way.\n" "Model Optimizer key static_shape was turned on to prevent related errors.\n" "There will be no success changing input shapes of the model with the help of " - "InferenceEngine reshape method", extra={'is_warning': True}) + "OpenVINO reshape method", extra={'is_warning': True}) graph.graph['cmd_params'].static_shape = True