From f17262e05f448bc69b2162c137ce0736d3e48cfb Mon Sep 17 00:00:00 2001 From: Ilya Churaev Date: Mon, 17 Aug 2020 19:43:11 +0300 Subject: [PATCH] Add static library with nGraph reference implementations (#1810) * Removed reference implementations from public API * Remove coordinate_transform from public API * Introduced static library with reference implementations --- CMakeLists.txt | 26 +++++++++++++ .../include/single_layer_tests/activation.hpp | 1 - .../shared/include/single_layer_tests/grn.hpp | 1 - ngraph/core/CMakeLists.txt | 9 +++-- ngraph/core/include/ngraph/ngraph.hpp | 1 - ngraph/core/reference/CMakeLists.txt | 43 ++++++++++++++++++++++ .../include/ngraph/coordinate_transform.hpp | 0 .../ngraph/runtime/opt_kernel/broadcast.hpp | 0 .../include/ngraph/runtime/opt_kernel/reshape.hpp | 0 .../include/ngraph/runtime/reference/abs.hpp | 0 .../include/ngraph/runtime/reference/acos.hpp | 0 .../include/ngraph/runtime/reference/acosh.hpp | 0 .../include/ngraph/runtime/reference/add.hpp | 0 .../include/ngraph/runtime/reference/and.hpp | 0 .../include/ngraph/runtime/reference/any.hpp | 0 .../include/ngraph/runtime/reference/asin.hpp | 0 .../include/ngraph/runtime/reference/asinh.hpp | 0 .../include/ngraph/runtime/reference/atan.hpp | 0 .../include/ngraph/runtime/reference/atan2.hpp | 0 .../include/ngraph/runtime/reference/atanh.hpp | 0 .../runtime/reference/autobroadcast_binop.hpp | 0 .../include/ngraph/runtime/reference/avg_pool.hpp | 0 .../ngraph/runtime/reference/batch_norm.hpp | 0 .../include/ngraph/runtime/reference/broadcast.hpp | 0 .../include/ngraph/runtime/reference/ceiling.hpp | 0 .../include/ngraph/runtime/reference/clamp.hpp | 0 .../include/ngraph/runtime/reference/concat.hpp | 0 .../include/ngraph/runtime/reference/constant.hpp | 0 .../include/ngraph/runtime/reference/convert.hpp | 0 .../ngraph/runtime/reference/convolution.hpp | 0 .../include/ngraph/runtime/reference/copy.hpp | 0 .../include/ngraph/runtime/reference/cos.hpp | 0 .../include/ngraph/runtime/reference/cosh.hpp | 0 .../include/ngraph/runtime}/reference/ctc_loss.hpp | 0 .../include/ngraph/runtime/reference/cum_sum.hpp | 0 .../ngraph/runtime/reference/dequantize.hpp | 0 .../ngraph/runtime}/reference/detection_output.hpp | 0 .../include/ngraph/runtime/reference/divide.hpp | 0 .../include/ngraph/runtime/reference/dot.hpp | 0 .../include/ngraph/runtime/reference/elu.hpp | 0 .../reference/embedding_bag_offsets_sum.hpp | 0 .../runtime/reference/embedding_bag_packed_sum.hpp | 0 .../runtime/reference/embedding_segments_sum.hpp | 0 .../include/ngraph/runtime/reference/equal.hpp | 0 .../include/ngraph/runtime/reference/erf.hpp | 0 .../ngraph/runtime/reference/eval_helpers.hpp | 0 .../include/ngraph/runtime/reference/exp.hpp | 0 .../runtime/reference/extract_image_patches.hpp | 0 .../include/ngraph/runtime/reference/floor.hpp | 0 .../include/ngraph/runtime/reference/gather.hpp | 0 .../include/ngraph/runtime/reference/gather_nd.hpp | 0 .../include/ngraph/runtime/reference/greater.hpp | 0 .../ngraph/runtime/reference/greater_eq.hpp | 0 .../include/ngraph/runtime/reference/less.hpp | 0 .../include/ngraph/runtime/reference/less_eq.hpp | 0 .../include/ngraph/runtime/reference/log.hpp | 0 .../ngraph/runtime/reference/logical_reduction.hpp | 0 .../include/ngraph/runtime/reference/lrn.hpp | 0 .../include/ngraph/runtime/reference/matmul.hpp | 0 .../include/ngraph/runtime/reference/max.hpp | 0 .../include/ngraph/runtime/reference/max_pool.hpp | 0 .../include/ngraph/runtime/reference/maximum.hpp | 0 .../include/ngraph/runtime/reference/mean.hpp | 0 .../include/ngraph/runtime/reference/min.hpp | 0 .../include/ngraph/runtime/reference/minimum.hpp | 0 .../include/ngraph/runtime/reference/mish.hpp | 0 .../include/ngraph/runtime/reference/multiply.hpp | 0 .../include/ngraph/runtime/reference/negate.hpp | 0 .../include/ngraph/runtime/reference/non_zero.hpp | 0 .../include/ngraph/runtime/reference/not.hpp | 0 .../include/ngraph/runtime/reference/not_equal.hpp | 0 .../include/ngraph/runtime/reference/one_hot.hpp | 0 .../include/ngraph/runtime/reference/or.hpp | 0 .../include/ngraph/runtime/reference/pad.hpp | 0 .../include/ngraph/runtime/reference/power.hpp | 0 .../include/ngraph/runtime/reference/prelu.hpp | 0 .../include/ngraph/runtime/reference/prior_box.hpp | 0 .../runtime/reference/prior_box_clustered.hpp | 0 .../include/ngraph/runtime/reference/product.hpp | 0 .../include/ngraph/runtime/reference/quantize.hpp | 0 .../include/ngraph/runtime/reference/range.hpp | 0 .../include/ngraph/runtime/reference/reduce_l1.hpp | 0 .../include/ngraph/runtime/reference/reduce_l2.hpp | 0 .../include/ngraph/runtime/reference/relu.hpp | 0 .../ngraph/runtime/reference/replace_slice.hpp | 0 .../include/ngraph/runtime/reference/reshape.hpp | 0 .../include/ngraph/runtime/reference/result.hpp | 0 .../include/ngraph/runtime/reference/reverse.hpp | 1 - .../ngraph/runtime/reference/reverse_sequence.hpp | 0 .../include/ngraph/runtime/reference/round.hpp | 0 .../runtime/reference/scatter_elements_update.hpp | 0 .../runtime}/reference/scatter_nd_update.hpp | 0 .../ngraph/runtime}/reference/scatter_update.hpp | 0 .../include/ngraph/runtime/reference/select.hpp | 0 .../include/ngraph/runtime/reference/shape_of.hpp | 0 .../include/ngraph/runtime/reference/sigmoid.hpp | 0 .../include/ngraph/runtime/reference/sign.hpp | 0 .../include/ngraph/runtime/reference/sin.hpp | 0 .../include/ngraph/runtime/reference/sinh.hpp | 0 .../include/ngraph/runtime/reference/slice.hpp | 0 .../include/ngraph/runtime/reference/softmax.hpp | 0 .../include/ngraph/runtime/reference/sqrt.hpp | 0 .../ngraph/runtime/reference/strided_slice.hpp | 0 .../include/ngraph/runtime/reference/subtract.hpp | 0 .../include/ngraph/runtime/reference/sum.hpp | 0 .../include/ngraph/runtime/reference/swish.hpp | 0 .../include/ngraph/runtime/reference/tan.hpp | 0 .../include/ngraph/runtime/reference/tanh.hpp | 0 .../include/ngraph/runtime/reference/tile.hpp | 0 .../include/ngraph/runtime/reference/topk.hpp | 0 .../include/ngraph/runtime/reference/xor.hpp | 0 .../{ => reference}/src/coordinate_transform.cpp | 0 .../src/runtime/opt_kernel/reshape.cpp | 0 .../src/runtime/reference/eval_helpers.cpp | 0 .../src/runtime/reference/reshape.cpp | 0 .../src/runtime/reference/reverse.cpp | 0 .../src/runtime/reference/slice.cpp | 0 .../src/runtime/reference/strided_slice.cpp | 0 .../{ => reference}/src/runtime/reference/tile.cpp | 0 ngraph/core/src/op/prelu.cpp | 2 +- ngraph/test/coordinate.cpp | 1 + ngraph/test/runtime/CMakeLists.txt | 3 +- ngraph/test/runtime/interpreter/int_executable.hpp | 9 ++--- openvino/CMakeLists.txt | 25 ------------- 124 files changed, 83 insertions(+), 39 deletions(-) create mode 100644 ngraph/core/reference/CMakeLists.txt rename ngraph/core/{ => reference}/include/ngraph/coordinate_transform.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/opt_kernel/broadcast.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/opt_kernel/reshape.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/abs.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/acos.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/acosh.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/add.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/and.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/any.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/asin.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/asinh.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/atan.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/atan2.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/atanh.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/autobroadcast_binop.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/avg_pool.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/batch_norm.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/broadcast.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/ceiling.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/clamp.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/concat.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/constant.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/convert.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/convolution.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/copy.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/cos.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/cosh.hpp (100%) rename ngraph/{test/runtime/interpreter => core/reference/include/ngraph/runtime}/reference/ctc_loss.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/cum_sum.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/dequantize.hpp (100%) rename ngraph/{test/runtime/interpreter => core/reference/include/ngraph/runtime}/reference/detection_output.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/divide.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/dot.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/elu.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/embedding_bag_offsets_sum.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/embedding_bag_packed_sum.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/embedding_segments_sum.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/equal.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/erf.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/eval_helpers.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/exp.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/extract_image_patches.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/floor.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/gather.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/gather_nd.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/greater.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/greater_eq.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/less.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/less_eq.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/log.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/logical_reduction.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/lrn.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/matmul.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/max.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/max_pool.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/maximum.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/mean.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/min.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/minimum.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/mish.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/multiply.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/negate.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/non_zero.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/not.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/not_equal.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/one_hot.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/or.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/pad.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/power.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/prelu.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/prior_box.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/prior_box_clustered.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/product.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/quantize.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/range.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/reduce_l1.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/reduce_l2.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/relu.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/replace_slice.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/reshape.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/result.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/reverse.hpp (98%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/reverse_sequence.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/round.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/scatter_elements_update.hpp (100%) rename ngraph/{test/runtime/interpreter => core/reference/include/ngraph/runtime}/reference/scatter_nd_update.hpp (100%) rename ngraph/{test/runtime/interpreter => core/reference/include/ngraph/runtime}/reference/scatter_update.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/select.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/shape_of.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/sigmoid.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/sign.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/sin.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/sinh.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/slice.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/softmax.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/sqrt.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/strided_slice.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/subtract.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/sum.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/swish.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/tan.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/tanh.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/tile.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/topk.hpp (100%) rename ngraph/core/{ => reference}/include/ngraph/runtime/reference/xor.hpp (100%) rename ngraph/core/{ => reference}/src/coordinate_transform.cpp (100%) rename ngraph/core/{ => reference}/src/runtime/opt_kernel/reshape.cpp (100%) rename ngraph/core/{ => reference}/src/runtime/reference/eval_helpers.cpp (100%) rename ngraph/core/{ => reference}/src/runtime/reference/reshape.cpp (100%) rename ngraph/core/{ => reference}/src/runtime/reference/reverse.cpp (100%) rename ngraph/core/{ => reference}/src/runtime/reference/slice.cpp (100%) rename ngraph/core/{ => reference}/src/runtime/reference/strided_slice.cpp (100%) rename ngraph/core/{ => reference}/src/runtime/reference/tile.cpp (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0eff7fe..a93455a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -117,6 +117,32 @@ function(build_ngraph) set(NGRAPH_LIBRARIES ngraph PARENT_SCOPE) endfunction() +file(REMOVE "${CMAKE_BINARY_DIR}/openvino_targets_developer.cmake") + +unset(OpenVINODeveloperPackageTargets CACHE) + +function(openvino_developer_export_targets) + set(OpenVINODeveloperPackageTargets "${OpenVINODeveloperPackageTargets};${ARGV}") + + # to allow exporting of aliased targets with the original names + foreach(target_name ${OpenVINODeveloperPackageTargets}) + if(TARGET "${target_name}") + get_target_property(original_name ${target_name} ALIASED_TARGET) + if(TARGET "${original_name}") + message(STATUS "The name ${target_name} is an ALIAS for ${original_name}. " + "It will be exported to the InferenceEngineDeveloperPackage with the original name.") + list(REMOVE_ITEM OpenVINODeveloperPackageTargets ${target_name}) + list(APPEND OpenVINODeveloperPackageTargets ${original_name}) + endif() + endif() + endforeach() + + list(REMOVE_DUPLICATES OpenVINODeveloperPackageTargets) + set(OpenVINODeveloperPackageTargets "${OpenVINODeveloperPackageTargets}" CACHE INTERNAL + "Paths to extra Inference Engine plugins" FORCE) +endfunction() + + add_subdirectory(openvino) build_ngraph() diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/activation.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/activation.hpp index a19bd21..54288e4 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/activation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/activation.hpp @@ -19,7 +19,6 @@ #include "details/ie_exception.hpp" #include "ngraph/opsets/opset1.hpp" -#include "ngraph/runtime/reference/relu.hpp" #include "functional_test_utils/blob_utils.hpp" #include "functional_test_utils/layer_test_utils.hpp" diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/grn.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/grn.hpp index 6dcf2c8..357361a 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/grn.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/grn.hpp @@ -19,7 +19,6 @@ #include "details/ie_exception.hpp" #include "ngraph/opsets/opset1.hpp" -#include "ngraph/runtime/reference/relu.hpp" #include "functional_test_utils/blob_utils.hpp" #include "functional_test_utils/layer_test_utils.hpp" diff --git a/ngraph/core/CMakeLists.txt b/ngraph/core/CMakeLists.txt index 2f9830f..665d66a 100644 --- a/ngraph/core/CMakeLists.txt +++ b/ngraph/core/CMakeLists.txt @@ -16,11 +16,14 @@ add_definitions(-DIN_NGRAPH_LIBRARY) -file(GLOB_RECURSE LIBRARY_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp) +file(GLOB_RECURSE LIBRARY_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/*.hpp) file(GLOB_RECURSE PUBLIC_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/include/*.hpp) set(NGRAPH_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include/ngraph CACHE INTERNAL "") +add_subdirectory(reference) + # Create named folders for the sources within the .vcproj # Empty name lists them directly under the .vcproj @@ -37,7 +40,7 @@ set_target_properties(ngraph PROPERTIES C_VISIBILITY_PRESET hidden VISIBILITY_INLINES_HIDDEN ON) -target_link_libraries(ngraph PRIVATE openvino::itt) +target_link_libraries(ngraph PRIVATE openvino::itt ngraph::reference) find_package(Graphviz QUIET) if (GRAPHVIZ_FOUND) @@ -81,12 +84,12 @@ target_include_directories(ngraph PUBLIC $ +#include #include "ngraph/itt.hpp" #include "ngraph/builder/autobroadcast.hpp" diff --git a/ngraph/test/coordinate.cpp b/ngraph/test/coordinate.cpp index 78af9d9..9a472b7 100644 --- a/ngraph/test/coordinate.cpp +++ b/ngraph/test/coordinate.cpp @@ -20,6 +20,7 @@ #include "gtest/gtest.h" +#include #include "ngraph/ngraph.hpp" #include "util/ndarray.hpp" #include "util/test_tools.hpp" diff --git a/ngraph/test/runtime/CMakeLists.txt b/ngraph/test/runtime/CMakeLists.txt index 152f297..c439224 100644 --- a/ngraph/test/runtime/CMakeLists.txt +++ b/ngraph/test/runtime/CMakeLists.txt @@ -57,7 +57,8 @@ target_compile_definitions(ngraph_backend SHARED_LIB_PREFIX="${CMAKE_SHARED_LIBRARY_PREFIX}" SHARED_LIB_SUFFIX="${IE_BUILD_POSTFIX}${CMAKE_SHARED_LIBRARY_SUFFIX}" ) -target_link_libraries(ngraph_backend PUBLIC ngraph) +target_link_libraries(ngraph_backend PUBLIC ngraph + ngraph::reference) if (NOT WIN32) target_link_libraries(ngraph_backend PRIVATE dl) endif() diff --git a/ngraph/test/runtime/interpreter/int_executable.hpp b/ngraph/test/runtime/interpreter/int_executable.hpp index dd33104..3bf6783 100644 --- a/ngraph/test/runtime/interpreter/int_executable.hpp +++ b/ngraph/test/runtime/interpreter/int_executable.hpp @@ -44,8 +44,10 @@ #include "ngraph/runtime/reference/convolution.hpp" #include "ngraph/runtime/reference/cos.hpp" #include "ngraph/runtime/reference/cosh.hpp" +#include "ngraph/runtime/reference/ctc_loss.hpp" #include "ngraph/runtime/reference/cum_sum.hpp" #include "ngraph/runtime/reference/dequantize.hpp" +#include "ngraph/runtime/reference/detection_output.hpp" #include "ngraph/runtime/reference/dot.hpp" #include "ngraph/runtime/reference/elu.hpp" #include "ngraph/runtime/reference/embedding_bag_offsets_sum.hpp" @@ -76,6 +78,8 @@ #include "ngraph/runtime/reference/reverse.hpp" #include "ngraph/runtime/reference/reverse_sequence.hpp" #include "ngraph/runtime/reference/round.hpp" +#include "ngraph/runtime/reference/scatter_nd_update.hpp" +#include "ngraph/runtime/reference/scatter_update.hpp" #include "ngraph/runtime/reference/select.hpp" #include "ngraph/runtime/reference/sigmoid.hpp" #include "ngraph/runtime/reference/sign.hpp" @@ -92,11 +96,6 @@ #include "op/convolution.hpp" #include "op/group_conv.hpp" -#include "reference/ctc_loss.hpp" -#include "reference/detection_output.hpp" -#include "reference/scatter_nd_update.hpp" -#include "reference/scatter_update.hpp" - namespace ngraph { namespace runtime diff --git a/openvino/CMakeLists.txt b/openvino/CMakeLists.txt index 2568364..cf32e58 100644 --- a/openvino/CMakeLists.txt +++ b/openvino/CMakeLists.txt @@ -16,31 +16,6 @@ cmake_minimum_required(VERSION 3.10) -file(REMOVE "${CMAKE_BINARY_DIR}/openvino_targets_developer.cmake") - -unset(OpenVINODeveloperPackageTargets CACHE) - -function(openvino_developer_export_targets) - set(OpenVINODeveloperPackageTargets "${OpenVINODeveloperPackageTargets};${ARGV}") - - # to allow exporting of aliased targets with the original names - foreach(target_name ${OpenVINODeveloperPackageTargets}) - if(TARGET "${target_name}") - get_target_property(original_name ${target_name} ALIASED_TARGET) - if(TARGET "${original_name}") - message(STATUS "The name ${target_name} is an ALIAS for ${original_name}. " - "It will be exported to the InferenceEngineDeveloperPackage with the original name.") - list(REMOVE_ITEM OpenVINODeveloperPackageTargets ${target_name}) - list(APPEND OpenVINODeveloperPackageTargets ${original_name}) - endif() - endif() - endforeach() - - list(REMOVE_DUPLICATES OpenVINODeveloperPackageTargets) - set(OpenVINODeveloperPackageTargets "${OpenVINODeveloperPackageTargets}" CACHE INTERNAL - "Paths to extra Inference Engine plugins" FORCE) -endfunction() - add_subdirectory(itt) openvino_developer_export_targets(openvino::itt) -- 2.7.4