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

Removed legacy dependency on snippets (#5656)

Browse Source
This commit is contained in:
Ilya Lavrenov 2021-05-18 00:24:37 +03:00 committed by GitHub
parent 4d6d088c02
commit f84b25722c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -201,7 +201,6 @@ if(WIN32)
endif() endif()
target_link_libraries(${TARGET_NAME}_s PRIVATE openvino::itt ${CMAKE_DL_LIBS} ${NGRAPH_LIBRARIES} target_link_libraries(${TARGET_NAME}_s PRIVATE openvino::itt ${CMAKE_DL_LIBS} ${NGRAPH_LIBRARIES}
inference_engine_snippets
inference_engine_transformations pugixml) inference_engine_transformations pugixml)
target_compile_definitions(${TARGET_NAME}_s PUBLIC USE_STATIC_IE) target_compile_definitions(${TARGET_NAME}_s PUBLIC USE_STATIC_IE)

3
inference-engine/src/legacy_api/CMakeLists.txt
View File

@ -40,7 +40,6 @@ target_include_directories(${TARGET_NAME}_obj PRIVATE
${PUBLIC_HEADERS_DIR} ${PUBLIC_HEADERS_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_SOURCE_DIR}/src
${IE_MAIN_SOURCE_DIR}/src/inference_engine # For CNNNetworkNGraphImpl ${IE_MAIN_SOURCE_DIR}/src/inference_engine # For CNNNetworkNGraphImpl
$<TARGET_PROPERTY:inference_engine_snippets,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:inference_engine_transformations,INTERFACE_INCLUDE_DIRECTORIES> $<TARGET_PROPERTY:inference_engine_transformations,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:inference_engine_plugin_api,INTERFACE_INCLUDE_DIRECTORIES> $<TARGET_PROPERTY:inference_engine_plugin_api,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:ngraph::ngraph,INTERFACE_INCLUDE_DIRECTORIES> $<TARGET_PROPERTY:ngraph::ngraph,INTERFACE_INCLUDE_DIRECTORIES>
@ -61,7 +60,7 @@ add_library(${TARGET_NAME} SHARED
ie_add_vs_version_file(NAME ${TARGET_NAME} ie_add_vs_version_file(NAME ${TARGET_NAME}
FILEDESCRIPTION "Inference Engine Legacy library") FILEDESCRIPTION "Inference Engine Legacy library")
target_link_libraries(${TARGET_NAME} PUBLIC inference_engine inference_engine_snippets target_link_libraries(${TARGET_NAME} PUBLIC inference_engine
PRIVATE pugixml openvino::itt PRIVATE pugixml openvino::itt
${NGRAPH_LIBRARIES} inference_engine_transformations) ${NGRAPH_LIBRARIES} inference_engine_transformations)

10
inference-engine/src/legacy_api/src/convert_function_to_cnn_network.cpp
View File

@ -39,7 +39,6 @@
#include "legacy/ngraph_ops/rnn_sequence_ie.hpp" #include "legacy/ngraph_ops/rnn_sequence_ie.hpp"
#include "legacy/ngraph_ops/lstm_sequence_ie.hpp" #include "legacy/ngraph_ops/lstm_sequence_ie.hpp"
#include "legacy/ngraph_ops/gru_sequence_ie.hpp" #include "legacy/ngraph_ops/gru_sequence_ie.hpp"
#include "snippets/op/subgraph.hpp"
#include "exec_graph_info.hpp" #include "exec_graph_info.hpp"
#include "caseless.hpp" #include "caseless.hpp"
@ -1979,15 +1978,6 @@ void convertFunctionToICNNNetwork(const std::shared_ptr<const ::ngraph::Function
cnnLayer->params[ExecGraphInfoSerialization::ORIGINAL_NAMES] = originalNames; cnnLayer->params[ExecGraphInfoSerialization::ORIGINAL_NAMES] = originalNames;
} }
if (auto subgraph = ::ngraph::as_type_ptr<ngraph::snippets::op::Subgraph>(layer)) {
std::string names = "";
for (const auto& op : subgraph->get_body()->get_ordered_ops()) {
names += ", " + op->get_friendly_name();
}
cnnLayer->params["originalLayersNames"] += names;
}
std::string primitivesPriority = ::ngraph::getPrimitivesPriority(layer); std::string primitivesPriority = ::ngraph::getPrimitivesPriority(layer);
if (!primitivesPriority.empty()) { if (!primitivesPriority.empty()) {
cnnLayer->params["PrimitivesPriority"] = primitivesPriority; cnnLayer->params["PrimitivesPriority"] = primitivesPriority;

9
inference-engine/src/snippets/CMakeLists.txt
View File

@ -52,7 +52,8 @@ ie_developer_export_targets(${TARGET_NAME})
# install # install
install(TARGETS ${TARGET_NAME} # TODO: uncomment once snippets are integrated into CPU plugin
RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core # install(TARGETS ${TARGET_NAME}
ARCHIVE DESTINATION ${IE_CPACK_ARCHIVE_PATH} COMPONENT core # RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core
LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core) # ARCHIVE DESTINATION ${IE_CPACK_ARCHIVE_PATH} COMPONENT core
# LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core)

1
inference-engine/tests_deprecated/unit/CMakeLists.txt
View File

@ -114,7 +114,6 @@ target_link_libraries(${TARGET_NAME} PRIVATE
# dynamic libraries # dynamic libraries
inference_engine_transformations inference_engine_transformations
inference_engine_lp_transformations inference_engine_lp_transformations
inference_engine_snippets
) )
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")