[2024.0] Additional cleaning of InferenceEngine (#22959) (#22996)

openvinotoolkit · Feb 22, 2024 · 78580d2 · 78580d2
1 parent 6dbabb9
commit 78580d2
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 21 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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_property(SOURCE ${MIXED_SRC}
-        APPEND PROPERTY INCLUDE_DIRECTORIES
-            $<TARGET_PROPERTY:openvino_runtime_obj,SOURCE_DIR>/src
-            $<TARGET_PROPERTY:openvino_runtime_obj,SOURCE_DIR>/dev_api
-            $<TARGET_PROPERTY:openvino_runtime_obj,SOURCE_DIR>/include)
-endif()
+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
+        $<TARGET_PROPERTY:openvino_runtime_obj,SOURCE_DIR>/src
+        $<TARGET_PROPERTY:openvino_runtime_obj,SOURCE_DIR>/dev_api
+        $<TARGET_PROPERTY:openvino_runtime_obj,SOURCE_DIR>/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
@@ -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
@@ -134,5 +134,5 @@ def replace_pattern(graph: Graph, match: dict):
                 "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