Merge branch 'master' into river/cpu_plugin_behavior_tests

cmake/developer_package/cross_compile/cross_compiled_disp_gen.cmake

@@ -37,7 +37,7 @@ function(_generate_dispatcher)
 // !! do not modify it !!!
 //
 #include \"${XARCH_API_HEADER}\"
-#include \"ie_system_conf.h\"
+#include \"openvino/runtime/system_conf.hpp\"
 
 ")
 

cmake/developer_package/cross_compile/cross_compiled_func.cmake

@@ -42,7 +42,7 @@ set(DISPATCHER_GEN_OPTIONS_HOLDER ${CMAKE_CURRENT_LIST_DIR}/cross_compiled_disp_
 #
 #  Allow to enable multiple cross compilation of source file inside one module
 #  with keeping requirements on minimal instruction set. The CPU check performed
-#  in runtime via common utils declared in "ie_system_conf.h".
+#  in runtime via common utils declared in "system_conf.h".
 #
 #  Usage example:
 #  cross_compiled_file(<target>

cmake/developer_package/plugins/create_plugins_hpp.cmake

@@ -42,10 +42,10 @@ foreach(dev_map IN LISTS OV_DEVICE_MAPPING)
 
         # declarations
         set(OV_PLUGINS_DECLARATIONS "${OV_PLUGINS_DECLARATIONS}
-        IE_DEFINE_PLUGIN_CREATE_FUNCTION_DECLARATION(${_OV_CREATE_PLUGIN_FUNC});")
+        OV_DEFINE_PLUGIN_CREATE_FUNCTION_DECLARATION(${_OV_CREATE_PLUGIN_FUNC});")
         if(${actual_dev_name}_AS_EXTENSION)
             set(OV_PLUGINS_DECLARATIONS "${OV_PLUGINS_DECLARATIONS}
-            IE_DEFINE_EXTENSION_CREATE_FUNCTION_DECLARATION(${_OV_CREATE_EXTENSION_FUNC});")
+            OV_DEFINE_EXTENSION_CREATE_FUNCTION_DECLARATION(${_OV_CREATE_EXTENSION_FUNC});")
         else()
             set(_OV_CREATE_EXTENSION_FUNC "nullptr")
         endif()

cmake/developer_package/plugins/plugins.cmake

@@ -80,7 +80,7 @@ function(ov_add_plugin)
             if(OV_PLUGIN_AS_EXTENSION)
                 # to distinguish functions creating extensions objects
                 target_compile_definitions(${OV_PLUGIN_NAME} PRIVATE
-                    IE_CREATE_EXTENSION=CreateExtensionShared${OV_PLUGIN_DEVICE_NAME})
+                    OV_CREATE_EXTENSION=CreateExtensionShared${OV_PLUGIN_DEVICE_NAME})
             endif()
         endif()
 

cmake/developer_package/plugins/plugins.hpp.in

@@ -9,13 +9,23 @@
 
 #ifdef OPENVINO_STATIC_LIBRARY
 
-#include "cpp_interfaces/interface/ie_iplugin_internal.hpp"
+// The Macro used to create extensions for static library
+#define OV_DEFINE_EXTENSION_CREATE_FUNCTION_DECLARATION(_OV_CREATE_EXTENSION_FUNC) \
+    OPENVINO_EXTENSION_C_API void                                                  \
+    _OV_CREATE_EXTENSION_FUNC(std::vector<::ov::Extension::Ptr>& ext)
+
+// The Macro used to create plugin for static library
+#define OV_DEFINE_PLUGIN_CREATE_FUNCTION_DECLARATION(_OV_CREATE_PLUGIN_FUNC) \
+    OPENVINO_PLUGIN_API void                                                 \
+    _OV_CREATE_PLUGIN_FUNC(::std::shared_ptr<::ov::IPlugin> &plugin) noexcept(false)
 
 @OV_PLUGINS_DECLARATIONS@
 
+using CreateExtensionFunc = void(std::vector<::ov::Extension::Ptr>&);
+using CreatePluginEngineFunc = void(std::shared_ptr<::ov::IPlugin>&);
 struct Value {
-    InferenceEngine::CreatePluginEngineFunc * m_create_plugin_func;
-    InferenceEngine::CreateExtensionFunc * m_create_extension_func;
+    CreatePluginEngineFunc * m_create_plugin_func;
+    CreateExtensionFunc * m_create_extension_func;
     std::map<std::string, std::string> m_default_config;
 };
 

docs/articles_en/documentation/openvino_legacy_features.rst

@@ -13,7 +13,6 @@ Legacy Features and Components
    Deploy Application with Deployment Manager <openvino_docs_install_guides_deployment_manager_tool>
    OpenVINO API 2.0 transition <openvino_2_0_transition_guide>
    Open Model ZOO <model_zoo>
-   Apache MXNet, Caffe, and Kaldi <mxnet_caffe_kaldi>
 
 
 Since OpenVINO has grown very rapidly in recent years, some of its features
@@ -74,12 +73,9 @@ offering.
 
 | **Apache MXNet, Caffe, and Kaldi model formats**
 |   *New solution:* conversion to ONNX via external tools
-|   *Old solution:* model support will be discontinued with OpenVINO 2024.0
+|   *Old solution:* model support discontinued with OpenVINO 2024.0
 |
-|   Since these three model formats proved to be far less popular among OpenVINO users
-    than the remaining ones, their support has been discontinued. Converting them to the
-    ONNX format is a possible way of retaining them in the OpenVINO-based pipeline.
-|   :doc:`See the previous conversion instructions <mxnet_caffe_kaldi>`
+|   `See the previous conversion instructions <https://docs.openvino.ai/2023.3/mxnet_caffe_kaldi.html>`__
 |   :doc:`See the currently supported frameworks <openvino_docs_model_processing_introduction>`
 
 

docs/articles_en/documentation/openvino_legacy_features/--installing-model-dev-tools.rst

@@ -5,7 +5,7 @@ Install OpenVINO™ Development Tools
 
 
 .. meta::
-   :description: Learn how to install OpenVINO™ Development Tools on Windows, 
+   :description: Learn how to install OpenVINO™ Development Tools on Windows,
                  Linux, and macOS operating systems, using a PyPi package.
 
 OpenVINO Development Tools is a set of utilities that make it easy to develop and optimize models and applications for OpenVINO. It provides the following tools:
@@ -20,17 +20,17 @@ The instructions on this page show how to install OpenVINO Development Tools. If
 
 In both cases, Python 3.8 - 3.11 needs to be installed on your machine before starting.
 
-.. note:: 
+.. note::
 
-   From the 2022.1 release, the OpenVINO™ Development Tools can only be installed via PyPI. 
+   From the 2022.1 release, the OpenVINO™ Development Tools can only be installed via PyPI.
 
 .. _python_developers:
 
 For Python Developers
 #####################
 
 If you are a Python developer, follow the steps in the :ref:`Installing OpenVINO Development Tools <install_dev_tools>` section on this page to install it. Installing OpenVINO Development Tools will also install OpenVINO Runtime as a dependency, so you don’t need to install OpenVINO Runtime separately. This option is recommended for new users.
-   
+
 .. _cpp_developers:
 
 For C/C++ Developers
@@ -64,7 +64,7 @@ Installation in a New Environment
 +++++++++++++++++++++++++++++++++
 
 If you do not have an environment with a deep learning framework for the input model or you encounter any compatibility issues between OpenVINO
-and your version of deep learning framework, you may install OpenVINO Development Tools with validated versions of frameworks into a new environment. 
+and your version of deep learning framework, you may install OpenVINO Development Tools with validated versions of frameworks into a new environment.
 
 Step 1. Set Up Python Virtual Environment
 -----------------------------------------
@@ -75,19 +75,19 @@ Create a virtual Python environment to avoid dependency conflicts. To create a v
 
    .. tab-item:: Windows
       :sync: windows
-   
+
       .. code-block:: sh
-      
+
          python -m venv openvino_env
 
    .. tab-item:: Linux and macOS
       :sync: linux-and-macos
-   
+
       .. code-block:: sh
-      
+
          python3 -m venv openvino_env
-     
-     
+
+
 
 Step 2. Activate Virtual Environment
 ------------------------------------
@@ -98,16 +98,16 @@ Activate the newly created Python virtual environment by issuing this command:
 
    .. tab-item:: Windows
       :sync: windows
-   
+
       .. code-block:: sh
-   
+
          openvino_env\Scripts\activate
 
    .. tab-item:: Linux and macOS
       :sync: linux-and-macos
 
       .. code-block:: sh
-   
+
          source openvino_env/bin/activate
 
 .. important::
@@ -138,7 +138,7 @@ To install and configure the components of the development package together with
 
 
 where the ``extras`` parameter specifies the source deep learning framework for the input model
-and is one or more of the following values separated with "," :  ``caffe``, ``kaldi``, ``mxnet``, ``onnx``, ``pytorch``, ``tensorflow``, ``tensorflow2``. 
+and is one or more of the following values separated with "," :  ``caffe``, ``kaldi``, ``mxnet``, ``onnx``, ``pytorch``, ``tensorflow``, ``tensorflow2``.
 
 For example, to install and configure dependencies required for working with TensorFlow 2.x and ONNX models, use the following command:
 
@@ -147,7 +147,7 @@ For example, to install and configure dependencies required for working with Ten
    pip install openvino-dev[tensorflow2,onnx]
 
 
-.. note:: 
+.. note::
 
    Model conversion API support for TensorFlow 1.x environment has been deprecated. Use the ``tensorflow2`` parameter to install a TensorFlow 2.x environment that can convert both TensorFlow 1.x and 2.x models. If your model isn't compatible with the TensorFlow 2.x environment, use the `tensorflow` parameter to install the TensorFlow 1.x environment. The TF 1.x environment is provided only for legacy compatibility reasons.
 
@@ -197,7 +197,6 @@ Try the :doc:`C++ Quick Start Example <openvino_docs_get_started_get_started_dem
 Visit the :doc:`Samples <openvino_docs_OV_UG_Samples_Overview>` page for other C++ example applications to get you started with OpenVINO, such as:
 
 * :doc:`Basic object detection with the Hello Reshape SSD C++ sample <openvino_sample_hello_reshape_ssd>`
-* :doc:`Automatic speech recognition C++ sample <openvino_sample_automatic_speech_recognition>`
 
 Learn OpenVINO Development Tools
 ++++++++++++++++++++++++++++++++

docs/articles_en/documentation/openvino_legacy_features/mo_ovc_transition/legacy_conversion_api/model_optimizer_faq.rst

@@ -8,8 +8,8 @@
 
    All of the issues below refer to :doc:`legacy functionalities <openvino_docs_MO_DG_prepare_model_customize_model_optimizer_Customize_Model_Optimizer>`.
 
-If your question is not covered by the topics below, use the 
-`OpenVINO Support page <https://community.intel.com/t5/Intel-Distribution-of-OpenVINO/bd-p/distribution-openvino-toolkit>`__, 
+If your question is not covered by the topics below, use the
+`OpenVINO Support page <https://community.intel.com/t5/Intel-Distribution-of-OpenVINO/bd-p/distribution-openvino-toolkit>`__,
 where you can participate in a free forum discussion.
 
 .. warning::
@@ -82,7 +82,7 @@ Q3. What does the message "[ ERROR ]: Unable to create ports for node with id" m
 
 **A:** Most likely, Model Optimizer does not know how to infer output shapes of some layers in the given topology.
 To lessen the scope, compile the list of layers that are custom for Model Optimizer: present in the topology,
-absent in the :doc:`list of supported operations <openvino_resources_supported_operations_frontend>` for the target framework. 
+absent in the :doc:`list of supported operations <openvino_resources_supported_operations_frontend>` for the target framework.
 Then, refer to available options in the corresponding section in the  :doc:`[Legacy] Custom Layers in Model Optimizer <openvino_docs_MO_DG_prepare_model_customize_model_optimizer_Customize_Model_Optimizer>` page.
 
 .. _question-7:
@@ -255,7 +255,7 @@ Q16. What does the message "Input shape is required to convert MXNet model. Plea
 Q19. What does the message "Both --scale and --scale_values are defined. Specify either scale factor or scale values per input channels" mean?
 #####################################################################################################################################################
 
-**A:** The ``--scale`` option sets a scaling factor for all channels, while ``--scale_values`` sets a scaling factor per each channel. Using both of them simultaneously produces ambiguity, so you must use only one of them. For more information, refer to the **Using Framework-Agnostic Conversion Parameters** section: for :doc:`Converting a Caffe Model <openvino_docs_MO_DG_prepare_model_convert_model_Convert_Model_From_Caffe>`, :doc:`Converting a TensorFlow Model <openvino_docs_MO_DG_prepare_model_convert_model_Convert_Model_From_TensorFlow>`, :doc:`Converting an MXNet Model <openvino_docs_MO_DG_prepare_model_convert_model_Convert_Model_From_MxNet>`.
+**A:** The ``--scale`` option sets a scaling factor for all channels, while ``--scale_values`` sets a scaling factor per each channel. Using both of them simultaneously produces ambiguity, so you must use only one of them. For more information, refer to the **Using Framework-Agnostic Conversion Parameters** section: for :doc:`Converting a TensorFlow Model <openvino_docs_MO_DG_prepare_model_convert_model_Convert_Model_From_TensorFlow>`.
 
 .. _question-20:
 
@@ -547,7 +547,7 @@ Keep in mind that there is no space between and inside the brackets for input sh
 Q58. What does the message "Please provide input layer names for input layer shapes" mean?
 #####################################################################################################################################################
 
-**A:** When specifying input shapes for several layers, you must provide names for inputs, whose shapes will be overwritten. For usage examples, see the :doc:`Converting a Caffe Model <openvino_docs_MO_DG_prepare_model_convert_model_Convert_Model_From_Caffe>`. Additional information for ``--input_shape`` is in FAQ :ref:`#56 <question-56>`.
+**A:** When specifying input shapes for several layers, you must provide names for inputs, whose shapes will be overwritten. Additional information for ``--input_shape`` is in FAQ :ref:`#56 <question-56>`.
 
 .. _question-59:
 
@@ -582,14 +582,14 @@ Q62. What does the message "You should specify input for each scale value" mean?
 Q63. What does the message "Number of inputs and mean values does not match" mean?
 #####################################################################################################################################################
 
-**A:** The number of specified mean values and the number of inputs must be equal. For a usage example, refer to the :doc:`Converting a Caffe Model <openvino_docs_MO_DG_prepare_model_convert_model_Convert_Model_From_Caffe>` guide.
+**A:** The number of specified mean values and the number of inputs must be equal.
 
 .. _question-64:
 
 Q64. What does the message "Number of inputs and scale values does not match" mean?
 #####################################################################################################################################################
 
-**A:** The number of specified scale values and the number of inputs must be equal.  For a usage example, refer to the :doc:`Converting a Caffe Model <openvino_docs_MO_DG_prepare_model_convert_model_Convert_Model_From_Caffe>` guide.
+**A:** The number of specified scale values and the number of inputs must be equal.
 
 .. _question-65:
 
@@ -715,7 +715,6 @@ Topology description (``.json`` file) should be prepared (merged) in advance and
 If you add additional layers and weights that are in ``.nd`` files to your model, Model Optimizer can build a model
 from one ``.params`` file and two additional ``.nd`` files (``*_args.nd``, ``*_auxs.nd``).
 To do that, provide both CLI options or do not pass them if you want to convert an MXNet model without additional weights.
-For more information, refer to the :doc:`Converting an MXNet Model <openvino_docs_MO_DG_prepare_model_convert_model_Convert_Model_From_MxNet>` guide.
 
 .. _question-82:
 
@@ -739,16 +738,13 @@ Q84. What does the message "Specified input json ... does not exist" mean?
 #####################################################################################################################################################
 
 **A:** Most likely, ``.json`` file does not exist or has a name that does not match the notation of Apache MXNet. Make sure the file exists and has a correct name.
-For more information, refer to the :doc:`Converting an MXNet Model <openvino_docs_MO_DG_prepare_model_convert_model_Convert_Model_From_MxNet>` guide.
 
 .. _question-85:
 
 Q85. What does the message "Unsupported Input model file type ... Model Optimizer support only .params and .nd files format" mean?
 #####################################################################################################################################################
 
 **A:** Model Optimizer for Apache MXNet supports only ``.params`` and ``.nd`` files formats. Most likely, you specified an unsupported file format in ``--input_model``.
-For more information, refer to :doc:`Converting an MXNet Model <openvino_docs_MO_DG_prepare_model_convert_model_Convert_Model_From_MxNet>`.
-
 
 .. _question-86: