IntenseWebs/openvino
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moved WA for legacy includes to dev package (#1712)

Browse Source 
* Moved WA for legacy includes to dev package

* Fixed compilation

* Fixed compilation

* Fixes
This commit is contained in:
Ilya Lavrenov 2020-10-06 15:04:53 +03:00 committed by GitHub
parent 554fb118e4
commit 984357bdef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 18 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
inference-engine/cmake/developer_package_config.cmake.in
View File

@ -32,6 +32,10 @@ set(GNA "@GNA@")
include("${CMAKE_CURRENT_LIST_DIR}/targets_developer.cmake")
# for compatibility
set_property(TARGET IE::inference_engine_legacy APPEND PROPERTY
INTERFACE_INCLUDE_DIRECTORIES "${IE_MAIN_SOURCE_DIR}/src/legacy_api/include/legacy")
# to allow too create ALIAS for IE::inference_engine in 3rd-party projects
set_property(TARGET IE::inference_engine PROPERTY IMPORTED_GLOBAL TRUE)

1
inference-engine/src/cldnn_engine/cldnn_executable_network.cpp
View File

@ -17,7 +17,6 @@
#include <description_buffer.hpp>
#include <cldnn/cldnn_config.hpp>
#include <legacy/graph_tools.hpp>
#include <legacy/ie_layers_internal.hpp>
#include <legacy/net_pass.h>
#include "cldnn_infer_request.h"
#include <threading/ie_executor_manager.hpp>

3
inference-engine/src/cldnn_engine/cldnn_graph.cpp
View File

@ -18,7 +18,6 @@
#include <description_buffer.hpp>
#include <cldnn/cldnn_config.hpp>
#include <legacy/graph_tools.hpp>
#include <legacy/ie_layers_internal.hpp>
#include <legacy/net_pass.h>
#include "cldnn_infer_request.h"
#include <threading/ie_executor_manager.hpp>
@ -27,7 +26,7 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <exec_graph_info.hpp>
#include "ie_ngraph_utils.hpp"
#include <legacy/ie_ngraph_utils.hpp>
#include "generic_ie.hpp"
#include <ngraph/variant.hpp>

2
inference-engine/src/gna_plugin/backend/dnn_components.cpp
View File

@ -8,7 +8,7 @@
#include <ie_common.h>
#include <legacy/ie_layers.h>
#include <iomanip>
#include <details/caseless.hpp>
#include <caseless.hpp>
#include <layers/gna_copy_layer.hpp>
#include "backend/dnn_types.h"

2
inference-engine/src/gna_plugin/connection_details.hpp
View File

@ -4,7 +4,7 @@
#pragma once
#include "ie_layers.h"
#include <legacy/ie_layers.h>
namespace GNAPluginNS {
struct ConnectionDetails {

4
inference-engine/src/gna_plugin/gna_graph_compiler.hpp
View File

@ -11,9 +11,7 @@
#include <string>
#include <vector>
#include "ie_layers.h"
#include <ie_data.h>
#include <ie_common.h>
#include <legacy/ie_layers.h>
#include "descriptions/gna_input_desc.hpp"
#include "descriptions/gna_flags.hpp"
#include "connection_details.hpp"

2
inference-engine/src/gna_plugin/layers/gna_concat_layer.hpp
View File

@ -7,7 +7,7 @@
#include <string>
#include <vector>
#include "ie_layers.h"
#include <legacy/ie_layers.h>
namespace GNAPluginNS {
class GNAConcatLayer {

2
inference-engine/src/gna_plugin/layers/gna_crop_layer.hpp
View File

@ -4,7 +4,7 @@
#pragma once
#include "ie_layers.h"
#include <legacy/ie_layers.h>
namespace GNAPluginNS {
class GNACropLayer {

2
inference-engine/src/gna_plugin/layers/gna_layer_info.hpp
View File

@ -7,7 +7,7 @@
#include <string>
#include <memory>
#include <vector>
#include "ie_layers.h"
#include <legacy/ie_layers.h>
#include "caseless.hpp"
#include "ie_algorithm.hpp"
#include "backend/gna_types.h"

2
inference-engine/src/gna_plugin/layers/gna_memory_layer.hpp
View File

@ -4,7 +4,7 @@
#pragma once
#include "ie_layers.h"
#include <legacy/ie_layers.h>
namespace GNAPluginNS {
/**

2
inference-engine/src/hetero_plugin/hetero_executable_network.cpp
View File

@ -23,7 +23,7 @@
#include <array>
#include <cstdint>
#include "ie_ngraph_utils.hpp"
#include "legacy/ie_ngraph_utils.hpp"
#include "ie_plugin_config.hpp"
#include "cpp_interfaces/interface/ie_internal_plugin_config.hpp"
#include "hetero/hetero_plugin_config.hpp"

1
inference-engine/src/inference_engine/CMakeLists.txt
View File

@ -104,7 +104,6 @@ add_library(${TARGET_NAME}_plugin_api INTERFACE)
target_include_directories(${TARGET_NAME}_plugin_api INTERFACE
"${IE_MAIN_SOURCE_DIR}/src/plugin_api"
"${IE_MAIN_SOURCE_DIR}/src/legacy_api/include"
"${IE_MAIN_SOURCE_DIR}/src/legacy_api/include/legacy" # for compatibility
$<TARGET_PROPERTY:${TARGET_NAME}_preproc,INTERFACE_INCLUDE_DIRECTORIES>
${PUBLIC_HEADERS_DIR})

2
inference-engine/src/inference_engine/shape_infer/ie_priorgridgenerator_onnx_shape_infer.hpp
View File

@ -4,8 +4,6 @@
#pragma once
#include <ie_layers.h>
#include <description_buffer.hpp>
#include <map>
#include <memory>

4
inference-engine/src/mkldnn_plugin/nodes/mkldnn_interpolate_node.cpp
View File

@ -7,13 +7,13 @@
#include "mkldnn_quantize_node.h"
#include "mkldnn_depthwise_node.h"
#include "mkldnn_activation_node.h"
#include <ie_layers.h>
#include <legacy/ie_layers.h>
#include <mkldnn.hpp>
#include <string>
#include <vector>
#include <mkldnn_types.h>
#include <mkldnn_extension_utils.h>
#include <ie_layers_internal.hpp>
#include <legacy/ie_layers_internal.hpp>
#include "ie_parallel.hpp"
#include <algorithm>

3
inference-engine/src/mkldnn_plugin/nodes/mkldnn_reduce_node.cpp
View File

@ -7,13 +7,12 @@
#include "mkldnn_quantize_node.h"
#include "mkldnn_depthwise_node.h"
#include "mkldnn_activation_node.h"
#include <ie_layers.h>
#include <legacy/ie_layers.h>
#include <mkldnn.hpp>
#include <string>
#include <vector>
#include <mkldnn_types.h>
#include <mkldnn_extension_utils.h>
#include <ie_layers_internal.hpp>
#include "ie_parallel.hpp"
#include <algorithm>

4
inference-engine/src/plugin_api/cpp_interfaces/interface/ie_iplugin_internal.hpp
View File

@ -59,8 +59,6 @@ static void copyInputOutputInfo(const InputsDataMap & networkInputs, const Outpu
_networkInputs.clear();
_networkOutputs.clear();
IE_SUPPRESS_DEPRECATED_START
for (const auto& it : networkInputs) {
InputInfo::Ptr newPtr;
if (it.second) {
@ -78,8 +76,6 @@ static void copyInputOutputInfo(const InputsDataMap & networkInputs, const Outpu
}
_networkOutputs[it.first] = newData;
}
IE_SUPPRESS_DEPRECATED_END
}
/**

5
inference-engine/src/plugin_api/details/caseless.hpp
View File

@ -1,5 +0,0 @@
// Copyright (C) 2018-2020 Intel Corporation
// SPDX-License-Identifier: Apache-2.0
//
#include "../caseless.hpp"

5
inference-engine/tests/unit/cpu/bf16_transformer_test.cpp
View File

@ -8,9 +8,8 @@
#include <ngraph/ngraph.hpp>
#include <ngraph_ops/fully_connected.hpp>
#include <inference_engine.hpp>
#include <details/ie_cnn_network_tools.h>
#include <convert_function_to_cnn_network.hpp>
#include <legacy/details/ie_cnn_network_tools.h>
#include <legacy/convert_function_to_cnn_network.hpp>
#include <bf16transformer.h>
using ngraph::Shape;