Moved plugin to hidden folder (#999)

2020-06-19 21:04:12 +03:00 · 2020-06-19 21:04:12 +03:00 · 0b2827e027
parent 79ff221957
commit 0b2827e027
35 changed files with 22 additions and 82 deletions
--- a/docs/template_plugin/src/template_infer_request.cpp
+++ b/docs/template_plugin/src/template_infer_request.cpp
@ -10,7 +10,6 @@
 #include <map>

 #include <ie_blob.h>
-#include <ie_plugin.hpp>
 #include <description_buffer.hpp>
 #include <debug.h>
 #include <ie_layouts.h>
--- a/inference-engine/include/inference_engine.hpp
+++ b/inference-engine/include/inference_engine.hpp
@ -13,7 +13,6 @@
 #include <ie_layers.h>
 #include <cpp/ie_cnn_net_reader.h>
 #include <cpp/ie_executable_network.hpp>
-#include <cpp/ie_plugin_cpp.hpp>
 #include <ie_core.hpp>
 #include <ie_icnn_network.hpp>
 #include <ie_plugin_config.hpp>
--- a/inference-engine/src/cldnn_engine/cldnn_config.h
+++ b/inference-engine/src/cldnn_engine/cldnn_config.h
@ -9,7 +9,6 @@
 #include <vector>

 #include "ie_blob.h"
-#include "ie_plugin.hpp"
 #include "cpp/ie_cnn_network.h"
 #include "debug_options.h"

--- a/inference-engine/src/cldnn_engine/cldnn_engine.cpp
+++ b/inference-engine/src/cldnn_engine/cldnn_engine.cpp
@ -19,7 +19,6 @@
 #include <description_buffer.hpp>
 #include <memory>
 #include <cpp_interfaces/base/ie_plugin_base.hpp>
-#include "ie_plugin.hpp"
 #include "ie_plugin_config.hpp"
 #include "details/caseless.hpp"
 #include <details/ie_cnn_network_tools.h>
--- a/inference-engine/src/cldnn_engine/cldnn_executable_network.h
+++ b/inference-engine/src/cldnn_engine/cldnn_executable_network.h
@ -11,7 +11,6 @@
 #include <string>
 #include <utility>
 #include "ie_blob.h"
-#include "ie_plugin.hpp"
 #include "cpp/ie_cnn_network.h"
 #include "debug_options.h"
 #include <cpp_interfaces/impl/ie_executable_network_thread_safe_default.hpp>
--- a/inference-engine/src/cldnn_engine/cldnn_graph.h
+++ b/inference-engine/src/cldnn_engine/cldnn_graph.h
@ -11,7 +11,6 @@
 #include <string>
 #include <utility>
 #include "ie_blob.h"
-#include "ie_plugin.hpp"
 #include "cpp/ie_cnn_network.h"
 #include "debug_options.h"
 #include <api/network.hpp>
--- a/inference-engine/src/cldnn_engine/cldnn_program.h
+++ b/inference-engine/src/cldnn_engine/cldnn_program.h
@ -15,7 +15,6 @@
 #include <cpp/ie_cnn_network.h>
 #include <cpp_interfaces/exception2status.hpp>
 #include <ie_blob.h>
-#include <ie_plugin.hpp>

 #include "debug_options.h"
 #include "cldnn_custom_layer.h"
--- a/inference-engine/src/gna_plugin/gna_plugin_entry_points.cpp
+++ b/inference-engine/src/gna_plugin/gna_plugin_entry_points.cpp
@ -3,7 +3,6 @@
 //

 #include <memory>
-#include <ie_plugin.hpp>
 #include <cpp_interfaces/base/ie_plugin_base.hpp>
 #include "gna_plugin_internal.hpp"

--- a/inference-engine/src/hetero_plugin/hetero_executable_network.hpp
+++ b/inference-engine/src/hetero_plugin/hetero_executable_network.hpp
@ -16,7 +16,6 @@
 #include <unordered_set>

 #include <ie_common.h>
-#include <cpp/ie_plugin_cpp.hpp>
 #include <cpp_interfaces/impl/ie_executable_network_thread_safe_default.hpp>

 #include "hetero_infer_request.hpp"
--- a/inference-engine/src/hetero_plugin/hetero_infer_request.cpp
+++ b/inference-engine/src/hetero_plugin/hetero_infer_request.cpp
@ -4,7 +4,6 @@

 #include "hetero_infer_request.hpp"
 #include <ie_blob.h>
-#include <ie_plugin.hpp>
 #include <ie_util_internal.hpp>
 #include <description_buffer.hpp>
 #include <ie_layouts.h>
--- a/inference-engine/src/hetero_plugin/hetero_plugin.hpp
+++ b/inference-engine/src/hetero_plugin/hetero_plugin.hpp
@ -7,7 +7,6 @@
 #include "description_buffer.hpp"
 #include "ie_icore.hpp"
 #include "cpp_interfaces/impl/ie_plugin_internal.hpp"
-#include "cpp/ie_plugin_cpp.hpp"
 #include <memory>
 #include <string>
 #include <map>
--- a/inference-engine/src/inference_engine/ie_core.cpp
+++ b/inference-engine/src/inference_engine/ie_core.cpp
@ -17,12 +17,11 @@

 #include <ngraph/opsets/opset.hpp>
 #include "cpp/ie_cnn_net_reader.h"
-#include "cpp/ie_plugin_cpp.hpp"
+#include "ie_plugin_cpp.hpp"
 #include "cpp_interfaces/base/ie_plugin_base.hpp"
 #include "details/ie_exception_conversion.hpp"
 #include "details/ie_so_pointer.hpp"
 #include "ie_icore.hpp"
-#include "ie_plugin.hpp"
 #include "ie_plugin_config.hpp"
 #include "ie_profiling.hpp"
 #include "ie_util_internal.hpp"
--- a/inference-engine/src/inference_engine/ie_plugin_cpp.hpp
+++ b/inference-engine/src/inference_engine/ie_plugin_cpp.hpp
@ -14,21 +14,18 @@
 #include <string>

 #include "cpp/ie_executable_network.hpp"
-#include "details/ie_exception_conversion.hpp"
 #include "cpp/ie_cnn_network.h"
-#include "ie_plugin.hpp"
+#include "details/ie_exception_conversion.hpp"
 #include "ie_plugin_ptr.hpp"

 namespace InferenceEngine {

 /**
- * @deprecated Use InferenceEngine::Core instead. Will be removed in 2021.1
 * @brief This class is a C++ API wrapper for IInferencePlugin.
 *
 * It can throw exceptions safely for the application, where it is properly handled.
 */
-class INFERENCE_ENGINE_DEPRECATED("Use InferenceEngine::Core instead. Will be removed in 2021.1") InferencePlugin {
-    IE_SUPPRESS_DEPRECATED_START
+class InferencePlugin {
    InferenceEnginePluginPtr actual;

 public:
@ -46,8 +43,6 @@ public:
        }
    }

-    IE_SUPPRESS_DEPRECATED_END
-
    /**
     * @copybrief IInferencePlugin::GetVersion
     *
@ -56,10 +51,8 @@ public:
     */
    const Version* GetVersion() {
        const Version* versionInfo = nullptr;
-        IE_SUPPRESS_DEPRECATED_START
        if (actual == nullptr) THROW_IE_EXCEPTION << "InferencePlugin wrapper was not initialized";
        actual->GetVersion(versionInfo);
-        IE_SUPPRESS_DEPRECATED_END
        if (versionInfo == nullptr) {
            THROW_IE_EXCEPTION << "Unknown device is used";
        }
@ -77,10 +70,8 @@ public:
     */
    ExecutableNetwork LoadNetwork(const ICNNNetwork& network, const std::map<std::string, std::string>& config) {
        IExecutableNetwork::Ptr ret;
-        IE_SUPPRESS_DEPRECATED_START
        CALL_STATUS_FNC(LoadNetwork, ret, network, config);
        return ExecutableNetwork(ret, actual);
-        IE_SUPPRESS_DEPRECATED_END
    }

    /**
@ -93,11 +84,9 @@ public:
     */
    ExecutableNetwork LoadNetwork(CNNNetwork network, const std::map<std::string, std::string>& config) {
        IExecutableNetwork::Ptr ret;
-        IE_SUPPRESS_DEPRECATED_START
        CALL_STATUS_FNC(LoadNetwork, ret, network, config);
        if (ret.get() == nullptr) THROW_IE_EXCEPTION << "Internal error: pointer to executable network is null";
        return ExecutableNetwork(ret, actual);
-        IE_SUPPRESS_DEPRECATED_END
    }

    /**
@ -108,9 +97,7 @@ public:
     * @param extension Pointer to loaded Extension
     */
    void AddExtension(InferenceEngine::IExtensionPtr extension) {
-        IE_SUPPRESS_DEPRECATED_START
        CALL_STATUS_FNC(AddExtension, extension);
-        IE_SUPPRESS_DEPRECATED_END
    }

    /**
@ -120,9 +107,7 @@ public:
     * @param config A configuration map
     */
    void SetConfig(const std::map<std::string, std::string>& config) {
-        IE_SUPPRESS_DEPRECATED_START
        CALL_STATUS_FNC(SetConfig, config);
-        IE_SUPPRESS_DEPRECATED_END
    }

    /**
@ -136,10 +121,8 @@ public:
    ExecutableNetwork ImportNetwork(const std::string& modelFileName,
                                    const std::map<std::string, std::string>& config) {
        IExecutableNetwork::Ptr ret;
-        IE_SUPPRESS_DEPRECATED_START
        CALL_STATUS_FNC(ImportNetwork, ret, modelFileName, config);
        return ExecutableNetwork(ret, actual);
-        IE_SUPPRESS_DEPRECATED_END
    }

    /**
@ -153,15 +136,11 @@ public:
     */
    void QueryNetwork(const ICNNNetwork& network, const std::map<std::string, std::string>& config,
                      QueryNetworkResult& res) const {
-        IE_SUPPRESS_DEPRECATED_START
        if (actual == nullptr) THROW_IE_EXCEPTION << "InferencePlugin wrapper was not initialized";
        actual->QueryNetwork(network, config, res);
-        IE_SUPPRESS_DEPRECATED_END
        if (res.rc != OK) THROW_IE_EXCEPTION << res.resp.msg;
    }

-    IE_SUPPRESS_DEPRECATED_START
-
    /**
     * @brief Converts InferenceEngine to InferenceEnginePluginPtr pointer
     *
@ -176,7 +155,5 @@ public:
     *
     */
    using Ptr = std::shared_ptr<InferencePlugin>;
-
-    IE_SUPPRESS_DEPRECATED_END
 };
 }  // namespace InferenceEngine
--- a/inference-engine/src/inference_engine/ie_plugin_ptr.hpp
+++ b/inference-engine/src/inference_engine/ie_plugin_ptr.hpp
@ -13,19 +13,16 @@

 #include "details/ie_so_pointer.hpp"
 #include "ie_extension.h"
-#include "ie_plugin.hpp"
+#include "cpp_interfaces/interface/ie_plugin.hpp"

 namespace InferenceEngine {
 namespace details {

-IE_SUPPRESS_DEPRECATED_START
-
 /**
- * @deprecated Use InferenceEngine::Core instead. This API will be removed in 2021.1 release.
 * @brief This class defines the name of the fabric for creating an IInferencePlugin object in DLL
 */
 template <>
-class INFERENCE_ENGINE_DEPRECATED("Use InferenceEngine::Core instead") SOCreatorTrait<IInferencePlugin> {
+class SOCreatorTrait<IInferencePlugin> {
 public:
    /**
     * @brief A name of the fabric for creating IInferencePlugin object in DLL
@ -42,6 +39,4 @@ public:
 */
 using InferenceEnginePluginPtr = InferenceEngine::details::SOPointer<IInferencePlugin>;

-IE_SUPPRESS_DEPRECATED_END
-
 }  // namespace InferenceEngine
--- a/inference-engine/src/multi_device/multi_device.hpp
+++ b/inference-engine/src/multi_device/multi_device.hpp
@ -15,7 +15,6 @@
 #include <memory>
 #include <string>

-#include <cpp/ie_plugin_cpp.hpp>
 #include <cpp_interfaces/impl/ie_plugin_internal.hpp>
 #include <cpp_interfaces/impl/ie_executable_network_thread_safe_default.hpp>
 #include <cpp_interfaces/impl/ie_infer_async_request_thread_safe_default.hpp>
--- a/inference-engine/src/plugin_api/cpp_interfaces/base/ie_plugin_base.hpp
+++ b/inference-engine/src/plugin_api/cpp_interfaces/base/ie_plugin_base.hpp
@ -9,11 +9,11 @@

 #pragma once

-#include <ie_plugin.hpp>
 #include <map>
 #include <memory>
 #include <string>

+#include "cpp_interfaces/interface/ie_plugin.hpp"
 #include "cpp_interfaces/base/ie_inference_plugin_api.hpp"
 #include "cpp_interfaces/exception2status.hpp"
 #include "description_buffer.hpp"
--- a/inference-engine/src/plugin_api/cpp_interfaces/interface/ie_iplugin_internal.hpp
+++ b/inference-engine/src/plugin_api/cpp_interfaces/interface/ie_iplugin_internal.hpp
@ -14,7 +14,7 @@
 #include <ie_input_info.hpp>
 #include <ie_icnn_network.hpp>
 #include <ie_icore.hpp>
-#include <ie_plugin.hpp>
+#include <ie_parameter.hpp>
 #include <ie_iexecutable_network.hpp>
 #include <ie_remote_context.hpp>

--- a/inference-engine/src/plugin_api/cpp_interfaces/interface/ie_plugin.hpp
+++ b/inference-engine/src/plugin_api/cpp_interfaces/interface/ie_plugin.hpp
@ -27,11 +27,9 @@
 namespace InferenceEngine {

 /**
- * @deprecated Use InferenceEngine::Core instead. Will be removed in 2021.1
 * @brief This class is a main plugin interface
 */
-class INFERENCE_ENGINE_DEPRECATED("Use InferenceEngine::Core instead. Will be removed in 2021.1")
-    INFERENCE_ENGINE_API_CLASS(IInferencePlugin)
+class INFERENCE_ENGINE_API_CLASS(IInferencePlugin)
    : public details::IRelease {
 public:
    /**
@ -113,8 +111,6 @@ public:
 * @param resp Pointer to the response message that holds a description of an error if any occurred
 * @return Status code of the operation. InferenceEngine::OK if succeeded
 */
-IE_SUPPRESS_DEPRECATED_START
 INFERENCE_PLUGIN_API(StatusCode) CreatePluginEngine(IInferencePlugin*& plugin, ResponseDesc* resp) noexcept;
-IE_SUPPRESS_DEPRECATED_END

 }  // namespace InferenceEngine
--- a/inference-engine/src/plugin_api/ie_icore.hpp
+++ b/inference-engine/src/plugin_api/ie_icore.hpp
@ -13,7 +13,11 @@
 #include <memory>
 #include <string>

-#include <ie_plugin_ptr.hpp>
+#include <ie_parameter.hpp>
+#include <cpp/ie_cnn_network.h>
+#include <cpp/ie_executable_network.hpp>
+#include <ie_core.hpp>  // for QueryNetworkResult
+
 #include "threading/ie_itask_executor.hpp"

 namespace InferenceEngine {
--- a/inference-engine/src/readers/ir_reader/ie_cnn_net_reader_impl.cpp
+++ b/inference-engine/src/readers/ir_reader/ie_cnn_net_reader_impl.cpp
@ -19,7 +19,6 @@
 #include "ie_format_parser.h"
 #include "ie_ir_parser.hpp"
 #include "ie_profiling.hpp"
-#include "ie_plugin.hpp"
 #include "parsers.h"
 #include "xml_parse_utils.h"

--- a/inference-engine/src/vpu/myriad_plugin/myriad_infer_request.cpp
+++ b/inference-engine/src/vpu/myriad_plugin/myriad_infer_request.cpp
@ -5,7 +5,6 @@
 #define NOMINMAX
 #include <utility>
 #include <ie_blob.h>
-#include <ie_plugin.hpp>
 #include <description_buffer.hpp>
 #include <ie_layouts.h>
 #include <precision_utils.h>
--- a/inference-engine/tests/functional/inference_engine/so_pointer_tests.cpp
+++ b/inference-engine/tests/functional/inference_engine/so_pointer_tests.cpp
@ -7,12 +7,13 @@
 #include <gmock/gmock-spec-builders.h>

 #include <file_utils.h>
-#include <ie_plugin_ptr.hpp>

 #include <memory>
 #include <common_test_utils/test_assertions.hpp>
 #include <details/ie_so_pointer.hpp>
 #include <details/ie_irelease.hpp>
+#include <cpp_interfaces/interface/ie_plugin.hpp>
+#include <ie_plugin_ptr.hpp>

 using namespace InferenceEngine;
 using namespace InferenceEngine::details;
@ -116,9 +117,7 @@ TEST_F(SymbolLoaderTests, instantiateSymbol) {
        std::string("mock_engine") + IE_BUILD_POSTFIX);
    std::shared_ptr<SharedObjectLoader> sharedLoader(new SharedObjectLoader(name.c_str()));
    SymbolLoader<SharedObjectLoader> loader(sharedLoader);
-    IE_SUPPRESS_DEPRECATED_START
    IInferencePlugin * value = nullptr;
    ASSERT_NE(nullptr, value = loader.instantiateSymbol<IInferencePlugin>(SOCreatorTrait<IInferencePlugin>::name));
    value->Release();
-    IE_SUPPRESS_DEPRECATED_END
 }
--- a/inference-engine/tests/ie_test_utils/unit_test_utils/mocks/cpp_interfaces/impl/mock_executable_network_internal.hpp
+++ b/inference-engine/tests/ie_test_utils/unit_test_utils/mocks/cpp_interfaces/impl/mock_executable_network_internal.hpp
@ -8,7 +8,6 @@
 #include <string>
 #include <vector>

-#include "ie_plugin.hpp"
 #include "ie_input_info.hpp"
 #include "ie_icnn_network.hpp"
 #include "ie_iexecutable_network.hpp"
--- a/inference-engine/tests/ie_test_utils/unit_test_utils/mocks/cpp_interfaces/impl/mock_executable_thread_safe_async_only.hpp
+++ b/inference-engine/tests/ie_test_utils/unit_test_utils/mocks/cpp_interfaces/impl/mock_executable_thread_safe_async_only.hpp
@ -6,7 +6,6 @@

 #include <map>

-#include "ie_plugin.hpp"
 #include "ie_iexecutable_network.hpp"
 #include <gmock/gmock.h>
 #include <string>
--- a/inference-engine/tests/ie_test_utils/unit_test_utils/mocks/cpp_interfaces/impl/mock_infer_request_internal.hpp
+++ b/inference-engine/tests/ie_test_utils/unit_test_utils/mocks/cpp_interfaces/impl/mock_infer_request_internal.hpp
@ -6,7 +6,6 @@

 #include <map>

-#include "ie_plugin.hpp"
 #include "ie_iexecutable_network.hpp"
 #include <gmock/gmock.h>
 #include <string>
--- a/inference-engine/tests/ie_test_utils/unit_test_utils/mocks/cpp_interfaces/interface/mock_iexecutable_network_internal.hpp
+++ b/inference-engine/tests/ie_test_utils/unit_test_utils/mocks/cpp_interfaces/interface/mock_iexecutable_network_internal.hpp
@ -9,7 +9,6 @@
 #include <vector>

 #include <gmock/gmock.h>
-#include "ie_plugin.hpp"

 #include "ie_input_info.hpp"
 #include "ie_icnn_network.hpp"
--- a/inference-engine/tests/ie_test_utils/unit_test_utils/mocks/cpp_interfaces/mock_plugin_impl.hpp
+++ b/inference-engine/tests/ie_test_utils/unit_test_utils/mocks/cpp_interfaces/mock_plugin_impl.hpp
@ -10,7 +10,6 @@
 #include <string>
 #include <vector>

-#include "ie_plugin.hpp"
 #include "ie_iexecutable_network.hpp"
 #include "ie_icore.hpp"
 #include "cpp/ie_executable_network.hpp"
--- a/inference-engine/tests/ie_test_utils/unit_test_utils/mocks/mock_engine/mock_plugin.cpp
+++ b/inference-engine/tests/ie_test_utils/unit_test_utils/mocks/mock_engine/mock_plugin.cpp
@ -8,7 +8,6 @@
 #include <string>

 #include "mock_plugin.hpp"
-#include "ie_plugin.hpp"
 #include "description_buffer.hpp"

 using namespace std;
@ -16,8 +15,6 @@ using namespace InferenceEngine;
 #define ACTION_IF_NOT_NULL(action) (nullptr == _target) ? NOT_IMPLEMENTED : _target->action
 #define IF_NOT_NULL(action) if (nullptr != _target) {_target->action;}

-IE_SUPPRESS_DEPRECATED_START
-
 MockPlugin::MockPlugin(InferenceEngine::IInferencePlugin *target) {
    _target = target;
 }
@ -73,5 +70,3 @@ INFERENCE_PLUGIN_API(InferenceEngine::IInferencePlugin*)CreatePluginEngineProxy(
 INFERENCE_PLUGIN_API(void) InjectProxyEngine(InferenceEngine::IInferencePlugin *target) {
    __target = target;
 }
-
-IE_SUPPRESS_DEPRECATED_END
--- a/inference-engine/tests/ie_test_utils/unit_test_utils/mocks/mock_engine/mock_plugin.hpp
+++ b/inference-engine/tests/ie_test_utils/unit_test_utils/mocks/mock_engine/mock_plugin.hpp
@ -7,11 +7,9 @@
 #include <map>
 #include <string>

-#include <inference_engine.hpp>
-#include <ie_plugin_ptr.hpp>
+#include <cpp_interfaces/interface/ie_plugin.hpp>
 #include <ie_icnn_network.hpp>

-IE_SUPPRESS_DEPRECATED_START
 class MockPlugin : public InferenceEngine::IInferencePlugin {
    InferenceEngine::IInferencePlugin * _target = nullptr;
    InferenceEngine::Version version;
@ -39,5 +37,3 @@ public:

    std::map<std::string, std::string> config;
 };
-
-IE_SUPPRESS_DEPRECATED_END
--- a/inference-engine/tests/ie_test_utils/unit_test_utils/mocks/mock_iinference_plugin.hpp
+++ b/inference-engine/tests/ie_test_utils/unit_test_utils/mocks/mock_iinference_plugin.hpp
@ -7,10 +7,9 @@
 #include <map>
 #include <string>

-#include "ie_plugin.hpp"
+#include "cpp_interfaces/interface/ie_plugin.hpp"
 #include <gmock/gmock.h>

-IE_SUPPRESS_DEPRECATED_START
 class MockIInferencePlugin : public InferenceEngine :: IInferencePlugin {
 public:
    MOCK_QUALIFIED_METHOD2(AddExtension, noexcept, InferenceEngine::StatusCode(InferenceEngine::IExtensionPtr,
@ -32,4 +31,3 @@ public:
    MOCK_QUALIFIED_METHOD2(SetConfig, noexcept, InferenceEngine::StatusCode(const std::map<std::string, std::string> &,
                                                                            InferenceEngine::ResponseDesc *resp));
 };
-IE_SUPPRESS_DEPRECATED_END
--- a/inference-engine/tests/unit/inference_engine/cpp_interfaces/ie_plugin_base_test.cpp
+++ b/inference-engine/tests/unit/inference_engine/cpp_interfaces/ie_plugin_base_test.cpp
@ -6,7 +6,7 @@
 #include <gmock/gmock-spec-builders.h>

 #include <ie_version.hpp>
-#include <cpp/ie_plugin_cpp.hpp>
+#include <ie_plugin_cpp.hpp>
 #include <cpp_interfaces/base/ie_plugin_base.hpp>

 #include "unit_test_utils/mocks/cpp_interfaces/mock_plugin_impl.hpp"
--- a/inference-engine/tests_deprecated/behavior/shared_tests/cpp_wrappers/holders_tests.hpp
+++ b/inference-engine/tests_deprecated/behavior/shared_tests/cpp_wrappers/holders_tests.hpp
@ -3,8 +3,7 @@
 //

 #include <gtest/gtest.h>
-#include <cpp/ie_plugin_cpp.hpp>
-#include <cpp/ie_cnn_net_reader.h>
+#include <ie_core.hpp>

 #include "common_test_utils/xml_net_builder/xml_net_builder.hpp"

--- a/inference-engine/tests_deprecated/behavior/vpu/myriad_tests/vpu_watchdog_tests.cpp
+++ b/inference-engine/tests_deprecated/behavior/vpu/myriad_tests/vpu_watchdog_tests.cpp
@ -15,6 +15,9 @@
 #include "helpers/myriad_devices.hpp"
 #include <details/ie_exception.hpp>

+#include <cpp_interfaces/interface/ie_plugin.hpp>
+#include <ie_plugin_ptr.hpp>
+
 using namespace std;
 using namespace ::testing;
 using namespace InferenceEngine;
--- a/inference-engine/tests_deprecated/functional/vpu/graph_transformer/gt_functional_tests.hpp
+++ b/inference-engine/tests_deprecated/functional/vpu/graph_transformer/gt_functional_tests.hpp
@ -8,7 +8,6 @@

 #include <vpu/middleend/pass_manager.hpp>
 #include <vpu/frontend/frontend.hpp>
-#include <cpp_interfaces/base/ie_inference_plugin_api.hpp>

 class graphTransformerFunctionalTests : public vpuLayersTests {
 protected:
--- a/inference-engine/tests_deprecated/functional/vpu/graph_transformer/merge_permute_and_reorder_test.cpp
+++ b/inference-engine/tests_deprecated/functional/vpu/graph_transformer/merge_permute_and_reorder_test.cpp
@ -8,7 +8,6 @@
 #include <vpu/compile_env.hpp>
 #include <vpu/frontend/frontend.hpp>
 #include <vpu/utils/logger.hpp>
-#include <cpp_interfaces/base/ie_inference_plugin_api.hpp>

 using namespace InferenceEngine;
 using namespace vpu;