From d25bb6314a10cd8fc3c49ea3745f4801dd2eae95 Mon Sep 17 00:00:00 2001 From: Ilya Churaev Date: Thu, 20 Aug 2020 12:27:14 +0300 Subject: [PATCH] Deprecate nGraph v0 ops and builders (#1856) * Deprecate nGraph v0 ops * Fixed build * Added deprecated defines to fix windows --- .../common_optimizations/nop_elimination.cpp | 2 + .../transformations/nop_elimination.cpp | 2 + .../core/include/ngraph/builder/autobroadcast.hpp | 27 ++++++- .../core/include/ngraph/builder/make_constant.hpp | 3 +- .../core/include/ngraph/builder/matmul_factory.hpp | 12 +++- ngraph/core/include/ngraph/builder/split.hpp | 2 + ngraph/core/include/ngraph/op/add.hpp | 9 ++- ngraph/core/include/ngraph/op/any.hpp | 8 ++- ngraph/core/include/ngraph/op/broadcast.hpp | 12 +++- ngraph/core/include/ngraph/op/dequantize.hpp | 8 ++- ngraph/core/include/ngraph/op/divide.hpp | 10 ++- ngraph/core/include/ngraph/op/dot.hpp | 8 ++- ngraph/core/include/ngraph/op/equal.hpp | 9 ++- ngraph/core/include/ngraph/op/gather.hpp | 8 ++- ngraph/core/include/ngraph/op/gather_nd.hpp | 8 ++- ngraph/core/include/ngraph/op/greater.hpp | 9 ++- ngraph/core/include/ngraph/op/greater_eq.hpp | 12 ++-- ngraph/core/include/ngraph/op/less.hpp | 9 ++- ngraph/core/include/ngraph/op/less_eq.hpp | 9 ++- ngraph/core/include/ngraph/op/max.hpp | 9 ++- ngraph/core/include/ngraph/op/maximum.hpp | 9 ++- ngraph/core/include/ngraph/op/min.hpp | 9 ++- ngraph/core/include/ngraph/op/minimum.hpp | 9 ++- ngraph/core/include/ngraph/op/multiply.hpp | 10 ++- ngraph/core/include/ngraph/op/not.hpp | 8 ++- ngraph/core/include/ngraph/op/not_equal.hpp | 9 ++- ngraph/core/include/ngraph/op/one_hot.hpp | 8 ++- ngraph/core/include/ngraph/op/op_version_tbl.hpp | 5 +- ngraph/core/include/ngraph/op/or.hpp | 9 ++- ngraph/core/include/ngraph/op/pad.hpp | 8 ++- ngraph/core/include/ngraph/op/passthrough.hpp | 72 ------------------- ngraph/core/include/ngraph/op/power.hpp | 9 ++- ngraph/core/include/ngraph/op/product.hpp | 9 ++- ngraph/core/include/ngraph/op/quantize.hpp | 8 ++- .../include/ngraph/op/quantized_convolution.hpp | 8 ++- ngraph/core/include/ngraph/op/quantized_dot.hpp | 8 ++- ngraph/core/include/ngraph/op/replace_slice.hpp | 8 ++- ngraph/core/include/ngraph/op/reshape.hpp | 8 ++- ngraph/core/include/ngraph/op/reverse.hpp | 8 ++- ngraph/core/include/ngraph/op/round.hpp | 8 ++- ngraph/core/include/ngraph/op/scatter_add.hpp | 83 ---------------------- ngraph/core/include/ngraph/op/select.hpp | 8 ++- ngraph/core/include/ngraph/op/slice.hpp | 8 ++- ngraph/core/include/ngraph/op/softmax.hpp | 8 ++- ngraph/core/include/ngraph/op/split.hpp | 8 ++- ngraph/core/include/ngraph/op/stop_gradient.hpp | 8 ++- ngraph/core/include/ngraph/op/subtract.hpp | 10 ++- ngraph/core/include/ngraph/op/sum.hpp | 7 +- ngraph/core/include/ngraph/op/topk.hpp | 8 ++- ngraph/core/include/ngraph/ops.hpp | 1 - .../include/ngraph/runtime/reference/matmul.hpp | 4 ++ .../include/ngraph/runtime/reference/quantize.hpp | 4 ++ .../include/ngraph/runtime/reference/topk.hpp | 4 ++ ngraph/core/src/builder/autobroadcast.cpp | 2 + ngraph/core/src/builder/matmul_factory.cpp | 2 + ngraph/core/src/builder/split.cpp | 2 + ngraph/core/src/graph_util.cpp | 2 + ngraph/core/src/op/add.cpp | 2 + ngraph/core/src/op/any.cpp | 2 + ngraph/core/src/op/broadcast.cpp | 2 + ngraph/core/src/op/dequantize.cpp | 2 + ngraph/core/src/op/divide.cpp | 2 + ngraph/core/src/op/dot.cpp | 2 + ngraph/core/src/op/equal.cpp | 2 + ngraph/core/src/op/gather.cpp | 2 + ngraph/core/src/op/gather_nd.cpp | 2 + ngraph/core/src/op/greater.cpp | 2 + ngraph/core/src/op/greater_eq.cpp | 2 + ngraph/core/src/op/less.cpp | 2 + ngraph/core/src/op/less_eq.cpp | 2 + ngraph/core/src/op/max.cpp | 2 + ngraph/core/src/op/maximum.cpp | 2 + ngraph/core/src/op/min.cpp | 2 + ngraph/core/src/op/minimum.cpp | 2 + ngraph/core/src/op/multiply.cpp | 2 + ngraph/core/src/op/not.cpp | 2 + ngraph/core/src/op/not_equal.cpp | 2 + ngraph/core/src/op/one_hot.cpp | 2 + ngraph/core/src/op/or.cpp | 2 + ngraph/core/src/op/pad.cpp | 2 + ngraph/core/src/op/passthrough.cpp | 74 ------------------- ngraph/core/src/op/power.cpp | 2 + ngraph/core/src/op/product.cpp | 2 + ngraph/core/src/op/quantize.cpp | 2 + ngraph/core/src/op/quantized_convolution.cpp | 2 + ngraph/core/src/op/quantized_dot.cpp | 2 + ngraph/core/src/op/replace_slice.cpp | 2 + ngraph/core/src/op/reshape.cpp | 2 + ngraph/core/src/op/reverse.cpp | 2 + ngraph/core/src/op/round.cpp | 2 + ngraph/core/src/op/select.cpp | 2 + ngraph/core/src/op/slice.cpp | 2 + ngraph/core/src/op/softmax.cpp | 2 + ngraph/core/src/op/split.cpp | 2 + ngraph/core/src/op/stop_gradient.cpp | 2 + ngraph/core/src/op/subtract.cpp | 2 + ngraph/core/src/op/sum.cpp | 2 + ngraph/core/src/op/topk.cpp | 2 + ngraph/core/src/op/util/op_types.cpp | 2 + ngraph/core/src/op/util/rnn_cell_base.cpp | 8 +-- .../pass/constant_folding_arithmetic_reduction.cpp | 2 + .../core/src/pass/constant_folding_dequantize.cpp | 2 + .../pass/constant_folding_logical_reduction.cpp | 2 + ngraph/core/src/pass/constant_folding_quantize.cpp | 2 + ngraph/core/src/pass/constant_folding_select.cpp | 2 + ngraph/core/src/validation_util.cpp | 2 + ngraph/frontend/onnx_import/src/op/gru.cpp | 3 + ngraph/frontend/onnx_import/src/op/lstm.cpp | 2 + .../frontend/onnx_import/src/op/matmul_integer.cpp | 2 + .../frontend/onnx_import/src/op/qlinear_matmul.cpp | 2 + .../frontend/onnx_import/src/utils/recurrent.cpp | 2 + ngraph/test/backend/abc.in.cpp | 2 + ngraph/test/backend/add.in.cpp | 2 + ngraph/test/backend/aliased_output.in.cpp | 2 + ngraph/test/backend/any.in.cpp | 2 + ngraph/test/backend/api.in.cpp | 2 + ngraph/test/backend/auto_broadcast.in.cpp | 2 + ngraph/test/backend/broadcast.in.cpp | 2 + ngraph/test/backend/comparison.in.cpp | 2 + ngraph/test/backend/concat.in.cpp | 2 + ngraph/test/backend/constant.in.cpp | 2 + ngraph/test/backend/divide.in.cpp | 2 + ngraph/test/backend/dot.in.cpp | 2 + ngraph/test/backend/dynamic.in.cpp | 2 + ngraph/test/backend/function_name.in.cpp | 2 + ngraph/test/backend/fused_op.in.cpp | 2 + ngraph/test/backend/gather.in.cpp | 2 + ngraph/test/backend/logical_or.in.cpp | 2 + ngraph/test/backend/max.in.cpp | 2 + ngraph/test/backend/maximum.in.cpp | 2 + ngraph/test/backend/min.in.cpp | 2 + ngraph/test/backend/minimum.in.cpp | 2 + ngraph/test/backend/multiple_backends.in.cpp | 2 + ngraph/test/backend/multiple_result.in.cpp | 2 + ngraph/test/backend/multiply.in.cpp | 2 + ngraph/test/backend/node_name.in.cpp | 2 + ngraph/test/backend/not.in.cpp | 2 + ngraph/test/backend/numeric.in.cpp | 2 + ngraph/test/backend/one_hot.in.cpp | 2 + ngraph/test/backend/power.in.cpp | 2 + ngraph/test/backend/product.in.cpp | 2 + ngraph/test/backend/quantize_dequantize.in.cpp | 2 + ngraph/test/backend/quantized_convolution.in.cpp | 2 + ngraph/test/backend/quantized_dot.in.cpp | 2 + ngraph/test/backend/relu.in.cpp | 2 + ngraph/test/backend/replace_slice.in.cpp | 2 + ngraph/test/backend/reshape.in.cpp | 2 + ngraph/test/backend/reverse.in.cpp | 2 + ngraph/test/backend/round.in.cpp | 2 + ngraph/test/backend/select.in.cpp | 2 + ngraph/test/backend/slice.in.cpp | 2 + ngraph/test/backend/softmax.in.cpp | 2 + ngraph/test/backend/subtract.in.cpp | 2 + ngraph/test/backend/sum.in.cpp | 2 + ngraph/test/backend/topk.in.cpp | 2 + ngraph/test/backend/validate_call.in.cpp | 2 + ngraph/test/backend/zero_sized.in.cpp | 2 + ngraph/test/backend_debug_api.cpp | 2 + ngraph/test/build_graph.cpp | 3 + ngraph/test/builder_autobroadcast.cpp | 2 + ngraph/test/constant_folding.cpp | 2 + ngraph/test/control_dependencies.cpp | 2 + ngraph/test/copy.cpp | 2 + ngraph/test/eval.cpp | 2 + ngraph/test/input_output_assign.cpp | 3 + ngraph/test/node_input_output.cpp | 2 + ngraph/test/onnx/onnx_import.in.cpp | 2 + ngraph/test/op.cpp | 2 + ngraph/test/op_is.cpp | 11 +-- ngraph/test/pass_shape_relevance.cpp | 2 + ngraph/test/pattern.cpp | 2 + ngraph/test/replace_node.cpp | 2 + ngraph/test/runtime/interpreter/int_executable.hpp | 5 +- ngraph/test/runtime/opset0.hpp | 2 + ngraph/test/runtime/opset0_tbl.hpp | 1 - ngraph/test/runtime/pass/dyn_elimination.cpp | 2 + .../pass/implicit_broadcast_elimination.cpp | 2 + ngraph/test/runtime/pass/like_replacement.cpp | 2 + ngraph/test/runtime/pass/opset0_downgrade.cpp | 2 + ngraph/test/runtime/pass/opset1_upgrade.cpp | 4 ++ ngraph/test/specialize_function.cpp | 2 + ngraph/test/tensor.cpp | 2 + ngraph/test/type_prop/any.cpp | 2 + ngraph/test/type_prop/binary_elementwise.cpp | 2 + ngraph/test/type_prop/broadcast.cpp | 2 + ngraph/test/type_prop/dequantize.cpp | 2 + ngraph/test/type_prop/dot.cpp | 2 + ngraph/test/type_prop/gather.cpp | 2 + ngraph/test/type_prop/gather_nd.cpp | 2 + ngraph/test/type_prop/one_hot.cpp | 2 + ngraph/test/type_prop/pad.cpp | 2 + ngraph/test/type_prop/quantize.cpp | 2 + ngraph/test/type_prop/quantized_convolution.cpp | 2 + ngraph/test/type_prop/quantized_dot.cpp | 2 + ngraph/test/type_prop/replace_slice.cpp | 2 + ngraph/test/type_prop/reshape.cpp | 2 + ngraph/test/type_prop/reverse.cpp | 2 + ngraph/test/type_prop/select.cpp | 2 + ngraph/test/type_prop/slice.cpp | 2 + ngraph/test/type_prop/split.cpp | 2 + ngraph/test/type_prop/sum.cpp | 2 + ngraph/test/type_prop/top_k.cpp | 2 + ngraph/test/util.cpp | 2 + ngraph/test/util/test_tools.cpp | 2 + 204 files changed, 665 insertions(+), 298 deletions(-) delete mode 100644 ngraph/core/include/ngraph/op/passthrough.hpp delete mode 100644 ngraph/core/include/ngraph/op/scatter_add.hpp delete mode 100644 ngraph/core/src/op/passthrough.cpp diff --git a/inference-engine/src/transformations/src/transformations/common_optimizations/nop_elimination.cpp b/inference-engine/src/transformations/src/transformations/common_optimizations/nop_elimination.cpp index 014811c..3f37e4b 100644 --- a/inference-engine/src/transformations/src/transformations/common_optimizations/nop_elimination.cpp +++ b/inference-engine/src/transformations/src/transformations/common_optimizations/nop_elimination.cpp @@ -25,6 +25,8 @@ #include #include +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/inference-engine/tests/functional/inference_engine/transformations/nop_elimination.cpp b/inference-engine/tests/functional/inference_engine/transformations/nop_elimination.cpp index 77dea90..c496332 100644 --- a/inference-engine/tests/functional/inference_engine/transformations/nop_elimination.cpp +++ b/inference-engine/tests/functional/inference_engine/transformations/nop_elimination.cpp @@ -20,6 +20,8 @@ #include "common_test_utils/ngraph_test_utils.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace ngraph; using namespace std; diff --git a/ngraph/core/include/ngraph/builder/autobroadcast.hpp b/ngraph/core/include/ngraph/builder/autobroadcast.hpp index 457b145..cdec6a5 100644 --- a/ngraph/core/include/ngraph/builder/autobroadcast.hpp +++ b/ngraph/core/include/ngraph/builder/autobroadcast.hpp @@ -54,6 +54,7 @@ namespace ngraph /// /// \return Vector of broadcasted values. /// + NGRAPH_DEPRECATED("This builder was deprecated.") NGRAPH_API OutputVector numpy_broadcast_outputs(const OutputVector& values); @@ -66,6 +67,7 @@ namespace ngraph /// /// \return Node producing values with requested shape. /// + NGRAPH_DEPRECATED("This builder was deprecated.") NGRAPH_API std::shared_ptr numpy_broadcast(const Output& value, const Shape& shape); @@ -97,6 +99,7 @@ namespace ngraph /// elements point to ngraph::Node objects whose output values have the same shape. /// /// \exception ngraph::builder::numpy_autobroadcast_incompatible_shapes + NGRAPH_DEPRECATED("This builder was deprecated.") NGRAPH_API std::pair, std::shared_ptr> numpy_broadcast(const std::pair, Output>& args); @@ -116,12 +119,14 @@ namespace ngraph /// /// \exception ngraph::builder::numpy_autobroadcast_incompatible_shapes template - std::shared_ptr - make_with_numpy_broadcast(const Output& operand1_reshapeable, - const Output& operand2_reshapeable) + NGRAPH_DEPRECATED("This builder was deprecated.") + std::shared_ptr make_with_numpy_broadcast( + const Output& operand1_reshapeable, const Output& operand2_reshapeable) { + NGRAPH_SUPPRESS_DEPRECATED_START auto shaped_op1_op2 = numpy_broadcast({operand1_reshapeable, operand2_reshapeable}); return std::make_shared(shaped_op1_op2.first, shaped_op1_op2.second); + NGRAPH_SUPPRESS_DEPRECATED_END } /// Create a new \p NodeType node, and any additional nodes required to simulate NumPy-style @@ -143,13 +148,16 @@ namespace ngraph /// /// \exception ngraph::builder::numpy_autobroadcast_incompatible_shapes template + NGRAPH_DEPRECATED("This builder was deprecated.") std::shared_ptr make_with_numpy_broadcast(const Output& operand1, const Output& operand2_reshapeable, const Output& operand3_reshapeable) { + NGRAPH_SUPPRESS_DEPRECATED_START auto shaped_op2_op3 = numpy_broadcast({operand2_reshapeable, operand3_reshapeable}); return std::make_shared( operand1, shaped_op2_op3.first, shaped_op2_op3.second); + NGRAPH_SUPPRESS_DEPRECATED_END } /// \brief Broadcast shape of two nodes to make them compatible for a matrix @@ -168,6 +176,7 @@ namespace ngraph /// /// \return The vector containing both outputs broadcasted. /// + NGRAPH_DEPRECATED("This builder was deprecated.") NGRAPH_API OutputVector numpy_broadcast_for_matmul_operation(const Output& left, const Output& right); @@ -179,6 +188,7 @@ namespace ngraph /// \param axis Index starting to align /// /// \return pdpd-style broadcasted list of nodes. + NGRAPH_DEPRECATED("This builder was deprecated.") NGRAPH_API OutputVector pdpd_broadcast(const OutputVector& inputs, int64_t axis); @@ -196,6 +206,7 @@ namespace ngraph /// matches the desired new shape. /// /// \return The indices of added axes. + NGRAPH_DEPRECATED("This builder was deprecated.") NGRAPH_API AxisSet calculate_broadcast_axes(const Shape& output_shape, const Shape& input_shape, @@ -217,6 +228,7 @@ namespace ngraph /// \return A pair that contains the target shape as its first object and a vector of /// padded input shapes ready to be broadcasted as the second object /// + NGRAPH_DEPRECATED("This builder was deprecated.") NGRAPH_API std::pair> get_numpy_broadcast_shapes(const std::vector& input_shapes); @@ -235,27 +247,36 @@ namespace ngraph /// \param input_shape The shape of input tensor. /// /// \return The indices of added axes. + NGRAPH_DEPRECATED("This builder was deprecated.") inline AxisSet calculate_broadcast_axes(const Shape& output_shape, const Shape& input_shape) { + NGRAPH_SUPPRESS_DEPRECATED_START return calculate_broadcast_axes( output_shape, input_shape, output_shape.size() - input_shape.size()); + NGRAPH_SUPPRESS_DEPRECATED_END } + NGRAPH_DEPRECATED("This builder was deprecated.") inline std::shared_ptr make_broadcast_node(const Output& output, Shape new_shape) { + NGRAPH_SUPPRESS_DEPRECATED_START return std::make_shared( output, new_shape, calculate_broadcast_axes(new_shape, output.get_shape())); + NGRAPH_SUPPRESS_DEPRECATED_END } + NGRAPH_DEPRECATED("This builder was deprecated.") inline std::shared_ptr make_broadcast_node(const Output& value, const Shape& new_shape, std::size_t start_match_axis) { + NGRAPH_SUPPRESS_DEPRECATED_START return std::make_shared( value, new_shape, calculate_broadcast_axes(new_shape, value.get_shape(), start_match_axis)); + NGRAPH_SUPPRESS_DEPRECATED_END } namespace opset1 diff --git a/ngraph/core/include/ngraph/builder/make_constant.hpp b/ngraph/core/include/ngraph/builder/make_constant.hpp index 15a8be8..0132e99 100644 --- a/ngraph/core/include/ngraph/builder/make_constant.hpp +++ b/ngraph/core/include/ngraph/builder/make_constant.hpp @@ -16,6 +16,7 @@ #pragma once +#include "autobroadcast.hpp" #include "ngraph/node.hpp" #include "ngraph/op/broadcast.hpp" #include "ngraph/op/constant.hpp" @@ -110,7 +111,7 @@ namespace ngraph { axes.insert(i); } - val = std::make_shared(val, shape, axes); + val = builder::opset1::make_broadcast(val, shape, axes).get_node_shared_ptr(); } return val->add_provenance_group_members_above({}); diff --git a/ngraph/core/include/ngraph/builder/matmul_factory.hpp b/ngraph/core/include/ngraph/builder/matmul_factory.hpp index 43bcaea..4e78082 100644 --- a/ngraph/core/include/ngraph/builder/matmul_factory.hpp +++ b/ngraph/core/include/ngraph/builder/matmul_factory.hpp @@ -22,13 +22,15 @@ namespace ngraph { namespace builder { + NGRAPH_SUPPRESS_DEPRECATED_START + /// \brief Factory class which generates an nGraph sub-graph performing MatMul operation. /// /// This default implementation `MatmulFactory` creates a `MatMul` operation for /// floating-point data. /// Subclasses: `QLinearMatmulFactory` and `MatmulIntegerFactory` implement quantized /// versions. - class NGRAPH_API MatmulFactory + class NGRAPH_DEPRECATED("This builder was deprecated.") NGRAPH_API MatmulFactory { public: explicit MatmulFactory(const OutputVector& inputs) @@ -58,7 +60,8 @@ namespace ngraph /// \brief Factory class which generates an nGraph sub-graph based on an ONNX QLinearMatMul /// operation. - class NGRAPH_API QLinearMatmulFactory : public MatmulFactory + class NGRAPH_DEPRECATED("This builder was deprecated.") NGRAPH_API QLinearMatmulFactory + : public MatmulFactory { public: explicit QLinearMatmulFactory(const OutputVector& inputs) @@ -73,7 +76,8 @@ namespace ngraph /// \brief Factory class which generates an nGraph sub-graph based on an ONNX MatMulInteger /// operation. - class NGRAPH_API MatmulIntegerFactory : public MatmulFactory + class NGRAPH_DEPRECATED("This builder was deprecated.") NGRAPH_API MatmulIntegerFactory + : public MatmulFactory { public: explicit MatmulIntegerFactory(const OutputVector& inputs) @@ -84,5 +88,7 @@ namespace ngraph protected: Output make_dot(const Output& left, const Output& right) override; }; + + NGRAPH_SUPPRESS_DEPRECATED_END } // namespace builder } // namespace ngraph diff --git a/ngraph/core/include/ngraph/builder/split.hpp b/ngraph/core/include/ngraph/builder/split.hpp index e2bce38..b3aecad 100644 --- a/ngraph/core/include/ngraph/builder/split.hpp +++ b/ngraph/core/include/ngraph/builder/split.hpp @@ -31,6 +31,7 @@ namespace ngraph /// /// \return The vector containing multiple nodes we split input node into. /// + NGRAPH_DEPRECATED("This builder was deprecated.") OutputVector split(const Output& value, const std::vector& length_parts, size_t axis = 0); @@ -49,6 +50,7 @@ namespace ngraph /// /// \return The vector containing multiple outputs we split input node into. /// + NGRAPH_DEPRECATED("This builder was deprecated.") NGRAPH_API OutputVector split(const Output& value, size_t split_parts, int axis = 0); diff --git a/ngraph/core/include/ngraph/op/add.hpp b/ngraph/core/include/ngraph/op/add.hpp index b6a6d6d..73a4824 100644 --- a/ngraph/core/include/ngraph/op/add.hpp +++ b/ngraph/core/include/ngraph/op/add.hpp @@ -28,8 +28,11 @@ namespace ngraph { /// \brief Elementwise addition operation. /// - class NGRAPH_API Add : public util::BinaryElementwiseArithmetic + class NGRAPH_DEPRECATED( + "This operation is deprecated and will be removed soon. Use v1::Add instead of it.") + NGRAPH_API Add : public util::BinaryElementwiseArithmetic { + NGRAPH_SUPPRESS_DEPRECATED_START public: static constexpr NodeTypeInfo type_info{"Add", 0}; const NodeTypeInfo& get_type_info() const override { return type_info; } @@ -59,6 +62,7 @@ namespace ngraph bool visit_attributes(AttributeVisitor& visitor) override; bool evaluate(const HostTensorVector& outputs, const HostTensorVector& inputs) const override; + NGRAPH_SUPPRESS_DEPRECATED_END }; } // namespace v0 @@ -102,9 +106,12 @@ namespace ngraph }; } // namespace v1 + NGRAPH_SUPPRESS_DEPRECATED_START using v0::Add; + NGRAPH_SUPPRESS_DEPRECATED_END } // namespace op + NGRAPH_DEPRECATED("This operator was deprecated and will be removed with v0 operation.") NGRAPH_API std::shared_ptr operator+(const Output& arg0, const Output& arg1); } // namespace ngraph diff --git a/ngraph/core/include/ngraph/op/any.hpp b/ngraph/core/include/ngraph/op/any.hpp index cc99597..d1bb405 100644 --- a/ngraph/core/include/ngraph/op/any.hpp +++ b/ngraph/core/include/ngraph/op/any.hpp @@ -25,8 +25,11 @@ namespace ngraph namespace v0 { /// \brief Logical "any" reduction operation. - class NGRAPH_API Any : public util::LogicalReduction + class NGRAPH_DEPRECATED( + "This operation is deprecated and will be removed soon. Please don't use it.") + NGRAPH_API Any : public util::LogicalReduction { + NGRAPH_SUPPRESS_DEPRECATED_START public: static constexpr NodeTypeInfo type_info{"Any", 0}; const NodeTypeInfo& get_type_info() const override { return type_info; } @@ -48,8 +51,11 @@ namespace ngraph bool visit_attributes(AttributeVisitor& visitor) override { return true; } /// \return The default value for Any. virtual std::shared_ptr get_default_value() const override; + NGRAPH_SUPPRESS_DEPRECATED_END }; } + NGRAPH_SUPPRESS_DEPRECATED_START using v0::Any; + NGRAPH_SUPPRESS_DEPRECATED_END } } diff --git a/ngraph/core/include/ngraph/op/broadcast.hpp b/ngraph/core/include/ngraph/op/broadcast.hpp index 42703a7..f701a14 100644 --- a/ngraph/core/include/ngraph/op/broadcast.hpp +++ b/ngraph/core/include/ngraph/op/broadcast.hpp @@ -148,9 +148,12 @@ namespace ngraph namespace v0 { + NGRAPH_SUPPRESS_DEPRECATED_START /// \brief Operation which "adds" axes to an input tensor, replicating elements from the /// input as needed along the new axes. - class NGRAPH_API Broadcast : public Op + class NGRAPH_DEPRECATED( + "This operation is deprecated and will be removed soon. " + "Use v1::Broadcast instead of it.") NGRAPH_API Broadcast : public Op { public: static constexpr NodeTypeInfo type_info{"Broadcast", 0}; @@ -195,7 +198,9 @@ namespace ngraph }; /// \brief Broadcast arg to the same shape as like_arg. - class NGRAPH_API BroadcastLike : public v0::Broadcast + class NGRAPH_DEPRECATED( + "This operation is deprecated and will be removed soon. Please don't use it.") + NGRAPH_API BroadcastLike : public v0::Broadcast { public: static constexpr NodeTypeInfo type_info{"BroadcastLike", 0}; @@ -231,9 +236,12 @@ namespace ngraph protected: AxisSet m_initial_broadcast_axes; }; + NGRAPH_SUPPRESS_DEPRECATED_END } // namespace v0 + NGRAPH_SUPPRESS_DEPRECATED_START using v0::Broadcast; using v0::BroadcastLike; + NGRAPH_SUPPRESS_DEPRECATED_END } } diff --git a/ngraph/core/include/ngraph/op/dequantize.hpp b/ngraph/core/include/ngraph/op/dequantize.hpp index 3f3040b..32e24ee 100644 --- a/ngraph/core/include/ngraph/op/dequantize.hpp +++ b/ngraph/core/include/ngraph/op/dequantize.hpp @@ -30,8 +30,11 @@ namespace ngraph /// Maps quantized input (q) to real output (r) using scale (s) and zero point /// (z): /// r = (q - o) * s - class NGRAPH_API Dequantize : public ngraph::op::Op + class NGRAPH_DEPRECATED( + "This operation is deprecated and will be removed soon. Please do not use it.") + NGRAPH_API Dequantize : public ngraph::op::Op { + NGRAPH_SUPPRESS_DEPRECATED_START public: static constexpr NodeTypeInfo type_info{"Dequantize", 0}; const NodeTypeInfo& get_type_info() const override { return type_info; } @@ -62,8 +65,11 @@ namespace ngraph private: element::Type m_type; AxisSet m_axes; + NGRAPH_SUPPRESS_DEPRECATED_END }; } + NGRAPH_SUPPRESS_DEPRECATED_START using v0::Dequantize; + NGRAPH_SUPPRESS_DEPRECATED_END } } diff --git a/ngraph/core/include/ngraph/op/divide.hpp b/ngraph/core/include/ngraph/op/divide.hpp index 7b1ac75..36e6aaa 100644 --- a/ngraph/core/include/ngraph/op/divide.hpp +++ b/ngraph/core/include/ngraph/op/divide.hpp @@ -25,8 +25,12 @@ namespace ngraph namespace v0 { /// \brief Elementwise division operation. - class NGRAPH_API Divide : public util::BinaryElementwiseArithmetic + class NGRAPH_DEPRECATED( + "This operation is deprecated and will be removed soon. " + "Use v1::Divide instead of it.") NGRAPH_API Divide + : public util::BinaryElementwiseArithmetic { + NGRAPH_SUPPRESS_DEPRECATED_START public: static constexpr NodeTypeInfo type_info{"Divide", 0}; const NodeTypeInfo& get_type_info() const override { return type_info; } @@ -65,6 +69,7 @@ namespace ngraph protected: bool m_pythondiv{true}; + NGRAPH_SUPPRESS_DEPRECATED_END }; } // namespace v0 @@ -117,9 +122,12 @@ namespace ngraph }; } // namespace v1 + NGRAPH_SUPPRESS_DEPRECATED_START using v0::Divide; + NGRAPH_SUPPRESS_DEPRECATED_END } // namespace op + NGRAPH_DEPRECATED("This operator was deprecated and will be removed with v0 operation.") NGRAPH_API std::shared_ptr operator/(const Output& arg0, const Output& arg1); } // namespace ngraph diff --git a/ngraph/core/include/ngraph/op/dot.hpp b/ngraph/core/include/ngraph/op/dot.hpp index a049584..6636191 100644 --- a/ngraph/core/include/ngraph/op/dot.hpp +++ b/ngraph/core/include/ngraph/op/dot.hpp @@ -29,8 +29,11 @@ namespace ngraph /// \brief Generalized dot product operation, including scalar-tensor product, /// matrix-vector /// product, and matrix multiplication. - class NGRAPH_API Dot : public Op + class NGRAPH_DEPRECATED( + "This operation is deprecated and will be removed soon. Please do not use it.") + NGRAPH_API Dot : public Op { + NGRAPH_SUPPRESS_DEPRECATED_START public: static constexpr NodeTypeInfo type_info{"Dot", 0}; const NodeTypeInfo& get_type_info() const override { return type_info; } @@ -89,8 +92,11 @@ namespace ngraph protected: size_t m_reduction_axes_count; bool m_has_reduction_axes_count; + NGRAPH_SUPPRESS_DEPRECATED_END }; } + NGRAPH_SUPPRESS_DEPRECATED_START using v0::Dot; + NGRAPH_SUPPRESS_DEPRECATED_END } } diff --git a/ngraph/core/include/ngraph/op/equal.hpp b/ngraph/core/include/ngraph/op/equal.hpp index d962ae4..bbb7255 100644 --- a/ngraph/core/include/ngraph/op/equal.hpp +++ b/ngraph/core/include/ngraph/op/equal.hpp @@ -41,8 +41,12 @@ namespace ngraph /// | ---------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------ | /// | \f$\texttt{bool}[d_1,\dots,d_n]\f$ | The tensor \f$T\f$, where \f$T[i_1,\dots,i_n] = 1\text{ if }\texttt{arg0}[i_1,\dots,i_n] = \texttt{arg1}[i_1,\dots,i_n]\text{, else } 0\f$ | // clang-format on - class NGRAPH_API Equal : public util::BinaryElementwiseComparison + class NGRAPH_DEPRECATED( + "This operation is deprecated and will be removed soon. " + "Use v1::Equal instead of it.") NGRAPH_API Equal + : public util::BinaryElementwiseComparison { + NGRAPH_SUPPRESS_DEPRECATED_START public: static constexpr NodeTypeInfo type_info{"Equal", 0}; const NodeTypeInfo& get_type_info() const override { return type_info; } @@ -65,6 +69,7 @@ namespace ngraph bool evaluate(const HostTensorVector& outputs, const HostTensorVector& inputs) const override; + NGRAPH_SUPPRESS_DEPRECATED_END }; } // namespace v0 @@ -114,6 +119,8 @@ namespace ngraph }; } // namespace v1 + NGRAPH_SUPPRESS_DEPRECATED_START using v0::Equal; + NGRAPH_SUPPRESS_DEPRECATED_END } } diff --git a/ngraph/core/include/ngraph/op/gather.hpp b/ngraph/core/include/ngraph/op/gather.hpp index bf37112..5d72359 100644 --- a/ngraph/core/include/ngraph/op/gather.hpp +++ b/ngraph/core/include/ngraph/op/gather.hpp @@ -25,8 +25,11 @@ namespace ngraph namespace v0 { /// \brief Gather slices from axis of params according to indices - class NGRAPH_API Gather : public Op + class NGRAPH_DEPRECATED( + "This operation is deprecated and will be removed soon. " + "Use v1::Gather instead of it.") NGRAPH_API Gather : public Op { + NGRAPH_SUPPRESS_DEPRECATED_START public: static constexpr NodeTypeInfo type_info{"Gather", 0}; const NodeTypeInfo& get_type_info() const override { return type_info; } @@ -47,6 +50,7 @@ namespace ngraph protected: size_t m_axis; + NGRAPH_SUPPRESS_DEPRECATED_END }; } @@ -81,6 +85,8 @@ namespace ngraph } // latest stable opset version + NGRAPH_SUPPRESS_DEPRECATED_START using v0::Gather; + NGRAPH_SUPPRESS_DEPRECATED_END } } diff --git a/ngraph/core/include/ngraph/op/gather_nd.hpp b/ngraph/core/include/ngraph/op/gather_nd.hpp index f905af0..adc9dea 100644 --- a/ngraph/core/include/ngraph/op/gather_nd.hpp +++ b/ngraph/core/include/ngraph/op/gather_nd.hpp @@ -25,8 +25,11 @@ namespace ngraph namespace v0 { /// \brief Gather slices from params with shapes given by indices - class NGRAPH_API GatherND : public Op + class NGRAPH_DEPRECATED( + "This operation is deprecated and will be removed soon. Please do not use it.") + NGRAPH_API GatherND : public Op { + NGRAPH_SUPPRESS_DEPRECATED_START public: static constexpr NodeTypeInfo type_info{"GatherND", 0}; const NodeTypeInfo& get_type_info() const override { return type_info; } @@ -42,8 +45,11 @@ namespace ngraph void validate_and_infer_types() override; virtual std::shared_ptr clone_with_new_inputs(const OutputVector& new_args) const override; + NGRAPH_SUPPRESS_DEPRECATED_END }; } + NGRAPH_SUPPRESS_DEPRECATED_START using v0::GatherND; + NGRAPH_SUPPRESS_DEPRECATED_END } } diff --git a/ngraph/core/include/ngraph/op/greater.hpp b/ngraph/core/include/ngraph/op/greater.hpp index c81eebd..8cc0330 100644 --- a/ngraph/core/include/ngraph/op/greater.hpp +++ b/ngraph/core/include/ngraph/op/greater.hpp @@ -25,8 +25,12 @@ namespace ngraph namespace v0 { /// \brief Elementwise greater-than operation. - class NGRAPH_API Greater : public util::BinaryElementwiseComparison + class NGRAPH_DEPRECATED( + "This operation is deprecated and will be removed soon. " + "Use v1::Greater instead of it.") NGRAPH_API Greater + : public util::BinaryElementwiseComparison { + NGRAPH_SUPPRESS_DEPRECATED_START public: static constexpr NodeTypeInfo type_info{"Greater", 0}; const NodeTypeInfo& get_type_info() const override { return type_info; } @@ -48,6 +52,7 @@ namespace ngraph clone_with_new_inputs(const OutputVector& new_args) const override; bool evaluate(const HostTensorVector& outputs, const HostTensorVector& inputs) const override; + NGRAPH_SUPPRESS_DEPRECATED_END }; } // namespace v0 @@ -80,6 +85,8 @@ namespace ngraph }; } // namespace v1 + NGRAPH_SUPPRESS_DEPRECATED_START using v0::Greater; + NGRAPH_SUPPRESS_DEPRECATED_END } } diff --git a/ngraph/core/include/ngraph/op/greater_eq.hpp b/ngraph/core/include/ngraph/op/greater_eq.hpp index 6c52dcc..548463d 100644 --- a/ngraph/core/include/ngraph/op/greater_eq.hpp +++ b/ngraph/core/include/ngraph/op/greater_eq.hpp @@ -25,8 +25,12 @@ namespace ngraph namespace v0 { /// \brief Elementwise greater-than-or-equal operation. - class NGRAPH_API GreaterEq : public util::BinaryElementwiseComparison + class NGRAPH_DEPRECATED( + "This operation is deprecated and will be removed soon. " + "Use v1::GreaterEqual instead of it.") NGRAPH_API GreaterEq + : public util::BinaryElementwiseComparison { + NGRAPH_SUPPRESS_DEPRECATED_START public: static constexpr NodeTypeInfo type_info{"GreaterEq", 0}; const NodeTypeInfo& get_type_info() const override { return type_info; } @@ -48,6 +52,7 @@ namespace ngraph clone_with_new_inputs(const OutputVector& new_args) const override; bool evaluate(const HostTensorVector& outputs, const HostTensorVector& inputs) const override; + NGRAPH_SUPPRESS_DEPRECATED_END }; } // namespace v0 @@ -78,11 +83,10 @@ namespace ngraph bool evaluate(const HostTensorVector& outputs, const HostTensorVector& inputs) const override; }; - - // DO NOT USE. Will be removed once users switch to GreaterEqual - using GreaterEq = GreaterEqual; } // namespace v1 + NGRAPH_SUPPRESS_DEPRECATED_START using v0::GreaterEq; + NGRAPH_SUPPRESS_DEPRECATED_END } } diff --git a/ngraph/core/include/ngraph/op/less.hpp b/ngraph/core/include/ngraph/op/less.hpp index 6105c5a..56b5e7f 100644 --- a/ngraph/core/include/ngraph/op/less.hpp +++ b/ngraph/core/include/ngraph/op/less.hpp @@ -25,8 +25,12 @@ namespace ngraph namespace v0 { /// \brief Elementwise less-than operation. - class NGRAPH_API Less : public util::BinaryElementwiseComparison + class NGRAPH_DEPRECATED( + "This operation is deprecated and will be removed soon. " + "Use v1::Less instead of it.") NGRAPH_API Less + : public util::BinaryElementwiseComparison { + NGRAPH_SUPPRESS_DEPRECATED_START public: static constexpr NodeTypeInfo type_info{"Less", 0}; const NodeTypeInfo& get_type_info() const override { return type_info; } @@ -48,6 +52,7 @@ namespace ngraph clone_with_new_inputs(const OutputVector& new_args) const override; bool evaluate(const HostTensorVector& outputs, const HostTensorVector& inputs) const override; + NGRAPH_SUPPRESS_DEPRECATED_END }; } // namespace v0 @@ -80,6 +85,8 @@ namespace ngraph }; } // namespace v1 + NGRAPH_SUPPRESS_DEPRECATED_START using v0::Less; + NGRAPH_SUPPRESS_DEPRECATED_END } } diff --git a/ngraph/core/include/ngraph/op/less_eq.hpp b/ngraph/core/include/ngraph/op/less_eq.hpp index 94afc11..999d972 100644 --- a/ngraph/core/include/ngraph/op/less_eq.hpp +++ b/ngraph/core/include/ngraph/op/less_eq.hpp @@ -55,8 +55,12 @@ namespace ngraph namespace v0 { /// \brief Elementwise less-than-or-equal operation. - class NGRAPH_API LessEq : public util::BinaryElementwiseComparison + class NGRAPH_DEPRECATED( + "This operation is deprecated and will be removed soon. " + "Use v1::LessEqual instead of it.") NGRAPH_API LessEq + : public util::BinaryElementwiseComparison { + NGRAPH_SUPPRESS_DEPRECATED_START public: static constexpr NodeTypeInfo type_info{"LessEq", 0}; const NodeTypeInfo& get_type_info() const override { return type_info; } @@ -78,9 +82,12 @@ namespace ngraph clone_with_new_inputs(const OutputVector& new_args) const override; bool evaluate(const HostTensorVector& outputs, const HostTensorVector& inputs) const override; + NGRAPH_SUPPRESS_DEPRECATED_END }; } // namespace v0 + NGRAPH_SUPPRESS_DEPRECATED_START using v0::LessEq; + NGRAPH_SUPPRESS_DEPRECATED_END } // namespace op } // namespace ngraph diff --git a/ngraph/core/include/ngraph/op/max.hpp b/ngraph/core/include/ngraph/op/max.hpp index 189e975..c2d13ef 100644 --- a/ngraph/core/include/ngraph/op/max.hpp +++ b/ngraph/core/include/ngraph/op/max.hpp @@ -26,8 +26,12 @@ namespace ngraph namespace v0 { /// \brief Max-reduction operation. - class NGRAPH_API Max : public util::ArithmeticReduction + class NGRAPH_DEPRECATED( + "This operation is deprecated and will be removed soon. " + "Use v1::ReduceMax instead of it.") NGRAPH_API Max + : public util::ArithmeticReduction { + NGRAPH_SUPPRESS_DEPRECATED_START public: static constexpr NodeTypeInfo type_info{"Max", 0}; @@ -55,6 +59,7 @@ namespace ngraph bool evaluate(const HostTensorVector& outputs, const HostTensorVector& inputs) const override; + NGRAPH_SUPPRESS_DEPRECATED_END }; } @@ -84,6 +89,8 @@ namespace ngraph }; } + NGRAPH_SUPPRESS_DEPRECATED_START using v0::Max; + NGRAPH_SUPPRESS_DEPRECATED_END } } diff --git a/ngraph/core/include/ngraph/op/maximum.hpp b/ngraph/core/include/ngraph/op/maximum.hpp index faa9bff..438e7a0 100644 --- a/ngraph/core/include/ngraph/op/maximum.hpp +++ b/ngraph/core/include/ngraph/op/maximum.hpp @@ -25,8 +25,12 @@ namespace ngraph namespace v0 { /// \brief Elementwise maximum operation. - class NGRAPH_API Maximum : public util::BinaryElementwiseArithmetic + class NGRAPH_DEPRECATED( + "This operation is deprecated and will be removed soon. " + "Use v1::Maximum instead of it.") NGRAPH_API Maximum + : public util::BinaryElementwiseArithmetic { + NGRAPH_SUPPRESS_DEPRECATED_START public: static constexpr NodeTypeInfo type_info{"Maximum", 0}; const NodeTypeInfo& get_type_info() const override { return type_info; } @@ -49,6 +53,7 @@ namespace ngraph bool evaluate(const HostTensorVector& outputs, const HostTensorVector& inputs) const override; + NGRAPH_SUPPRESS_DEPRECATED_END }; } // namespace v0 @@ -84,6 +89,8 @@ namespace ngraph }; } // namespace v1 + NGRAPH_SUPPRESS_DEPRECATED_START using v0::Maximum; + NGRAPH_SUPPRESS_DEPRECATED_END } } diff --git a/ngraph/core/include/ngraph/op/min.hpp b/ngraph/core/include/ngraph/op/min.hpp index b373f8a..6a111bf 100644 --- a/ngraph/core/include/ngraph/op/min.hpp +++ b/ngraph/core/include/ngraph/op/min.hpp @@ -26,8 +26,12 @@ namespace ngraph namespace v0 { /// \brief Min-reduction operation. - class NGRAPH_API Min : public util::ArithmeticReduction + class NGRAPH_DEPRECATED( + "This operation is deprecated and will be removed soon. " + "Use v1::ReduceMin instead of it.") NGRAPH_API Min + : public util::ArithmeticReduction { + NGRAPH_SUPPRESS_DEPRECATED_START public: static constexpr NodeTypeInfo type_info{"Min", 0}; @@ -55,6 +59,7 @@ namespace ngraph bool evaluate(const HostTensorVector& outputs, const HostTensorVector& inputs) const override; + NGRAPH_SUPPRESS_DEPRECATED_END }; } @@ -84,6 +89,8 @@ namespace ngraph }; } + NGRAPH_SUPPRESS_DEPRECATED_START using v0::Min; + NGRAPH_SUPPRESS_DEPRECATED_END } } diff --git a/ngraph/core/include/ngraph/op/minimum.hpp b/ngraph/core/include/ngraph/op/minimum.hpp index 174ca24..3611fa0 100644 --- a/ngraph/core/include/ngraph/op/minimum.hpp +++ b/ngraph/core/include/ngraph/op/minimum.hpp @@ -25,8 +25,12 @@ namespace ngraph namespace v0 { /// \brief Elementwise minimum operation. - class NGRAPH_API Minimum : public util::BinaryElementwiseArithmetic + class NGRAPH_DEPRECATED( + "This operation is deprecated and will be removed soon. " + "Use v1::Minimum instead of it.") NGRAPH_API Minimum + : public util::BinaryElementwiseArithmetic { + NGRAPH_SUPPRESS_DEPRECATED_START public: static constexpr NodeTypeInfo type_info{"Minimum", 0}; const NodeTypeInfo& get_type_info() const override { return type_info; } @@ -49,6 +53,7 @@ namespace ngraph bool evaluate(const HostTensorVector& outputs, const HostTensorVector& inputs) const override; + NGRAPH_SUPPRESS_DEPRECATED_END }; } // namespace v0 @@ -84,6 +89,8 @@ namespace ngraph }; } // namespace v1 + NGRAPH_SUPPRESS_DEPRECATED_START using v0::Minimum; + NGRAPH_SUPPRESS_DEPRECATED_END } } diff --git a/ngraph/core/include/ngraph/op/multiply.hpp b/ngraph/core/include/ngraph/op/multiply.hpp index 8d36b60..b685ade 100644 --- a/ngraph/core/include/ngraph/op/multiply.hpp +++ b/ngraph/core/include/ngraph/op/multiply.hpp @@ -25,8 +25,12 @@ namespace ngraph namespace v0 { /// \brief Elementwise multiplication operation. - class NGRAPH_API Multiply : public util::BinaryElementwiseArithmetic + class NGRAPH_DEPRECATED( + "This operation is deprecated and will be removed soon. " + "Use v1::Multiply instead of it.") NGRAPH_API Multiply + : public util::BinaryElementwiseArithmetic { + NGRAPH_SUPPRESS_DEPRECATED_START public: static constexpr NodeTypeInfo type_info{"Multiply", 0}; const NodeTypeInfo& get_type_info() const override { return type_info; } @@ -49,6 +53,7 @@ namespace ngraph bool evaluate(const HostTensorVector& outputs, const HostTensorVector& inputs) const override; + NGRAPH_SUPPRESS_DEPRECATED_END }; } // namespace v0 @@ -84,9 +89,12 @@ namespace ngraph }; } // namespace v1 + NGRAPH_SUPPRESS_DEPRECATED_START using v0::Multiply; + NGRAPH_SUPPRESS_DEPRECATED_END } // namespace op + NGRAPH_DEPRECATED("This operator was deprecated and will be removed with v0 operation.") NGRAPH_API std::shared_ptr operator*(const Output& arg0, const Output& arg1); } // namespace ngraph diff --git a/ngraph/core/include/ngraph/op/not.hpp b/ngraph/core/include/ngraph/op/not.hpp index 63f3283..be33b16 100644 --- a/ngraph/core/include/ngraph/op/not.hpp +++ b/ngraph/core/include/ngraph/op/not.hpp @@ -48,8 +48,11 @@ namespace ngraph namespace v0 { /// \brief Elementwise logical negation operation. - class NGRAPH_API Not : public Op + class NGRAPH_DEPRECATED( + "This operation is deprecated and will be removed soon. " + "Use v1::LogicalNot instead of it.") NGRAPH_API Not : public Op { + NGRAPH_SUPPRESS_DEPRECATED_START public: static constexpr NodeTypeInfo type_info{"Not", 0}; const NodeTypeInfo& get_type_info() const override { return type_info; } @@ -66,9 +69,12 @@ namespace ngraph clone_with_new_inputs(const OutputVector& new_args) const override; bool evaluate(const HostTensorVector& outputs, const HostTensorVector& inputs) const override; + NGRAPH_SUPPRESS_DEPRECATED_END }; } + NGRAPH_SUPPRESS_DEPRECATED_START using v0::Not; + NGRAPH_SUPPRESS_DEPRECATED_END } // namespace op } // namespace ngraph diff --git a/ngraph/core/include/ngraph/op/not_equal.hpp b/ngraph/core/include/ngraph/op/not_equal.hpp index eab9120..19ccd63 100644 --- a/ngraph/core/include/ngraph/op/not_equal.hpp +++ b/ngraph/core/include/ngraph/op/not_equal.hpp @@ -25,8 +25,12 @@ namespace ngraph namespace v0 { /// \brief Elementwise not-equal operation. - class NGRAPH_API NotEqual : public util::BinaryElementwiseComparison + class NGRAPH_DEPRECATED( + "This operation is deprecated and will be removed soon. " + "Use v1::NotEqual instead of it.") NGRAPH_API NotEqual + : public util::BinaryElementwiseComparison { + NGRAPH_SUPPRESS_DEPRECATED_START public: static constexpr NodeTypeInfo type_info{"NotEqual", 0}; const NodeTypeInfo& get_type_info() const override { return type_info; } @@ -49,6 +53,7 @@ namespace ngraph bool evaluate(const HostTensorVector& outputs, const HostTensorVector& inputs) const override; + NGRAPH_SUPPRESS_DEPRECATED_END }; } // namespace v0 @@ -82,6 +87,8 @@ namespace ngraph }; } // namespace v1 + NGRAPH_SUPPRESS_DEPRECATED_START using v0::NotEqual; + NGRAPH_SUPPRESS_DEPRECATED_END } } diff --git a/ngraph/core/include/ngraph/op/one_hot.hpp b/ngraph/core/include/ngraph/op/one_hot.hpp index 689f372..ef668e8 100644 --- a/ngraph/core/include/ngraph/op/one_hot.hpp +++ b/ngraph/core/include/ngraph/op/one_hot.hpp @@ -46,8 +46,11 @@ namespace ngraph /// | ---------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | /// | \f$E[d_1,\dots,d_n]\f$ | The tensor \f$T'\f$, where \f$T'[i_1,\dots,i_{m-1},i_m,i_{m+1},\dots,i_n] = 1\f$ if \f$T[i_1,\dots,i_{m-1},i_{m+1},\dots,i_n] = i_m\f$, else \f$0\f$. However, \f$T'\f$ is undefined if any non-integral value or any out-of-bounds value is detected in the input tensor. | // clang-format on - class NGRAPH_API OneHot : public Op + class NGRAPH_DEPRECATED( + "This operation is deprecated and will be removed soon. " + "Use v1::OneHot instead of it.") NGRAPH_API OneHot : public Op { + NGRAPH_SUPPRESS_DEPRECATED_START public: static constexpr NodeTypeInfo type_info{"OneHot", 0}; const NodeTypeInfo& get_type_info() const override { return type_info; } @@ -71,6 +74,7 @@ namespace ngraph protected: PartialShape m_shape; size_t m_one_hot_axis; + NGRAPH_SUPPRESS_DEPRECATED_END }; } namespace v1 @@ -111,6 +115,8 @@ namespace ngraph }; } // default opset version + NGRAPH_SUPPRESS_DEPRECATED_START using v0::OneHot; + NGRAPH_SUPPRESS_DEPRECATED_END } } diff --git a/ngraph/core/include/ngraph/op/op_version_tbl.hpp b/ngraph/core/include/ngraph/op/op_version_tbl.hpp index d4babea..2730563 100644 --- a/ngraph/core/include/ngraph/op/op_version_tbl.hpp +++ b/ngraph/core/include/ngraph/op/op_version_tbl.hpp @@ -26,6 +26,8 @@ #define NGRAPH_OP(NAME, NAMESPACE, VERSION) #endif +NGRAPH_SUPPRESS_DEPRECATED_START + NGRAPH_OP(Abs, ngraph::op::v0, 0) NGRAPH_OP(Acos, ngraph::op::v0, 0) NGRAPH_OP(Acosh, ngraph::op::v3, 3) @@ -132,7 +134,6 @@ NGRAPH_OP(PSROIPooling, ngraph::op::v0, 0) NGRAPH_OP(Pad, ngraph::op::v0, 0) NGRAPH_OP(Pad, ngraph::op::v1, 1) NGRAPH_OP(Parameter, ngraph::op::v0, 0) -NGRAPH_OP(Passthrough, ngraph::op::v0, 0) NGRAPH_OP(Power, ngraph::op::v0, 0) NGRAPH_OP(Power, ngraph::op::v1, 1) NGRAPH_OP(PriorBox, ngraph::op::v0, 0) @@ -203,3 +204,5 @@ NGRAPH_OP(VariadicSplit, ngraph::op::v1, 1) NGRAPH_OP(Xor, ngraph::op::v0, 0) NGRAPH_OP(Assign, ngraph::op::v3, 3) NGRAPH_OP(ReadValue, ngraph::op::v3, 3) + +NGRAPH_SUPPRESS_DEPRECATED_END diff --git a/ngraph/core/include/ngraph/op/or.hpp b/ngraph/core/include/ngraph/op/or.hpp index 4f3abac..5c932e1 100644 --- a/ngraph/core/include/ngraph/op/or.hpp +++ b/ngraph/core/include/ngraph/op/or.hpp @@ -59,8 +59,12 @@ namespace ngraph { /// \brief Elementwise logical-or operation. /// - class NGRAPH_API Or : public util::BinaryElementwiseLogical + class NGRAPH_DEPRECATED( + "This operation is deprecated and will be removed soon. " + "Use v1::LogicalOr instead of it.") NGRAPH_API Or + : public util::BinaryElementwiseLogical { + NGRAPH_SUPPRESS_DEPRECATED_START public: static constexpr NodeTypeInfo type_info{"Or", 0}; const NodeTypeInfo& get_type_info() const override { return type_info; } @@ -84,9 +88,12 @@ namespace ngraph bool evaluate(const HostTensorVector& outputs, const HostTensorVector& inputs) const override; + NGRAPH_SUPPRESS_DEPRECATED_END }; } // namespace v0 + NGRAPH_SUPPRESS_DEPRECATED_START using v0::Or; + NGRAPH_SUPPRESS_DEPRECATED_END } // namespace op } // namespace ngraph diff --git a/ngraph/core/include/ngraph/op/pad.hpp b/ngraph/core/include/ngraph/op/pad.hpp index 099e1ba..00f9458 100644 --- a/ngraph/core/include/ngraph/op/pad.hpp +++ b/ngraph/core/include/ngraph/op/pad.hpp @@ -27,8 +27,11 @@ namespace ngraph namespace v0 { /// \brief Generic padding operation. - class NGRAPH_API Pad : public Op + class NGRAPH_DEPRECATED( + "This operation is deprecated and will be removed soon. Use v1::Pad instead of it.") + NGRAPH_API Pad : public Op { + NGRAPH_SUPPRESS_DEPRECATED_START public: static constexpr NodeTypeInfo type_info{"Pad", 0}; const NodeTypeInfo& get_type_info() const override { return type_info; } @@ -85,6 +88,7 @@ namespace ngraph CoordinateDiff m_padding_above; Shape m_padding_interior_fake; // LEGACY: This is all zeros. PadMode m_pad_mode; + NGRAPH_SUPPRESS_DEPRECATED_END }; } @@ -157,6 +161,8 @@ namespace ngraph } // latest stable opset version + NGRAPH_SUPPRESS_DEPRECATED_START using v0::Pad; + NGRAPH_SUPPRESS_DEPRECATED_END } } diff --git a/ngraph/core/include/ngraph/op/passthrough.hpp b/ngraph/core/include/ngraph/op/passthrough.hpp deleted file mode 100644 index 743c381..0000000 --- a/ngraph/core/include/ngraph/op/passthrough.hpp +++ /dev/null @@ -1,72 +0,0 @@ -//***************************************************************************** -// Copyright 2017-2020 Intel Corporation -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -//***************************************************************************** - -#pragma once - -#include -#include -#include - -#include "ngraph/op/op.hpp" - -namespace ngraph -{ - namespace op - { - namespace v0 - { - /// An op directly representing backend-specific code. - /// - /// N.B. Not all backends support all operation languages; a - /// given backend might only support a given passthrough - /// operation language in certain modes. - class Passthrough; - } - using v0::Passthrough; - } -} - -class NGRAPH_API ngraph::op::v0::Passthrough final : public Op -{ -public: - static constexpr NodeTypeInfo type_info{"Passthrough", 0}; - const NodeTypeInfo& get_type_info() const override { return type_info; } - Passthrough() = default; - - Passthrough(const std::string& logical_type, // aka "What this operation is doing" - const std::string& language, // The language the implementation is written in - const std::string& function, // The operation implementation - const OutputVector& args, - std::vector> outputs); - - void validate_and_infer_types() final; - - std::shared_ptr clone_with_new_inputs(const OutputVector& new_args) const final; - - const std::string& logical_type() const { return m_logical_type; } - const std::string& language() const { return m_language; } - const std::string& function() const { return m_function; } - const std::vector>& output_shapes() const - { - return m_output_shapes; - } - -private: - std::string m_logical_type; - std::string m_language; - std::string m_function; - std::vector> m_output_shapes; -}; diff --git a/ngraph/core/include/ngraph/op/power.hpp b/ngraph/core/include/ngraph/op/power.hpp index dd3cc87..6eecca8 100644 --- a/ngraph/core/include/ngraph/op/power.hpp +++ b/ngraph/core/include/ngraph/op/power.hpp @@ -40,8 +40,12 @@ namespace ngraph /// | ---------------------- | -------------------------------------------------------------------------------------------------------------- | /// | \f$N[d_1,\dots,d_n]\f$ | The tensor \f$T\f$, where \f$T[i_1,\dots,i_n] = \texttt{arg0}[i_1,\dots,i_n]^{\texttt{arg1}[i_1,\dots,i_n]}\f$ | // clang-format on - class NGRAPH_API Power : public util::BinaryElementwiseArithmetic + class NGRAPH_DEPRECATED( + "This operation is deprecated and will be removed soon. " + "Use v1::Power instead of it.") NGRAPH_API Power + : public util::BinaryElementwiseArithmetic { + NGRAPH_SUPPRESS_DEPRECATED_START public: static constexpr NodeTypeInfo type_info{"Power", 0}; const NodeTypeInfo& get_type_info() const override { return type_info; } @@ -62,6 +66,7 @@ namespace ngraph clone_with_new_inputs(const OutputVector& new_args) const override; bool evaluate(const HostTensorVector& outputs, const HostTensorVector& inputs) const override; + NGRAPH_SUPPRESS_DEPRECATED_END }; } // namespace v0 @@ -110,6 +115,8 @@ namespace ngraph }; } // namespace v1 + NGRAPH_SUPPRESS_DEPRECATED_START using v0::Power; + NGRAPH_SUPPRESS_DEPRECATED_END } } diff --git a/ngraph/core/include/ngraph/op/product.hpp b/ngraph/core/include/ngraph/op/product.hpp index cf7d711..e560f1d 100644 --- a/ngraph/core/include/ngraph/op/product.hpp +++ b/ngraph/core/include/ngraph/op/product.hpp @@ -27,8 +27,12 @@ namespace ngraph /// \brief Product reduction operation. /// /// Reduces the tensor, eliminating the specified reduction axes by taking the product. - class NGRAPH_API Product : public util::ArithmeticReduction + class NGRAPH_DEPRECATED( + "This operation is deprecated and will be removed soon. " + "Use v1::ReduceProd instead of it.") NGRAPH_API Product + : public util::ArithmeticReduction { + NGRAPH_SUPPRESS_DEPRECATED_START public: static constexpr NodeTypeInfo type_info{"Product", 0}; const NodeTypeInfo& get_type_info() const override { return type_info; } @@ -53,9 +57,12 @@ namespace ngraph bool evaluate(const HostTensorVector& outputs, const HostTensorVector& inputs) const override; + NGRAPH_SUPPRESS_DEPRECATED_END }; } // default opset version + NGRAPH_SUPPRESS_DEPRECATED_START using v0::Product; + NGRAPH_SUPPRESS_DEPRECATED_END } } diff --git a/ngraph/core/include/ngraph/op/quantize.hpp b/ngraph/core/include/ngraph/op/quantize.hpp index f0bc93f..5afca02 100644 --- a/ngraph/core/include/ngraph/op/quantize.hpp +++ b/ngraph/core/include/ngraph/op/quantize.hpp @@ -30,8 +30,11 @@ namespace ngraph /// Maps real input (r) to quantized output (q) using scale (s), zero point (z) /// and /// round mode: q = ROUND(r / s) + o - class NGRAPH_API Quantize : public ngraph::op::Op + class NGRAPH_DEPRECATED( + "This operation is deprecated and will be removed soon. Please do not use it.") + NGRAPH_API Quantize : public ngraph::op::Op { + NGRAPH_SUPPRESS_DEPRECATED_START public: static constexpr NodeTypeInfo type_info{"Quantize", 0}; const NodeTypeInfo& get_type_info() const override { return type_info; } @@ -107,8 +110,11 @@ namespace ngraph ngraph::element::Type m_type; ngraph::AxisSet m_axes; RoundMode m_round_mode; + NGRAPH_SUPPRESS_DEPRECATED_END }; } + NGRAPH_SUPPRESS_DEPRECATED_START using v0::Quantize; + NGRAPH_SUPPRESS_DEPRECATED_END } } diff --git a/ngraph/core/include/ngraph/op/quantized_convolution.hpp b/ngraph/core/include/ngraph/op/quantized_convolution.hpp index 486cbf1..3591336 100644 --- a/ngraph/core/include/ngraph/op/quantized_convolution.hpp +++ b/ngraph/core/include/ngraph/op/quantized_convolution.hpp @@ -25,8 +25,11 @@ namespace ngraph { namespace v0 { - class NGRAPH_API QuantizedConvolution : public Op + class NGRAPH_DEPRECATED( + "This operation is deprecated and will be removed soon. Please do not use it.") + NGRAPH_API QuantizedConvolution : public Op { + NGRAPH_SUPPRESS_DEPRECATED_START public: static constexpr NodeTypeInfo type_info{"QuantizedConvolution", 0}; const NodeTypeInfo& get_type_info() const override { return type_info; } @@ -103,8 +106,11 @@ namespace ngraph ngraph::AxisSet m_input_axes; ngraph::AxisSet m_filter_axes; ngraph::AxisSet m_output_axes; + NGRAPH_SUPPRESS_DEPRECATED_END }; } + NGRAPH_SUPPRESS_DEPRECATED_START using v0::QuantizedConvolution; + NGRAPH_SUPPRESS_DEPRECATED_END } } diff --git a/ngraph/core/include/ngraph/op/quantized_dot.hpp b/ngraph/core/include/ngraph/op/quantized_dot.hpp index b04f1b0..a70e155 100644 --- a/ngraph/core/include/ngraph/op/quantized_dot.hpp +++ b/ngraph/core/include/ngraph/op/quantized_dot.hpp @@ -24,8 +24,11 @@ namespace ngraph { namespace v0 { - class NGRAPH_API QuantizedDot : public Op + class NGRAPH_DEPRECATED( + "This operation is deprecated and will be removed soon. Please do not use it.") + NGRAPH_API QuantizedDot : public Op { + NGRAPH_SUPPRESS_DEPRECATED_START public: static constexpr NodeTypeInfo type_info{"QuantizedDot", 0}; const NodeTypeInfo& get_type_info() const override { return type_info; } @@ -80,8 +83,11 @@ namespace ngraph ngraph::AxisSet m_input0_axes; ngraph::AxisSet m_input1_axes; ngraph::AxisSet m_output_axes; + NGRAPH_SUPPRESS_DEPRECATED_END }; } + NGRAPH_SUPPRESS_DEPRECATED_START using v0::QuantizedDot; + NGRAPH_SUPPRESS_DEPRECATED_END } } diff --git a/ngraph/core/include/ngraph/op/replace_slice.hpp b/ngraph/core/include/ngraph/op/replace_slice.hpp index 2b85536..aefa176 100644 --- a/ngraph/core/include/ngraph/op/replace_slice.hpp +++ b/ngraph/core/include/ngraph/op/replace_slice.hpp @@ -52,8 +52,11 @@ namespace ngraph /// | ---------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | /// | \f$E[d_1,\dots,d_n]\f$ | The tensor \f$T\f$ where \f$T[i_1,\dots,i_n] = \texttt{arg1}[j_1,\dots,j_n]\f$ if \f$j_1,\dots,j_n\f$ is in bounds for `arg1` and for all \f$m\f$, \f$i_m = l_m + j_m s_m\f$, otherwise \f$\texttt{arg0}[i_1,\dots,i_n]\f$. | // clang-format on - class NGRAPH_API ReplaceSlice : public Op + class NGRAPH_DEPRECATED( + "This operation is deprecated and will be removed soon. Please do not use it.") + NGRAPH_API ReplaceSlice : public Op { + NGRAPH_SUPPRESS_DEPRECATED_START public: static constexpr NodeTypeInfo type_info{"ReplaceSlice", 0}; const NodeTypeInfo& get_type_info() const override { return type_info; } @@ -109,8 +112,11 @@ namespace ngraph Coordinate m_lower_bounds; Coordinate m_upper_bounds; Strides m_strides; + NGRAPH_SUPPRESS_DEPRECATED_END }; } + NGRAPH_SUPPRESS_DEPRECATED_START using v0::ReplaceSlice; + NGRAPH_SUPPRESS_DEPRECATED_END } } diff --git a/ngraph/core/include/ngraph/op/reshape.hpp b/ngraph/core/include/ngraph/op/reshape.hpp index f6b2b17..442036e 100644 --- a/ngraph/core/include/ngraph/op/reshape.hpp +++ b/ngraph/core/include/ngraph/op/reshape.hpp @@ -65,8 +65,11 @@ namespace ngraph /// | ------------------------ | ------------------------------------------------------------------------------------------------------ | /// | \f$E[d'_1,\dots,d'_m]\f$ | The tensor \f$T\f$, where \f$T\f$ is the input tensor with its elements rearranged as described above. | // clang-format on - class NGRAPH_API Reshape : public Op + class NGRAPH_DEPRECATED( + "This operation is deprecated and will be removed soon. " + "Use v1::Reshape instead of it.") NGRAPH_API Reshape : public Op { + NGRAPH_SUPPRESS_DEPRECATED_START public: static constexpr NodeTypeInfo type_info{"Reshape", 0}; const NodeTypeInfo& get_type_info() const override { return type_info; } @@ -108,6 +111,7 @@ namespace ngraph AxisVector m_input_order; Shape m_output_shape; bool m_is_transpose{false}; + NGRAPH_SUPPRESS_DEPRECATED_END }; } @@ -154,6 +158,8 @@ namespace ngraph bool m_special_zero; }; } + NGRAPH_SUPPRESS_DEPRECATED_START using v0::Reshape; + NGRAPH_SUPPRESS_DEPRECATED_END } } diff --git a/ngraph/core/include/ngraph/op/reverse.hpp b/ngraph/core/include/ngraph/op/reverse.hpp index 1461079..221999f 100644 --- a/ngraph/core/include/ngraph/op/reverse.hpp +++ b/ngraph/core/include/ngraph/op/reverse.hpp @@ -48,8 +48,11 @@ namespace ngraph /// | ---------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | /// | \f$E[d_1,\dots,d_n]\f$ | The tensor \f$T\f$, where \f$T[i_1,\dots,i_n] = \texttt{arg}[j_1,\dots,j_n]\f$ and \f$j_k = d_k - i_k - 1\f$ if axis \f$k\f$ is in the reverse set; else \f$j_k = i_k\f$. | // clang-format on - class NGRAPH_API Reverse : public Op + class NGRAPH_DEPRECATED( + "This operation is deprecated and will be removed soon. " + "Use v1::Reverse instead of it.") NGRAPH_API Reverse : public Op { + NGRAPH_SUPPRESS_DEPRECATED_START public: static constexpr NodeTypeInfo type_info{"Reverse", 0}; const NodeTypeInfo& get_type_info() const override { return type_info; } @@ -76,6 +79,7 @@ namespace ngraph protected: AxisSet m_reversed_axes; + NGRAPH_SUPPRESS_DEPRECATED_END }; } @@ -133,7 +137,9 @@ namespace ngraph }; } // default opset version + NGRAPH_SUPPRESS_DEPRECATED_START using v0::Reverse; + NGRAPH_SUPPRESS_DEPRECATED_END } NGRAPH_API diff --git a/ngraph/core/include/ngraph/op/round.hpp b/ngraph/core/include/ngraph/op/round.hpp index 4215b1a..8e37ae1 100644 --- a/ngraph/core/include/ngraph/op/round.hpp +++ b/ngraph/core/include/ngraph/op/round.hpp @@ -25,8 +25,11 @@ namespace ngraph namespace v0 { /// \brief Elementwise round operation. - class NGRAPH_API Round : public util::UnaryElementwiseArithmetic + class NGRAPH_DEPRECATED( + "This operation is deprecated and will be removed soon. Please do not use it.") + NGRAPH_API Round : public util::UnaryElementwiseArithmetic { + NGRAPH_SUPPRESS_DEPRECATED_START public: static constexpr NodeTypeInfo type_info{"Round", 0}; const NodeTypeInfo& get_type_info() const override { return type_info; } @@ -45,8 +48,11 @@ namespace ngraph bool evaluate(const HostTensorVector& outputs, const HostTensorVector& inputs) const override; + NGRAPH_SUPPRESS_DEPRECATED_END }; } + NGRAPH_SUPPRESS_DEPRECATED_START using v0::Round; + NGRAPH_SUPPRESS_DEPRECATED_END } } diff --git a/ngraph/core/include/ngraph/op/scatter_add.hpp b/ngraph/core/include/ngraph/op/scatter_add.hpp deleted file mode 100644 index 2c6b65e..0000000 --- a/ngraph/core/include/ngraph/op/scatter_add.hpp +++ /dev/null @@ -1,83 +0,0 @@ -//***************************************************************************** -// Copyright 2017-2020 Intel Corporation -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -//***************************************************************************** - -#pragma once - -#include "ngraph/op/op.hpp" -#include "ngraph/op/util/scatter_base.hpp" - -namespace ngraph -{ - namespace op - { - namespace v0 - { - /// \brief Add updates to slices from inputs addressed by indices - class NGRAPH_API ScatterAdd : public Op - { - public: - static constexpr NodeTypeInfo type_info{"ScatterAdd", 0}; - const NodeTypeInfo& get_type_info() const override { return type_info; } - ScatterAdd() = default; - /// \param inputs Tensor - /// \param indices Index tensor: Data type must be `element::i32` or `element::i64` - /// \param updates Tensor: Must have same type as inputs - ScatterAdd(const Output& inputs, - const Output& indices, - const Output& updates) - : Op({inputs, indices, updates}) - { - constructor_validate_and_infer_types(); - } - - void validate_and_infer_types() override; - virtual std::shared_ptr - clone_with_new_inputs(const OutputVector& new_args) const override; - }; - } - - namespace v3 - { - /// - /// \brief Add updates to slices from inputs addressed by indices - /// - class NGRAPH_API ScatterAdd : public util::ScatterBase - { - public: - static constexpr NodeTypeInfo type_info{"ScatterAdd", 3}; - const NodeTypeInfo& get_type_info() const override { return type_info; } - ScatterAdd() = default; - - /// - /// \brief Constructs ScatterAdd object. - /// - /// \param data The input tensor to be updated. - /// \param indices The tensor with indexes which will be updated. - /// \param updates The tensor with update values. - /// \param[in] axis The axis at which elements will be updated. - /// - ScatterAdd(const Output& data, - const Output& indices, - const Output& updates, - const Output& axis); - - virtual std::shared_ptr - clone_with_new_inputs(const OutputVector& inputs) const override; - }; - } - using v0::ScatterAdd; - } -} diff --git a/ngraph/core/include/ngraph/op/select.hpp b/ngraph/core/include/ngraph/op/select.hpp index 1faf15b..06b9bfb 100644 --- a/ngraph/core/include/ngraph/op/select.hpp +++ b/ngraph/core/include/ngraph/op/select.hpp @@ -41,8 +41,11 @@ namespace ngraph /// | ---------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------- | /// | \f$E[d_1,\dots,d_n]\f$ | The tensor \f$T\f$, where \f$T[i_1,\dots,i_n] = \texttt{arg1}[i_1,\dots,i_n]\text{ if }\texttt{arg0}[i_1,\dots,i_n] \neq 0\text{, else }\texttt{arg2}[i_1,\dots,i_n]\f$ | // clang-format on - class NGRAPH_API Select : public Op + class NGRAPH_DEPRECATED( + "This operation is deprecated and will be removed soon. " + "Use v1::Select instead of it.") NGRAPH_API Select : public Op { + NGRAPH_SUPPRESS_DEPRECATED_START public: static constexpr NodeTypeInfo type_info{"Select", 0}; const NodeTypeInfo& get_type_info() const override { return type_info; } @@ -60,6 +63,7 @@ namespace ngraph virtual std::shared_ptr clone_with_new_inputs(const OutputVector& new_args) const override; void validate_and_infer_types() override; + NGRAPH_SUPPRESS_DEPRECATED_END }; } @@ -122,6 +126,8 @@ namespace ngraph AutoBroadcastSpec m_auto_broadcast; }; } + NGRAPH_SUPPRESS_DEPRECATED_START using v0::Select; + NGRAPH_SUPPRESS_DEPRECATED_END } } diff --git a/ngraph/core/include/ngraph/op/slice.hpp b/ngraph/core/include/ngraph/op/slice.hpp index 22720a7..0cb0104 100644 --- a/ngraph/core/include/ngraph/op/slice.hpp +++ b/ngraph/core/include/ngraph/op/slice.hpp @@ -28,8 +28,11 @@ namespace ngraph { /// \brief Takes a slice of an input tensor, i.e., the sub-tensor that resides within a /// bounding box, optionally with stride. - class NGRAPH_API Slice : public Op + class NGRAPH_DEPRECATED( + "This operation is deprecated and will be removed soon. Please do not use it.") + NGRAPH_API Slice : public Op { + NGRAPH_SUPPRESS_DEPRECATED_START public: static constexpr NodeTypeInfo type_info{"Slice", 0}; const NodeTypeInfo& get_type_info() const override { return type_info; } @@ -75,9 +78,12 @@ namespace ngraph Coordinate m_lower_bounds; Coordinate m_upper_bounds; Strides m_strides; + NGRAPH_SUPPRESS_DEPRECATED_END }; } // default opset version + NGRAPH_SUPPRESS_DEPRECATED_START using v0::Slice; + NGRAPH_SUPPRESS_DEPRECATED_END } } diff --git a/ngraph/core/include/ngraph/op/softmax.hpp b/ngraph/core/include/ngraph/op/softmax.hpp index 00cfb69..fc5f652 100644 --- a/ngraph/core/include/ngraph/op/softmax.hpp +++ b/ngraph/core/include/ngraph/op/softmax.hpp @@ -26,8 +26,11 @@ namespace ngraph { /// \brief Softmax operation. /// - class NGRAPH_API Softmax : public Op + class NGRAPH_DEPRECATED( + "This operation is deprecated and will be removed soon. " + "Use v1::Softmax instead of it.") NGRAPH_API Softmax : public Op { + NGRAPH_SUPPRESS_DEPRECATED_START public: static constexpr NodeTypeInfo type_info{"Softmax", 0}; const NodeTypeInfo& get_type_info() const override { return type_info; } @@ -63,6 +66,7 @@ namespace ngraph bool evaluate(const HostTensorVector& outputs, const HostTensorVector& inputs) const override; + NGRAPH_SUPPRESS_DEPRECATED_END }; } @@ -105,6 +109,8 @@ namespace ngraph } // default opset version + NGRAPH_SUPPRESS_DEPRECATED_START using v0::Softmax; + NGRAPH_SUPPRESS_DEPRECATED_END } } diff --git a/ngraph/core/include/ngraph/op/split.hpp b/ngraph/core/include/ngraph/op/split.hpp index 7387987..a0cd41e 100644 --- a/ngraph/core/include/ngraph/op/split.hpp +++ b/ngraph/core/include/ngraph/op/split.hpp @@ -31,8 +31,11 @@ namespace ngraph namespace v0 { /// \brief Splits the input tensor into a list of smaller tensors ("pieces") - class NGRAPH_API Split : public ngraph::op::util::FusedOp + class NGRAPH_DEPRECATED( + "This operation is deprecated and will be removed soon. " + "Use v1::Split instead of it.") NGRAPH_API Split : public ngraph::op::util::FusedOp { + NGRAPH_SUPPRESS_DEPRECATED_START public: static constexpr NodeTypeInfo type_info{"Split", 0}; const NodeTypeInfo& get_type_info() const override { return type_info; } @@ -76,6 +79,7 @@ namespace ngraph size_t m_num_split; /// contains lengths of chunks that the input tensor will be split into std::vector m_splits; + NGRAPH_SUPPRESS_DEPRECATED_END }; } @@ -112,7 +116,9 @@ namespace ngraph }; } + NGRAPH_SUPPRESS_DEPRECATED_START using v0::Split; + NGRAPH_SUPPRESS_DEPRECATED_END } } diff --git a/ngraph/core/include/ngraph/op/stop_gradient.hpp b/ngraph/core/include/ngraph/op/stop_gradient.hpp index 54a03f4..057aa9a 100644 --- a/ngraph/core/include/ngraph/op/stop_gradient.hpp +++ b/ngraph/core/include/ngraph/op/stop_gradient.hpp @@ -25,8 +25,11 @@ namespace ngraph namespace v0 { /// \brief create StopGrdient op - class NGRAPH_API StopGradient : public util::UnaryElementwiseArithmetic + class NGRAPH_DEPRECATED( + "This operation is deprecated and will be removed soon. Please do not use it.") + NGRAPH_API StopGradient : public util::UnaryElementwiseArithmetic { + NGRAPH_SUPPRESS_DEPRECATED_START public: static constexpr NodeTypeInfo type_info{"StopGradient", 0}; const NodeTypeInfo& get_type_info() const override { return type_info; } @@ -38,8 +41,11 @@ namespace ngraph virtual std::shared_ptr clone_with_new_inputs(const OutputVector& new_args) const override; + NGRAPH_SUPPRESS_DEPRECATED_END }; } + NGRAPH_SUPPRESS_DEPRECATED_START using v0::StopGradient; + NGRAPH_SUPPRESS_DEPRECATED_END } } diff --git a/ngraph/core/include/ngraph/op/subtract.hpp b/ngraph/core/include/ngraph/op/subtract.hpp index a5335e7..5e5a0f1 100644 --- a/ngraph/core/include/ngraph/op/subtract.hpp +++ b/ngraph/core/include/ngraph/op/subtract.hpp @@ -25,8 +25,12 @@ namespace ngraph namespace v0 { /// \brief Elementwise subtraction operation. - class NGRAPH_API Subtract : public util::BinaryElementwiseArithmetic + class NGRAPH_DEPRECATED( + "This operation is deprecated and will be removed soon. " + "Use v1::Subtract instead of it.") NGRAPH_API Subtract + : public util::BinaryElementwiseArithmetic { + NGRAPH_SUPPRESS_DEPRECATED_START public: static constexpr NodeTypeInfo type_info{"Subtract", 0}; const NodeTypeInfo& get_type_info() const override { return type_info; } @@ -49,6 +53,7 @@ namespace ngraph bool evaluate(const HostTensorVector& outputs, const HostTensorVector& inputs) const override; + NGRAPH_SUPPRESS_DEPRECATED_END }; } // namespace v0 @@ -83,9 +88,12 @@ namespace ngraph }; } // namespace v1 + NGRAPH_SUPPRESS_DEPRECATED_START using v0::Subtract; + NGRAPH_SUPPRESS_DEPRECATED_END } // namespace op + NGRAPH_DEPRECATED("This operator was deprecated and will be removed with v0 operation.") NGRAPH_API std::shared_ptr operator-(const Output arg0, const Output arg1); diff --git a/ngraph/core/include/ngraph/op/sum.hpp b/ngraph/core/include/ngraph/op/sum.hpp index f05b5e5..8df0758 100644 --- a/ngraph/core/include/ngraph/op/sum.hpp +++ b/ngraph/core/include/ngraph/op/sum.hpp @@ -74,8 +74,10 @@ namespace ngraph /// | ----------------------------------------- | ---------------------------------------------------------------------------------------------------------------- | /// | \f$N[\textit{delete}(A,d_1,\dots,d_n)]\f$ | The tensor \f$T\f$, where \f$T\f$ is the input tensor with the `reduction_axes` \f$A\f$ eliminated by summation. | // clang-format off - class NGRAPH_API Sum : public util::ArithmeticReduction + class NGRAPH_DEPRECATED("This operation is deprecated and will be removed soon. " + "Use v1::ReduceSum instead of it.") NGRAPH_API Sum : public util::ArithmeticReduction { + NGRAPH_SUPPRESS_DEPRECATED_START public: static constexpr NodeTypeInfo type_info{ "Sum", 0 }; const NodeTypeInfo& get_type_info() const override { return type_info; } @@ -100,9 +102,12 @@ namespace ngraph bool evaluate(const HostTensorVector& outputs, const HostTensorVector& inputs) const override; + NGRAPH_SUPPRESS_DEPRECATED_END }; } // default opset version + NGRAPH_SUPPRESS_DEPRECATED_START using v0::Sum; + NGRAPH_SUPPRESS_DEPRECATED_END } } diff --git a/ngraph/core/include/ngraph/op/topk.hpp b/ngraph/core/include/ngraph/op/topk.hpp index 28082f4..e89cf16 100644 --- a/ngraph/core/include/ngraph/op/topk.hpp +++ b/ngraph/core/include/ngraph/op/topk.hpp @@ -30,8 +30,11 @@ namespace ngraph { // \brief Computes indices of top k maximum/minimum index along a specified axis for a // given tensor - class NGRAPH_API TopK : public Op + class NGRAPH_DEPRECATED( + "This operation is deprecated and will be removed soon. " + "Use v1::TopK instead of it.") NGRAPH_API TopK : public Op { + NGRAPH_SUPPRESS_DEPRECATED_START public: using SortType = TopKSortType; @@ -112,6 +115,7 @@ namespace ngraph Shape compute_output_shape(const Shape input_shape, const int64_t k, const size_t axis) const; + NGRAPH_SUPPRESS_DEPRECATED_END }; } // namespace v0 @@ -258,6 +262,8 @@ namespace ngraph }; } // namespace v3 + NGRAPH_SUPPRESS_DEPRECATED_START using v0::TopK; + NGRAPH_SUPPRESS_DEPRECATED_END } // op } // ngraph diff --git a/ngraph/core/include/ngraph/ops.hpp b/ngraph/core/include/ngraph/ops.hpp index 44a5dd9..1f7bac8 100644 --- a/ngraph/core/include/ngraph/ops.hpp +++ b/ngraph/core/include/ngraph/ops.hpp @@ -103,7 +103,6 @@ #include "ngraph/op/or.hpp" #include "ngraph/op/pad.hpp" #include "ngraph/op/parameter.hpp" -#include "ngraph/op/passthrough.hpp" #include "ngraph/op/power.hpp" #include "ngraph/op/prelu.hpp" #include "ngraph/op/prior_box.hpp" diff --git a/ngraph/core/reference/include/ngraph/runtime/reference/matmul.hpp b/ngraph/core/reference/include/ngraph/runtime/reference/matmul.hpp index 17de94b..6ee0d31 100644 --- a/ngraph/core/reference/include/ngraph/runtime/reference/matmul.hpp +++ b/ngraph/core/reference/include/ngraph/runtime/reference/matmul.hpp @@ -28,6 +28,8 @@ #include "ngraph/runtime/reference/dot.hpp" #include "ngraph/shape_util.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; namespace ngraph @@ -272,3 +274,5 @@ namespace ngraph } } } + +NGRAPH_SUPPRESS_DEPRECATED_END diff --git a/ngraph/core/reference/include/ngraph/runtime/reference/quantize.hpp b/ngraph/core/reference/include/ngraph/runtime/reference/quantize.hpp index 99afe2e..52e37af 100644 --- a/ngraph/core/reference/include/ngraph/runtime/reference/quantize.hpp +++ b/ngraph/core/reference/include/ngraph/runtime/reference/quantize.hpp @@ -20,6 +20,8 @@ #include "ngraph/op/quantize.hpp" #include "ngraph/shape_util.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + namespace ngraph { namespace runtime @@ -118,3 +120,5 @@ namespace ngraph } } } + +NGRAPH_SUPPRESS_DEPRECATED_END diff --git a/ngraph/core/reference/include/ngraph/runtime/reference/topk.hpp b/ngraph/core/reference/include/ngraph/runtime/reference/topk.hpp index cb5c5bf..575a59e 100644 --- a/ngraph/core/reference/include/ngraph/runtime/reference/topk.hpp +++ b/ngraph/core/reference/include/ngraph/runtime/reference/topk.hpp @@ -23,6 +23,8 @@ #include "ngraph/coordinate_transform.hpp" #include "ngraph/op/topk.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + namespace ngraph { namespace runtime @@ -173,3 +175,5 @@ namespace ngraph } } } + +NGRAPH_SUPPRESS_DEPRECATED_END diff --git a/ngraph/core/src/builder/autobroadcast.cpp b/ngraph/core/src/builder/autobroadcast.cpp index 8f91890..a5c1b03 100644 --- a/ngraph/core/src/builder/autobroadcast.cpp +++ b/ngraph/core/src/builder/autobroadcast.cpp @@ -28,6 +28,8 @@ #include "ngraph/op/reshape.hpp" #include "ngraph/util.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; namespace ngraph diff --git a/ngraph/core/src/builder/matmul_factory.cpp b/ngraph/core/src/builder/matmul_factory.cpp index 4c27078..effe790 100644 --- a/ngraph/core/src/builder/matmul_factory.cpp +++ b/ngraph/core/src/builder/matmul_factory.cpp @@ -29,6 +29,8 @@ #include "ngraph/op/reshape.hpp" #include "ngraph/op/slice.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace ngraph; using namespace std; diff --git a/ngraph/core/src/builder/split.cpp b/ngraph/core/src/builder/split.cpp index 54d6aa3..5d5c0c8 100644 --- a/ngraph/core/src/builder/split.cpp +++ b/ngraph/core/src/builder/split.cpp @@ -18,6 +18,8 @@ #include "ngraph/op/slice.hpp" #include "ngraph/opsets/opset1.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace ngraph; namespace diff --git a/ngraph/core/src/graph_util.cpp b/ngraph/core/src/graph_util.cpp index 3cbb43a..604b902 100644 --- a/ngraph/core/src/graph_util.cpp +++ b/ngraph/core/src/graph_util.cpp @@ -37,6 +37,8 @@ #include "ngraph/rt_info.hpp" #include "ngraph/util.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/core/src/op/add.cpp b/ngraph/core/src/op/add.cpp index 62b11f9..d76b237 100644 --- a/ngraph/core/src/op/add.cpp +++ b/ngraph/core/src/op/add.cpp @@ -19,6 +19,8 @@ #include "ngraph/runtime/host_tensor.hpp" #include "ngraph/runtime/reference/add.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/core/src/op/any.cpp b/ngraph/core/src/op/any.cpp index 0c93700..2b70221 100644 --- a/ngraph/core/src/op/any.cpp +++ b/ngraph/core/src/op/any.cpp @@ -17,6 +17,8 @@ #include "ngraph/op/any.hpp" #include "ngraph/graph_util.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/core/src/op/broadcast.cpp b/ngraph/core/src/op/broadcast.cpp index 9337ca6..6df504f 100644 --- a/ngraph/core/src/op/broadcast.cpp +++ b/ngraph/core/src/op/broadcast.cpp @@ -26,6 +26,8 @@ #include "ngraph/runtime/host_tensor.hpp" #include "ngraph/runtime/reference/broadcast.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/core/src/op/dequantize.cpp b/ngraph/core/src/op/dequantize.cpp index 16bfe1c..df3a0fb 100644 --- a/ngraph/core/src/op/dequantize.cpp +++ b/ngraph/core/src/op/dequantize.cpp @@ -17,6 +17,8 @@ #include "ngraph/op/dequantize.hpp" #include "ngraph/shape_util.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/core/src/op/divide.cpp b/ngraph/core/src/op/divide.cpp index eb9b579..0a4fd52 100644 --- a/ngraph/core/src/op/divide.cpp +++ b/ngraph/core/src/op/divide.cpp @@ -21,6 +21,8 @@ #include "ngraph/runtime/host_tensor.hpp" #include "ngraph/runtime/reference/divide.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/core/src/op/dot.cpp b/ngraph/core/src/op/dot.cpp index 1f0dd90..fa2e1cd 100644 --- a/ngraph/core/src/op/dot.cpp +++ b/ngraph/core/src/op/dot.cpp @@ -24,6 +24,8 @@ #include "ngraph/op/reshape.hpp" #include "ngraph/shape.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/core/src/op/equal.cpp b/ngraph/core/src/op/equal.cpp index d349955..8e3c844 100644 --- a/ngraph/core/src/op/equal.cpp +++ b/ngraph/core/src/op/equal.cpp @@ -19,6 +19,8 @@ #include "ngraph/runtime/host_tensor.hpp" #include "ngraph/runtime/reference/equal.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/core/src/op/gather.cpp b/ngraph/core/src/op/gather.cpp index 7007976..6b3340f 100644 --- a/ngraph/core/src/op/gather.cpp +++ b/ngraph/core/src/op/gather.cpp @@ -23,6 +23,8 @@ #include +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/core/src/op/gather_nd.cpp b/ngraph/core/src/op/gather_nd.cpp index 163fd60..1c278f2 100644 --- a/ngraph/core/src/op/gather_nd.cpp +++ b/ngraph/core/src/op/gather_nd.cpp @@ -17,6 +17,8 @@ #include "ngraph/op/gather_nd.hpp" #include "ngraph/shape.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/core/src/op/greater.cpp b/ngraph/core/src/op/greater.cpp index b163194..7434068 100644 --- a/ngraph/core/src/op/greater.cpp +++ b/ngraph/core/src/op/greater.cpp @@ -19,6 +19,8 @@ #include "ngraph/runtime/host_tensor.hpp" #include "ngraph/runtime/reference/greater.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/core/src/op/greater_eq.cpp b/ngraph/core/src/op/greater_eq.cpp index 63c2a47..dac56de 100644 --- a/ngraph/core/src/op/greater_eq.cpp +++ b/ngraph/core/src/op/greater_eq.cpp @@ -19,6 +19,8 @@ #include "ngraph/runtime/host_tensor.hpp" #include "ngraph/runtime/reference/greater_eq.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/core/src/op/less.cpp b/ngraph/core/src/op/less.cpp index a113f07..1cbd3ab 100644 --- a/ngraph/core/src/op/less.cpp +++ b/ngraph/core/src/op/less.cpp @@ -19,6 +19,8 @@ #include "ngraph/runtime/host_tensor.hpp" #include "ngraph/runtime/reference/less.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/core/src/op/less_eq.cpp b/ngraph/core/src/op/less_eq.cpp index 6fc2757..23ded6c 100644 --- a/ngraph/core/src/op/less_eq.cpp +++ b/ngraph/core/src/op/less_eq.cpp @@ -19,6 +19,8 @@ #include "ngraph/runtime/host_tensor.hpp" #include "ngraph/runtime/reference/less_eq.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/core/src/op/max.cpp b/ngraph/core/src/op/max.cpp index d16cc74..e3d1791 100644 --- a/ngraph/core/src/op/max.cpp +++ b/ngraph/core/src/op/max.cpp @@ -21,6 +21,8 @@ #include "ngraph/runtime/reference/max.hpp" #include "ngraph/shape_util.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/core/src/op/maximum.cpp b/ngraph/core/src/op/maximum.cpp index 3337506..b61c6a0 100644 --- a/ngraph/core/src/op/maximum.cpp +++ b/ngraph/core/src/op/maximum.cpp @@ -25,6 +25,8 @@ #include "ngraph/runtime/reference/maximum.hpp" #include "ngraph/type/element_type.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/core/src/op/min.cpp b/ngraph/core/src/op/min.cpp index eb51ffc..600da12 100644 --- a/ngraph/core/src/op/min.cpp +++ b/ngraph/core/src/op/min.cpp @@ -21,6 +21,8 @@ #include "ngraph/runtime/reference/min.hpp" #include "ngraph/shape_util.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/core/src/op/minimum.cpp b/ngraph/core/src/op/minimum.cpp index 9a276eb..a4849d6 100644 --- a/ngraph/core/src/op/minimum.cpp +++ b/ngraph/core/src/op/minimum.cpp @@ -25,6 +25,8 @@ #include "ngraph/runtime/reference/minimum.hpp" #include "ngraph/type/element_type.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/core/src/op/multiply.cpp b/ngraph/core/src/op/multiply.cpp index 794b6da..b97fa37 100644 --- a/ngraph/core/src/op/multiply.cpp +++ b/ngraph/core/src/op/multiply.cpp @@ -19,6 +19,8 @@ #include "ngraph/runtime/host_tensor.hpp" #include "ngraph/runtime/reference/multiply.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/core/src/op/not.cpp b/ngraph/core/src/op/not.cpp index 52b5cc0..728a21e 100644 --- a/ngraph/core/src/op/not.cpp +++ b/ngraph/core/src/op/not.cpp @@ -23,6 +23,8 @@ #include "ngraph/runtime/host_tensor.hpp" #include "ngraph/runtime/reference/not.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace ngraph; using namespace std; diff --git a/ngraph/core/src/op/not_equal.cpp b/ngraph/core/src/op/not_equal.cpp index d45d806..5f569d2 100644 --- a/ngraph/core/src/op/not_equal.cpp +++ b/ngraph/core/src/op/not_equal.cpp @@ -19,6 +19,8 @@ #include "ngraph/runtime/host_tensor.hpp" #include "ngraph/runtime/reference/not_equal.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/core/src/op/one_hot.cpp b/ngraph/core/src/op/one_hot.cpp index d532767..11a5594 100644 --- a/ngraph/core/src/op/one_hot.cpp +++ b/ngraph/core/src/op/one_hot.cpp @@ -19,6 +19,8 @@ #include "ngraph/op/util/op_types.hpp" #include "ngraph/validation_util.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/core/src/op/or.cpp b/ngraph/core/src/op/or.cpp index f019246..dc52e71 100644 --- a/ngraph/core/src/op/or.cpp +++ b/ngraph/core/src/op/or.cpp @@ -19,6 +19,8 @@ #include "ngraph/runtime/host_tensor.hpp" #include "ngraph/runtime/reference/or.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/core/src/op/pad.cpp b/ngraph/core/src/op/pad.cpp index f50f2d9..96dcad3 100644 --- a/ngraph/core/src/op/pad.cpp +++ b/ngraph/core/src/op/pad.cpp @@ -22,6 +22,8 @@ #include "ngraph/op/util/op_types.hpp" #include "ngraph/runtime/reference/pad.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/core/src/op/passthrough.cpp b/ngraph/core/src/op/passthrough.cpp deleted file mode 100644 index 6aaa072..0000000 --- a/ngraph/core/src/op/passthrough.cpp +++ /dev/null @@ -1,74 +0,0 @@ -//***************************************************************************** -// Copyright 2017-2020 Intel Corporation -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -//***************************************************************************** - -#include - -#include "ngraph/op/passthrough.hpp" - -using namespace std; -using namespace ngraph; - -constexpr NodeTypeInfo op::Passthrough::type_info; - -ngraph::op::Passthrough::Passthrough(const std::string& logical_type, - const std::string& language, - const std::string& function, - const OutputVector& args, - std::vector> outputs) - : Op{args} - , m_logical_type{logical_type} - , m_language{language} - , m_function{function} - , m_output_shapes{std::move(outputs)} -{ - set_output_size(m_output_shapes.size()); - constructor_validate_and_infer_types(); -} - -void ngraph::op::Passthrough::validate_and_infer_types() -{ - // N.B. It would be useful to have the backend deduce the output - // shapes, instead of having them passed in via the - // constructor and trusting that they're correct. - // - // The primary barrier to doing so is that at the point where - // Passthrough ops are being constructed, we don't - // necessarily have the backend available. - // - // At some point, we may want to add higher-level - // backend-specific APIs for constructing Passthrough - // operations; that would ensure that the backend can - // understand the language being used, and would allow the - // backend to infer the output shapes as needed. - - std::size_t idx = 0; - for (auto& output_shape : m_output_shapes) - { - set_output_type(idx++, std::get<0>(output_shape), std::get<1>(output_shape)); - } -} - -std::shared_ptr - ngraph::op::Passthrough::clone_with_new_inputs(const OutputVector& new_args) const -{ - if (new_args.size() != get_input_size()) - { - throw ngraph_error{ - "Passthrough node input counts cannot be changed for a given Passthrough function"}; - } - return std::make_shared( - m_logical_type, m_language, m_function, new_args, m_output_shapes); -} diff --git a/ngraph/core/src/op/power.cpp b/ngraph/core/src/op/power.cpp index 8720297..f107d70 100644 --- a/ngraph/core/src/op/power.cpp +++ b/ngraph/core/src/op/power.cpp @@ -22,6 +22,8 @@ #include "ngraph/runtime/host_tensor.hpp" #include "ngraph/runtime/reference/power.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/core/src/op/product.cpp b/ngraph/core/src/op/product.cpp index 74fc615..51e24ad 100644 --- a/ngraph/core/src/op/product.cpp +++ b/ngraph/core/src/op/product.cpp @@ -21,6 +21,8 @@ #include "ngraph/runtime/reference/product.hpp" #include "ngraph/shape_util.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/core/src/op/quantize.cpp b/ngraph/core/src/op/quantize.cpp index 8d379b5..bd4f117 100644 --- a/ngraph/core/src/op/quantize.cpp +++ b/ngraph/core/src/op/quantize.cpp @@ -17,6 +17,8 @@ #include "ngraph/op/quantize.hpp" #include "ngraph/shape_util.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/core/src/op/quantized_convolution.cpp b/ngraph/core/src/op/quantized_convolution.cpp index 5837f9b..315be90 100644 --- a/ngraph/core/src/op/quantized_convolution.cpp +++ b/ngraph/core/src/op/quantized_convolution.cpp @@ -18,6 +18,8 @@ #include "ngraph/coordinate_diff.hpp" #include "ngraph/validation_util.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/core/src/op/quantized_dot.cpp b/ngraph/core/src/op/quantized_dot.cpp index 898ad9c..08591ea 100644 --- a/ngraph/core/src/op/quantized_dot.cpp +++ b/ngraph/core/src/op/quantized_dot.cpp @@ -20,6 +20,8 @@ #include "ngraph/util.hpp" #include "ngraph/validation_util.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/core/src/op/replace_slice.cpp b/ngraph/core/src/op/replace_slice.cpp index 60d0e4e..2c5e460 100644 --- a/ngraph/core/src/op/replace_slice.cpp +++ b/ngraph/core/src/op/replace_slice.cpp @@ -18,6 +18,8 @@ #include "ngraph/op/constant.hpp" #include "ngraph/op/slice.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/core/src/op/reshape.cpp b/ngraph/core/src/op/reshape.cpp index d9f4a26..251aba8 100644 --- a/ngraph/core/src/op/reshape.cpp +++ b/ngraph/core/src/op/reshape.cpp @@ -24,6 +24,8 @@ #include "ngraph/runtime/opt_kernel/reshape.hpp" #include "ngraph/runtime/reference/reshape.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/core/src/op/reverse.cpp b/ngraph/core/src/op/reverse.cpp index 9a021ec..7f6a96e 100644 --- a/ngraph/core/src/op/reverse.cpp +++ b/ngraph/core/src/op/reverse.cpp @@ -24,6 +24,8 @@ #include "ngraph/op/util/op_types.hpp" #include "ngraph/runtime/reference/reverse.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/core/src/op/round.cpp b/ngraph/core/src/op/round.cpp index 18c3724..7e57673 100644 --- a/ngraph/core/src/op/round.cpp +++ b/ngraph/core/src/op/round.cpp @@ -21,6 +21,8 @@ #include "ngraph/runtime/reference/copy.hpp" #include "ngraph/runtime/reference/round.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/core/src/op/select.cpp b/ngraph/core/src/op/select.cpp index 45cd528..a736040 100644 --- a/ngraph/core/src/op/select.cpp +++ b/ngraph/core/src/op/select.cpp @@ -23,6 +23,8 @@ #include "ngraph/op/not.hpp" #include "ngraph/op/select.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/core/src/op/slice.cpp b/ngraph/core/src/op/slice.cpp index 99347f1..5c28318 100644 --- a/ngraph/core/src/op/slice.cpp +++ b/ngraph/core/src/op/slice.cpp @@ -19,6 +19,8 @@ #include "ngraph/runtime/host_tensor.hpp" #include "ngraph/runtime/reference/slice.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/core/src/op/softmax.cpp b/ngraph/core/src/op/softmax.cpp index d343d1b..960aca8 100644 --- a/ngraph/core/src/op/softmax.cpp +++ b/ngraph/core/src/op/softmax.cpp @@ -30,6 +30,8 @@ #include "ngraph/runtime/reference/softmax.hpp" #include "ngraph/util.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/core/src/op/split.cpp b/ngraph/core/src/op/split.cpp index d80c998..e8ac326 100644 --- a/ngraph/core/src/op/split.cpp +++ b/ngraph/core/src/op/split.cpp @@ -25,6 +25,8 @@ #include "ngraph/runtime/host_tensor.hpp" #include "ngraph/runtime/reference/slice.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/core/src/op/stop_gradient.cpp b/ngraph/core/src/op/stop_gradient.cpp index 0282113..ca8a8f2 100644 --- a/ngraph/core/src/op/stop_gradient.cpp +++ b/ngraph/core/src/op/stop_gradient.cpp @@ -17,6 +17,8 @@ #include "ngraph/op/stop_gradient.hpp" #include "ngraph/op/broadcast.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/core/src/op/subtract.cpp b/ngraph/core/src/op/subtract.cpp index 3cb2c66..dc68cfb 100644 --- a/ngraph/core/src/op/subtract.cpp +++ b/ngraph/core/src/op/subtract.cpp @@ -20,6 +20,8 @@ #include "ngraph/runtime/host_tensor.hpp" #include "ngraph/runtime/reference/subtract.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/core/src/op/sum.cpp b/ngraph/core/src/op/sum.cpp index 03a6613..446f92f 100644 --- a/ngraph/core/src/op/sum.cpp +++ b/ngraph/core/src/op/sum.cpp @@ -22,6 +22,8 @@ #include "ngraph/runtime/reference/sum.hpp" #include "ngraph/shape_util.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/core/src/op/topk.cpp b/ngraph/core/src/op/topk.cpp index 9768e10..1353335 100644 --- a/ngraph/core/src/op/topk.cpp +++ b/ngraph/core/src/op/topk.cpp @@ -28,6 +28,8 @@ #include "ngraph/runtime/host_tensor.hpp" #include "ngraph/runtime/reference/topk.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/core/src/op/util/op_types.cpp b/ngraph/core/src/op/util/op_types.cpp index 5a3d219..e56abc1 100644 --- a/ngraph/core/src/op/util/op_types.cpp +++ b/ngraph/core/src/op/util/op_types.cpp @@ -35,6 +35,8 @@ #include "ngraph/op/xor.hpp" #include "ngraph/type.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + bool ngraph::op::is_unary_elementwise_arithmetic(const ngraph::Node* node) { return dynamic_cast(node) != nullptr; diff --git a/ngraph/core/src/op/util/rnn_cell_base.cpp b/ngraph/core/src/op/util/rnn_cell_base.cpp index c149251..fc18099 100644 --- a/ngraph/core/src/op/util/rnn_cell_base.cpp +++ b/ngraph/core/src/op/util/rnn_cell_base.cpp @@ -92,19 +92,17 @@ op::util::ActivationFunction op::util::RNNCellBase::get_activation_function(size shared_ptr op::util::RNNCellBase::add(const Output& lhs, const Output& rhs) { - return {make_shared(lhs, rhs, op::AutoBroadcastSpec(op::AutoBroadcastType::NUMPY))}; + return {make_shared(lhs, rhs)}; } shared_ptr op::util::RNNCellBase::sub(const Output& lhs, const Output& rhs) { - return { - make_shared(lhs, rhs, op::AutoBroadcastSpec(op::AutoBroadcastType::NUMPY))}; + return {make_shared(lhs, rhs)}; } shared_ptr op::util::RNNCellBase::mul(const Output& lhs, const Output& rhs) { - return { - make_shared(lhs, rhs, op::AutoBroadcastSpec(op::AutoBroadcastType::NUMPY))}; + return {make_shared(lhs, rhs)}; } shared_ptr op::util::RNNCellBase::clip(const Output& data) const diff --git a/ngraph/core/src/pass/constant_folding_arithmetic_reduction.cpp b/ngraph/core/src/pass/constant_folding_arithmetic_reduction.cpp index 2a39ed9..c21a080 100644 --- a/ngraph/core/src/pass/constant_folding_arithmetic_reduction.cpp +++ b/ngraph/core/src/pass/constant_folding_arithmetic_reduction.cpp @@ -30,6 +30,8 @@ #include "ngraph/runtime/reference/product.hpp" #include "ngraph/runtime/reference/sum.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/core/src/pass/constant_folding_dequantize.cpp b/ngraph/core/src/pass/constant_folding_dequantize.cpp index de2a5d3..ce3c3b9 100644 --- a/ngraph/core/src/pass/constant_folding_dequantize.cpp +++ b/ngraph/core/src/pass/constant_folding_dequantize.cpp @@ -19,6 +19,8 @@ #include "ngraph/op/dequantize.hpp" #include "ngraph/runtime/reference/dequantize.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/core/src/pass/constant_folding_logical_reduction.cpp b/ngraph/core/src/pass/constant_folding_logical_reduction.cpp index d318b1b..5f58c11 100644 --- a/ngraph/core/src/pass/constant_folding_logical_reduction.cpp +++ b/ngraph/core/src/pass/constant_folding_logical_reduction.cpp @@ -22,6 +22,8 @@ #include "ngraph/runtime/reference/any.hpp" #include "ngraph/runtime/reference/logical_reduction.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/core/src/pass/constant_folding_quantize.cpp b/ngraph/core/src/pass/constant_folding_quantize.cpp index b97f0a7..44a8966 100644 --- a/ngraph/core/src/pass/constant_folding_quantize.cpp +++ b/ngraph/core/src/pass/constant_folding_quantize.cpp @@ -19,6 +19,8 @@ #include "ngraph/op/quantize.hpp" #include "ngraph/runtime/reference/quantize.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/core/src/pass/constant_folding_select.cpp b/ngraph/core/src/pass/constant_folding_select.cpp index c4a2660..e317b4d 100644 --- a/ngraph/core/src/pass/constant_folding_select.cpp +++ b/ngraph/core/src/pass/constant_folding_select.cpp @@ -19,6 +19,8 @@ #include "ngraph/op/select.hpp" #include "ngraph/runtime/reference/select.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/core/src/validation_util.cpp b/ngraph/core/src/validation_util.cpp index bb78025..e6bd592 100644 --- a/ngraph/core/src/validation_util.cpp +++ b/ngraph/core/src/validation_util.cpp @@ -29,6 +29,8 @@ #include "ngraph/util.hpp" #include "ngraph/validation_util.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/frontend/onnx_import/src/op/gru.cpp b/ngraph/frontend/onnx_import/src/op/gru.cpp index f174f20..3c2b4e3 100644 --- a/ngraph/frontend/onnx_import/src/op/gru.cpp +++ b/ngraph/frontend/onnx_import/src/op/gru.cpp @@ -50,6 +50,8 @@ namespace ngraph if (ng_inputs.size() > 3 && !ngraph::op::is_null(ng_inputs.at(3))) { + NGRAPH_SUPPRESS_DEPRECATED_START + auto bias = ng_inputs.at(3); // gates_count * 2 since B is: [Wb, Rb] const int split_parts = 2 * 3; @@ -73,6 +75,7 @@ namespace ngraph split_bias.at(2), split_bias.at(5)}, 1); + NGRAPH_SUPPRESS_DEPRECATED_END } else { diff --git a/ngraph/frontend/onnx_import/src/op/lstm.cpp b/ngraph/frontend/onnx_import/src/op/lstm.cpp index 83a2d82..e575de1 100644 --- a/ngraph/frontend/onnx_import/src/op/lstm.cpp +++ b/ngraph/frontend/onnx_import/src/op/lstm.cpp @@ -95,7 +95,9 @@ namespace ngraph { auto bias = ng_inputs.at(3); auto split_bias = builder::opset1::split(bias, 2, 1); + NGRAPH_SUPPRESS_DEPRECATED_START m_map[LSTMInput::LSTM_INPUT_B] = split_bias.at(0) + split_bias.at(1); + NGRAPH_SUPPRESS_DEPRECATED_END } else { diff --git a/ngraph/frontend/onnx_import/src/op/matmul_integer.cpp b/ngraph/frontend/onnx_import/src/op/matmul_integer.cpp index 9722744..b39049b 100644 --- a/ngraph/frontend/onnx_import/src/op/matmul_integer.cpp +++ b/ngraph/frontend/onnx_import/src/op/matmul_integer.cpp @@ -28,6 +28,7 @@ namespace ngraph { OutputVector matmul_integer(const Node& node) { + NGRAPH_SUPPRESS_DEPRECATED_START auto ng_inputs = node.get_ng_inputs(); auto factory = builder::MatmulIntegerFactory( OutputVector(std::begin(ng_inputs), std::end(ng_inputs))); @@ -43,6 +44,7 @@ namespace ngraph "to conform with ONNX standard."; } return factory.make_matmul_op(); + NGRAPH_SUPPRESS_DEPRECATED_END } } // namespace set_1 diff --git a/ngraph/frontend/onnx_import/src/op/qlinear_matmul.cpp b/ngraph/frontend/onnx_import/src/op/qlinear_matmul.cpp index 6ef58c1..ea78bd3 100644 --- a/ngraph/frontend/onnx_import/src/op/qlinear_matmul.cpp +++ b/ngraph/frontend/onnx_import/src/op/qlinear_matmul.cpp @@ -28,6 +28,7 @@ namespace ngraph { OutputVector qlinear_matmul(const Node& node) { + NGRAPH_SUPPRESS_DEPRECATED_START auto ng_inputs = node.get_ng_inputs(); auto factory = builder::QLinearMatmulFactory( (OutputVector(std::begin(ng_inputs), std::end(ng_inputs)))); @@ -43,6 +44,7 @@ namespace ngraph "to conform with ONNX standard."; } return factory.make_matmul_op(); + NGRAPH_SUPPRESS_DEPRECATED_END } } // namespace set_1 diff --git a/ngraph/frontend/onnx_import/src/utils/recurrent.cpp b/ngraph/frontend/onnx_import/src/utils/recurrent.cpp index cb9d7b7..8d0563a 100644 --- a/ngraph/frontend/onnx_import/src/utils/recurrent.cpp +++ b/ngraph/frontend/onnx_import/src/utils/recurrent.cpp @@ -65,7 +65,9 @@ namespace ngraph { auto bias = ng_inputs.at(3); auto split_bias = builder::opset1::split(bias, 2, 1); + NGRAPH_SUPPRESS_DEPRECATED_START m_map[OpInput::B] = split_bias.at(0) + split_bias.at(1); + NGRAPH_SUPPRESS_DEPRECATED_END } else { diff --git a/ngraph/test/backend/abc.in.cpp b/ngraph/test/backend/abc.in.cpp index fc69486..4457ebc 100644 --- a/ngraph/test/backend/abc.in.cpp +++ b/ngraph/test/backend/abc.in.cpp @@ -20,6 +20,8 @@ #include "util/test_case.hpp" #include "util/test_control.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/test/backend/add.in.cpp b/ngraph/test/backend/add.in.cpp index d3e207e..93e9f0b 100644 --- a/ngraph/test/backend/add.in.cpp +++ b/ngraph/test/backend/add.in.cpp @@ -37,6 +37,8 @@ #include "util/test_case.hpp" #include "util/test_control.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/test/backend/aliased_output.in.cpp b/ngraph/test/backend/aliased_output.in.cpp index 43f3372..8409779 100644 --- a/ngraph/test/backend/aliased_output.in.cpp +++ b/ngraph/test/backend/aliased_output.in.cpp @@ -20,6 +20,8 @@ #include "util/test_case.hpp" #include "util/test_control.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/test/backend/any.in.cpp b/ngraph/test/backend/any.in.cpp index b608ddb..7c1fd8a 100644 --- a/ngraph/test/backend/any.in.cpp +++ b/ngraph/test/backend/any.in.cpp @@ -31,6 +31,8 @@ #include "util/test_control.hpp" #include "util/test_tools.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/test/backend/api.in.cpp b/ngraph/test/backend/api.in.cpp index 15f3dc8..295ff6d 100644 --- a/ngraph/test/backend/api.in.cpp +++ b/ngraph/test/backend/api.in.cpp @@ -24,6 +24,8 @@ #include "util/test_control.hpp" #include "util/test_tools.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/test/backend/auto_broadcast.in.cpp b/ngraph/test/backend/auto_broadcast.in.cpp index cf388c6..928218c 100644 --- a/ngraph/test/backend/auto_broadcast.in.cpp +++ b/ngraph/test/backend/auto_broadcast.in.cpp @@ -52,6 +52,8 @@ #include "util/test_control.hpp" #include "util/test_tools.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/test/backend/broadcast.in.cpp b/ngraph/test/backend/broadcast.in.cpp index 89fb802..2eb72af 100644 --- a/ngraph/test/backend/broadcast.in.cpp +++ b/ngraph/test/backend/broadcast.in.cpp @@ -32,6 +32,8 @@ #include "util/test_control.hpp" #include "util/test_tools.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/test/backend/comparison.in.cpp b/ngraph/test/backend/comparison.in.cpp index a836eab..0f9651e 100644 --- a/ngraph/test/backend/comparison.in.cpp +++ b/ngraph/test/backend/comparison.in.cpp @@ -33,6 +33,8 @@ #include "util/test_control.hpp" #include "util/test_tools.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/test/backend/concat.in.cpp b/ngraph/test/backend/concat.in.cpp index cebb8c1..0dc8b89 100644 --- a/ngraph/test/backend/concat.in.cpp +++ b/ngraph/test/backend/concat.in.cpp @@ -24,6 +24,8 @@ #include "util/test_control.hpp" #include "util/test_tools.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/test/backend/constant.in.cpp b/ngraph/test/backend/constant.in.cpp index 307e826..813037b 100644 --- a/ngraph/test/backend/constant.in.cpp +++ b/ngraph/test/backend/constant.in.cpp @@ -24,6 +24,8 @@ #include "util/test_control.hpp" #include "util/test_tools.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/test/backend/divide.in.cpp b/ngraph/test/backend/divide.in.cpp index b448110..8ad8771 100644 --- a/ngraph/test/backend/divide.in.cpp +++ b/ngraph/test/backend/divide.in.cpp @@ -41,6 +41,8 @@ #include "util/test_control.hpp" #include "util/test_tools.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/test/backend/dot.in.cpp b/ngraph/test/backend/dot.in.cpp index 11e9f6b..55a8db2 100644 --- a/ngraph/test/backend/dot.in.cpp +++ b/ngraph/test/backend/dot.in.cpp @@ -31,6 +31,8 @@ #include "util/test_control.hpp" #include "util/test_tools.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/test/backend/dynamic.in.cpp b/ngraph/test/backend/dynamic.in.cpp index a90818b..906b77b 100644 --- a/ngraph/test/backend/dynamic.in.cpp +++ b/ngraph/test/backend/dynamic.in.cpp @@ -22,6 +22,8 @@ #include "util/test_control.hpp" #include "util/test_tools.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/test/backend/function_name.in.cpp b/ngraph/test/backend/function_name.in.cpp index b58c0a6..c8f99e5 100644 --- a/ngraph/test/backend/function_name.in.cpp +++ b/ngraph/test/backend/function_name.in.cpp @@ -23,6 +23,8 @@ #include "util/test_control.hpp" #include "util/test_tools.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/test/backend/fused_op.in.cpp b/ngraph/test/backend/fused_op.in.cpp index 9647d98..ca84700 100644 --- a/ngraph/test/backend/fused_op.in.cpp +++ b/ngraph/test/backend/fused_op.in.cpp @@ -44,6 +44,8 @@ #include "util/test_control.hpp" #include "util/test_tools.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/test/backend/gather.in.cpp b/ngraph/test/backend/gather.in.cpp index 692d87c..f172397 100644 --- a/ngraph/test/backend/gather.in.cpp +++ b/ngraph/test/backend/gather.in.cpp @@ -33,6 +33,8 @@ #include "util/test_control.hpp" #include "util/test_tools.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/test/backend/logical_or.in.cpp b/ngraph/test/backend/logical_or.in.cpp index c699f5e..e2fc890 100644 --- a/ngraph/test/backend/logical_or.in.cpp +++ b/ngraph/test/backend/logical_or.in.cpp @@ -20,6 +20,8 @@ #include "util/test_case.hpp" #include "util/test_control.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/test/backend/max.in.cpp b/ngraph/test/backend/max.in.cpp index 98a8301..81730e2 100644 --- a/ngraph/test/backend/max.in.cpp +++ b/ngraph/test/backend/max.in.cpp @@ -25,6 +25,8 @@ #include "util/test_control.hpp" #include "util/test_tools.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/test/backend/maximum.in.cpp b/ngraph/test/backend/maximum.in.cpp index ae134e8..e24a1b6 100644 --- a/ngraph/test/backend/maximum.in.cpp +++ b/ngraph/test/backend/maximum.in.cpp @@ -41,6 +41,8 @@ #include "util/test_control.hpp" #include "util/test_tools.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/test/backend/min.in.cpp b/ngraph/test/backend/min.in.cpp index 294ae18..6080e6c 100644 --- a/ngraph/test/backend/min.in.cpp +++ b/ngraph/test/backend/min.in.cpp @@ -25,6 +25,8 @@ #include "util/test_control.hpp" #include "util/test_tools.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/test/backend/minimum.in.cpp b/ngraph/test/backend/minimum.in.cpp index 63eb3de..926babd 100644 --- a/ngraph/test/backend/minimum.in.cpp +++ b/ngraph/test/backend/minimum.in.cpp @@ -41,6 +41,8 @@ #include "util/test_control.hpp" #include "util/test_tools.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/test/backend/multiple_backends.in.cpp b/ngraph/test/backend/multiple_backends.in.cpp index 856010d..e97d756 100644 --- a/ngraph/test/backend/multiple_backends.in.cpp +++ b/ngraph/test/backend/multiple_backends.in.cpp @@ -25,6 +25,8 @@ #include "util/test_control.hpp" #include "util/test_tools.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/test/backend/multiple_result.in.cpp b/ngraph/test/backend/multiple_result.in.cpp index 9fa4a1a..f9128a5 100644 --- a/ngraph/test/backend/multiple_result.in.cpp +++ b/ngraph/test/backend/multiple_result.in.cpp @@ -23,6 +23,8 @@ #include "util/test_control.hpp" #include "util/test_tools.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/test/backend/multiply.in.cpp b/ngraph/test/backend/multiply.in.cpp index afcea21..75bd095 100644 --- a/ngraph/test/backend/multiply.in.cpp +++ b/ngraph/test/backend/multiply.in.cpp @@ -37,6 +37,8 @@ #include "util/test_case.hpp" #include "util/test_control.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/test/backend/node_name.in.cpp b/ngraph/test/backend/node_name.in.cpp index f2c40ac..9424d6f 100644 --- a/ngraph/test/backend/node_name.in.cpp +++ b/ngraph/test/backend/node_name.in.cpp @@ -23,6 +23,8 @@ #include "util/test_control.hpp" #include "util/test_tools.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/test/backend/not.in.cpp b/ngraph/test/backend/not.in.cpp index c7b02eb..7816176 100644 --- a/ngraph/test/backend/not.in.cpp +++ b/ngraph/test/backend/not.in.cpp @@ -37,6 +37,8 @@ #include "util/test_case.hpp" #include "util/test_control.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/test/backend/numeric.in.cpp b/ngraph/test/backend/numeric.in.cpp index 128320e..1977a4d 100644 --- a/ngraph/test/backend/numeric.in.cpp +++ b/ngraph/test/backend/numeric.in.cpp @@ -24,6 +24,8 @@ #include "util/test_control.hpp" #include "util/test_tools.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/test/backend/one_hot.in.cpp b/ngraph/test/backend/one_hot.in.cpp index 124a39d..cb403ce 100644 --- a/ngraph/test/backend/one_hot.in.cpp +++ b/ngraph/test/backend/one_hot.in.cpp @@ -31,6 +31,8 @@ #include "util/test_control.hpp" #include "util/test_tools.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/test/backend/power.in.cpp b/ngraph/test/backend/power.in.cpp index a91bc0b..91ed81d 100644 --- a/ngraph/test/backend/power.in.cpp +++ b/ngraph/test/backend/power.in.cpp @@ -37,6 +37,8 @@ #include "util/test_case.hpp" #include "util/test_control.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/test/backend/product.in.cpp b/ngraph/test/backend/product.in.cpp index 6530286..350dd91 100644 --- a/ngraph/test/backend/product.in.cpp +++ b/ngraph/test/backend/product.in.cpp @@ -23,6 +23,8 @@ #include "util/test_control.hpp" #include "util/test_tools.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/test/backend/quantize_dequantize.in.cpp b/ngraph/test/backend/quantize_dequantize.in.cpp index 324063d..53bdf76 100644 --- a/ngraph/test/backend/quantize_dequantize.in.cpp +++ b/ngraph/test/backend/quantize_dequantize.in.cpp @@ -25,6 +25,8 @@ #include "util/test_control.hpp" #include "util/test_tools.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/test/backend/quantized_convolution.in.cpp b/ngraph/test/backend/quantized_convolution.in.cpp index d5b9bbb..cb16cb6 100644 --- a/ngraph/test/backend/quantized_convolution.in.cpp +++ b/ngraph/test/backend/quantized_convolution.in.cpp @@ -25,6 +25,8 @@ #include "util/test_control.hpp" #include "util/test_tools.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/test/backend/quantized_dot.in.cpp b/ngraph/test/backend/quantized_dot.in.cpp index f70336e..6623ca0 100644 --- a/ngraph/test/backend/quantized_dot.in.cpp +++ b/ngraph/test/backend/quantized_dot.in.cpp @@ -25,6 +25,8 @@ #include "util/test_control.hpp" #include "util/test_tools.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/test/backend/relu.in.cpp b/ngraph/test/backend/relu.in.cpp index f76cfbe..e36f452 100644 --- a/ngraph/test/backend/relu.in.cpp +++ b/ngraph/test/backend/relu.in.cpp @@ -25,6 +25,8 @@ #include "util/test_control.hpp" #include "util/test_tools.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/test/backend/replace_slice.in.cpp b/ngraph/test/backend/replace_slice.in.cpp index 1a12a73..073572a 100644 --- a/ngraph/test/backend/replace_slice.in.cpp +++ b/ngraph/test/backend/replace_slice.in.cpp @@ -24,6 +24,8 @@ #include "util/test_control.hpp" #include "util/test_tools.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/test/backend/reshape.in.cpp b/ngraph/test/backend/reshape.in.cpp index 2517009..e3bb4a1 100644 --- a/ngraph/test/backend/reshape.in.cpp +++ b/ngraph/test/backend/reshape.in.cpp @@ -34,6 +34,8 @@ #include "util/test_control.hpp" #include "util/test_tools.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/test/backend/reverse.in.cpp b/ngraph/test/backend/reverse.in.cpp index 2f9455f..914838b 100644 --- a/ngraph/test/backend/reverse.in.cpp +++ b/ngraph/test/backend/reverse.in.cpp @@ -24,6 +24,8 @@ #include "util/test_control.hpp" #include "util/test_tools.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/test/backend/round.in.cpp b/ngraph/test/backend/round.in.cpp index 04823a5..f23c1ac 100644 --- a/ngraph/test/backend/round.in.cpp +++ b/ngraph/test/backend/round.in.cpp @@ -24,6 +24,8 @@ #include "util/test_control.hpp" #include "util/test_tools.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/test/backend/select.in.cpp b/ngraph/test/backend/select.in.cpp index f6451d3..1affb44 100644 --- a/ngraph/test/backend/select.in.cpp +++ b/ngraph/test/backend/select.in.cpp @@ -24,6 +24,8 @@ #include "util/test_control.hpp" #include "util/test_tools.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/test/backend/slice.in.cpp b/ngraph/test/backend/slice.in.cpp index 5a816b0..cbbb4cb 100644 --- a/ngraph/test/backend/slice.in.cpp +++ b/ngraph/test/backend/slice.in.cpp @@ -24,6 +24,8 @@ #include "util/test_control.hpp" #include "util/test_tools.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/test/backend/softmax.in.cpp b/ngraph/test/backend/softmax.in.cpp index e79bed4..b8698e9 100644 --- a/ngraph/test/backend/softmax.in.cpp +++ b/ngraph/test/backend/softmax.in.cpp @@ -35,6 +35,8 @@ #include "util/test_control.hpp" #include "util/test_tools.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/test/backend/subtract.in.cpp b/ngraph/test/backend/subtract.in.cpp index 3699ed7..4d4b232 100644 --- a/ngraph/test/backend/subtract.in.cpp +++ b/ngraph/test/backend/subtract.in.cpp @@ -41,6 +41,8 @@ #include "util/test_control.hpp" #include "util/test_tools.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/test/backend/sum.in.cpp b/ngraph/test/backend/sum.in.cpp index 0ed5d7a..239a4b0 100644 --- a/ngraph/test/backend/sum.in.cpp +++ b/ngraph/test/backend/sum.in.cpp @@ -35,6 +35,8 @@ static std::mt19937_64 random_generator; +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/test/backend/topk.in.cpp b/ngraph/test/backend/topk.in.cpp index bee6b3c..b275b1d 100644 --- a/ngraph/test/backend/topk.in.cpp +++ b/ngraph/test/backend/topk.in.cpp @@ -33,6 +33,8 @@ #include "util/test_control.hpp" #include "util/test_tools.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/test/backend/validate_call.in.cpp b/ngraph/test/backend/validate_call.in.cpp index 15219ae..97e908c 100644 --- a/ngraph/test/backend/validate_call.in.cpp +++ b/ngraph/test/backend/validate_call.in.cpp @@ -25,6 +25,8 @@ #include "util/test_control.hpp" #include "util/test_tools.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/test/backend/zero_sized.in.cpp b/ngraph/test/backend/zero_sized.in.cpp index f5a08a7..5cb82c1 100644 --- a/ngraph/test/backend/zero_sized.in.cpp +++ b/ngraph/test/backend/zero_sized.in.cpp @@ -25,6 +25,8 @@ #include "util/test_control.hpp" #include "util/test_tools.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/test/backend_debug_api.cpp b/ngraph/test/backend_debug_api.cpp index 0692209..d9172c5 100644 --- a/ngraph/test/backend_debug_api.cpp +++ b/ngraph/test/backend_debug_api.cpp @@ -25,6 +25,8 @@ #include "runtime/interpreter/int_executable.hpp" #include "util/test_tools.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/test/build_graph.cpp b/ngraph/test/build_graph.cpp index 4df43fa..3ed50fc 100644 --- a/ngraph/test/build_graph.cpp +++ b/ngraph/test/build_graph.cpp @@ -21,6 +21,9 @@ #include "util/test_tools.hpp" #include + +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/test/builder_autobroadcast.cpp b/ngraph/test/builder_autobroadcast.cpp index 7c45052..8c8c6e1 100644 --- a/ngraph/test/builder_autobroadcast.cpp +++ b/ngraph/test/builder_autobroadcast.cpp @@ -18,6 +18,8 @@ #include "ngraph/ngraph.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/test/constant_folding.cpp b/ngraph/test/constant_folding.cpp index 99cc1b4..2cc24c9 100644 --- a/ngraph/test/constant_folding.cpp +++ b/ngraph/test/constant_folding.cpp @@ -22,6 +22,8 @@ #include "util/all_close_f.hpp" #include "util/test_tools.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace ngraph; using namespace std; diff --git a/ngraph/test/control_dependencies.cpp b/ngraph/test/control_dependencies.cpp index 8df585a..370df36 100644 --- a/ngraph/test/control_dependencies.cpp +++ b/ngraph/test/control_dependencies.cpp @@ -36,6 +36,8 @@ #include "util/random.hpp" #include "util/test_tools.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace ngraph; using namespace std; diff --git a/ngraph/test/copy.cpp b/ngraph/test/copy.cpp index 386335d..fb3dec4 100644 --- a/ngraph/test/copy.cpp +++ b/ngraph/test/copy.cpp @@ -23,6 +23,8 @@ #include "util/ndarray.hpp" #include "util/test_tools.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/test/eval.cpp b/ngraph/test/eval.cpp index bd67c6e..e32fdcb 100644 --- a/ngraph/test/eval.cpp +++ b/ngraph/test/eval.cpp @@ -74,6 +74,8 @@ #include "util/test_tools.hpp" #include "util/type_prop.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/test/input_output_assign.cpp b/ngraph/test/input_output_assign.cpp index cc67f72..4dac79a 100644 --- a/ngraph/test/input_output_assign.cpp +++ b/ngraph/test/input_output_assign.cpp @@ -19,6 +19,9 @@ #include "ngraph/ngraph.hpp" #include + +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/test/node_input_output.cpp b/ngraph/test/node_input_output.cpp index d6c92da..fdcc98d 100644 --- a/ngraph/test/node_input_output.cpp +++ b/ngraph/test/node_input_output.cpp @@ -23,6 +23,8 @@ #include "ngraph/ngraph.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace ngraph; using namespace std; diff --git a/ngraph/test/onnx/onnx_import.in.cpp b/ngraph/test/onnx/onnx_import.in.cpp index 2d5ad69..6d77219 100644 --- a/ngraph/test/onnx/onnx_import.in.cpp +++ b/ngraph/test/onnx/onnx_import.in.cpp @@ -51,6 +51,8 @@ #include "util/test_tools.hpp" #include "util/type_prop.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace ngraph; static std::string s_manifest = "${MANIFEST}"; diff --git a/ngraph/test/op.cpp b/ngraph/test/op.cpp index 04b383e..4d2bd49 100644 --- a/ngraph/test/op.cpp +++ b/ngraph/test/op.cpp @@ -26,6 +26,8 @@ #include "ngraph/ngraph.hpp" #include "ngraph/variant.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/test/op_is.cpp b/ngraph/test/op_is.cpp index bf35547..01747b2 100644 --- a/ngraph/test/op_is.cpp +++ b/ngraph/test/op_is.cpp @@ -623,15 +623,6 @@ namespace EXPECT_FALSE(op::is_binary_elementwise_logical(&node)); } - void op_is_Passthrough() - { - op::Passthrough node; - EXPECT_FALSE(op::is_unary_elementwise_arithmetic(&node)); - EXPECT_FALSE(op::is_binary_elementwise_arithmetic(&node)); - EXPECT_FALSE(op::is_binary_elementwise_comparison(&node)); - EXPECT_FALSE(op::is_binary_elementwise_logical(&node)); - } - void op_is_Power() { op::Power node; @@ -995,7 +986,9 @@ namespace TEST(op_is, check) { + NGRAPH_SUPPRESS_DEPRECATED_START #define NGRAPH_OP(a, b) op_is_##a(); #include "opset0_tbl.hpp" #undef NGRAPH_OP + NGRAPH_SUPPRESS_DEPRECATED_END } diff --git a/ngraph/test/pass_shape_relevance.cpp b/ngraph/test/pass_shape_relevance.cpp index 6f23d62..18a49da 100644 --- a/ngraph/test/pass_shape_relevance.cpp +++ b/ngraph/test/pass_shape_relevance.cpp @@ -25,6 +25,8 @@ #include "ngraph/pass/manager.hpp" #include "pass/shape_relevance.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace ngraph; using namespace std; diff --git a/ngraph/test/pattern.cpp b/ngraph/test/pattern.cpp index 8828ea0..80069c3 100644 --- a/ngraph/test/pattern.cpp +++ b/ngraph/test/pattern.cpp @@ -47,6 +47,8 @@ #include "util/matcher.hpp" #include "util/test_tools.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace ngraph; using namespace std; diff --git a/ngraph/test/replace_node.cpp b/ngraph/test/replace_node.cpp index 33241b4..8564a1e 100644 --- a/ngraph/test/replace_node.cpp +++ b/ngraph/test/replace_node.cpp @@ -19,6 +19,8 @@ #include "ngraph/ngraph.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/test/runtime/interpreter/int_executable.hpp b/ngraph/test/runtime/interpreter/int_executable.hpp index f1ffc61..04be016 100644 --- a/ngraph/test/runtime/interpreter/int_executable.hpp +++ b/ngraph/test/runtime/interpreter/int_executable.hpp @@ -96,6 +96,8 @@ #include "op/convolution.hpp" #include "op/group_conv.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + namespace ngraph { namespace runtime @@ -1251,7 +1253,6 @@ protected: case OP_TYPEID::LSTMSequence: case OP_TYPEID::MVN: case OP_TYPEID::NormalizeL2: - case OP_TYPEID::Passthrough: case OP_TYPEID::PRelu: case OP_TYPEID::RNNCell: case OP_TYPEID::Selu: @@ -1311,3 +1312,5 @@ protected: } } }; + +NGRAPH_SUPPRESS_DEPRECATED_END diff --git a/ngraph/test/runtime/opset0.hpp b/ngraph/test/runtime/opset0.hpp index 64057b1..727daad 100644 --- a/ngraph/test/runtime/opset0.hpp +++ b/ngraph/test/runtime/opset0.hpp @@ -23,6 +23,7 @@ namespace ngraph { + NGRAPH_SUPPRESS_DEPRECATED_START namespace opset0 { #ifdef NGRAPH_OP @@ -33,4 +34,5 @@ namespace ngraph #undef NGRAPH_OP #endif } + NGRAPH_SUPPRESS_DEPRECATED_END } diff --git a/ngraph/test/runtime/opset0_tbl.hpp b/ngraph/test/runtime/opset0_tbl.hpp index 337232a..6f8610e 100644 --- a/ngraph/test/runtime/opset0_tbl.hpp +++ b/ngraph/test/runtime/opset0_tbl.hpp @@ -112,7 +112,6 @@ NGRAPH_OP(OneHot, ngraph::op) NGRAPH_OP(Or, ngraph::op) NGRAPH_OP(Pad, ngraph::op) NGRAPH_OP(Parameter, ngraph::op) -NGRAPH_OP(Passthrough, ngraph::op) NGRAPH_OP(Power, ngraph::op) NGRAPH_OP(PRelu, ngraph::op) NGRAPH_OP(Product, ngraph::op) diff --git a/ngraph/test/runtime/pass/dyn_elimination.cpp b/ngraph/test/runtime/pass/dyn_elimination.cpp index 2c41b84..2ce39a0 100644 --- a/ngraph/test/runtime/pass/dyn_elimination.cpp +++ b/ngraph/test/runtime/pass/dyn_elimination.cpp @@ -28,6 +28,8 @@ #include "ngraph/runtime/reference/range.hpp" #include "ngraph/slice_plan.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/test/runtime/pass/implicit_broadcast_elimination.cpp b/ngraph/test/runtime/pass/implicit_broadcast_elimination.cpp index 676fcdc..925160f 100644 --- a/ngraph/test/runtime/pass/implicit_broadcast_elimination.cpp +++ b/ngraph/test/runtime/pass/implicit_broadcast_elimination.cpp @@ -23,6 +23,8 @@ #include "ngraph/op/util/binary_elementwise_logical.hpp" #include "ngraph/op/util/op_types.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/test/runtime/pass/like_replacement.cpp b/ngraph/test/runtime/pass/like_replacement.cpp index c7362b6..d6d5e84 100644 --- a/ngraph/test/runtime/pass/like_replacement.cpp +++ b/ngraph/test/runtime/pass/like_replacement.cpp @@ -30,6 +30,8 @@ #include "ngraph/op/sum.hpp" #include "ngraph/util.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/test/runtime/pass/opset0_downgrade.cpp b/ngraph/test/runtime/pass/opset0_downgrade.cpp index dae8374..664f5ee 100644 --- a/ngraph/test/runtime/pass/opset0_downgrade.cpp +++ b/ngraph/test/runtime/pass/opset0_downgrade.cpp @@ -36,6 +36,8 @@ #include "pass/implicit_broadcast_elimination.hpp" #include "pass/opset0_downgrade.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/test/runtime/pass/opset1_upgrade.cpp b/ngraph/test/runtime/pass/opset1_upgrade.cpp index b1366f4..8b20cfb 100644 --- a/ngraph/test/runtime/pass/opset1_upgrade.cpp +++ b/ngraph/test/runtime/pass/opset1_upgrade.cpp @@ -30,6 +30,8 @@ #include "op/convolution.hpp" #include "op/group_conv.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; @@ -536,12 +538,14 @@ namespace DispatchMap& get_dispatch_map() { + NGRAPH_SUPPRESS_DEPRECATED_START static DispatchMap dispatch_map{ #define NGRAPH_OP(NAME, NAMESPACE) {NAMESPACE::NAME::type_info, op_cast_thunk}, #include "opset0_tbl.hpp" #undef NGRAPH_OP }; return dispatch_map; + NGRAPH_SUPPRESS_DEPRECATED_END } } // namespace diff --git a/ngraph/test/specialize_function.cpp b/ngraph/test/specialize_function.cpp index 769e58a..6a8e91c 100644 --- a/ngraph/test/specialize_function.cpp +++ b/ngraph/test/specialize_function.cpp @@ -19,6 +19,8 @@ #include "ngraph/ngraph.hpp" #include "ngraph/specialize_function.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace ngraph; // Simple case: create a function with static parameter shapes and "specialize" them to the same diff --git a/ngraph/test/tensor.cpp b/ngraph/test/tensor.cpp index 0cc9b75..650e5c5 100644 --- a/ngraph/test/tensor.cpp +++ b/ngraph/test/tensor.cpp @@ -27,6 +27,8 @@ #include "pass/liveness.hpp" #include "util/test_tools.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/test/type_prop/any.cpp b/ngraph/test/type_prop/any.cpp index 3ad346d..785548a 100644 --- a/ngraph/test/type_prop/any.cpp +++ b/ngraph/test/type_prop/any.cpp @@ -18,6 +18,8 @@ #include "ngraph/ngraph.hpp" #include "util/type_prop.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/test/type_prop/binary_elementwise.cpp b/ngraph/test/type_prop/binary_elementwise.cpp index 372c32c..564c2e5 100644 --- a/ngraph/test/type_prop/binary_elementwise.cpp +++ b/ngraph/test/type_prop/binary_elementwise.cpp @@ -18,6 +18,8 @@ #include "ngraph/ngraph.hpp" #include "util/type_prop.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/test/type_prop/broadcast.cpp b/ngraph/test/type_prop/broadcast.cpp index e93b7eb..90af443 100644 --- a/ngraph/test/type_prop/broadcast.cpp +++ b/ngraph/test/type_prop/broadcast.cpp @@ -18,6 +18,8 @@ #include "ngraph/ngraph.hpp" #include "util/type_prop.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/test/type_prop/dequantize.cpp b/ngraph/test/type_prop/dequantize.cpp index 75b1bcd..2c55ddb 100644 --- a/ngraph/test/type_prop/dequantize.cpp +++ b/ngraph/test/type_prop/dequantize.cpp @@ -18,6 +18,8 @@ #include "ngraph/ngraph.hpp" #include "util/type_prop.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/test/type_prop/dot.cpp b/ngraph/test/type_prop/dot.cpp index ec733b8..eb2b07f 100644 --- a/ngraph/test/type_prop/dot.cpp +++ b/ngraph/test/type_prop/dot.cpp @@ -18,6 +18,8 @@ #include "ngraph/ngraph.hpp" #include "util/type_prop.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/test/type_prop/gather.cpp b/ngraph/test/type_prop/gather.cpp index 06ece97..de1401c 100644 --- a/ngraph/test/type_prop/gather.cpp +++ b/ngraph/test/type_prop/gather.cpp @@ -18,6 +18,8 @@ #include "ngraph/ngraph.hpp" #include "util/type_prop.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/test/type_prop/gather_nd.cpp b/ngraph/test/type_prop/gather_nd.cpp index 3da1fa0..8fefa9e 100644 --- a/ngraph/test/type_prop/gather_nd.cpp +++ b/ngraph/test/type_prop/gather_nd.cpp @@ -18,6 +18,8 @@ #include "ngraph/ngraph.hpp" #include "util/type_prop.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/test/type_prop/one_hot.cpp b/ngraph/test/type_prop/one_hot.cpp index 59608d1..43aa830 100644 --- a/ngraph/test/type_prop/one_hot.cpp +++ b/ngraph/test/type_prop/one_hot.cpp @@ -18,6 +18,8 @@ #include "ngraph/ngraph.hpp" #include "util/type_prop.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/test/type_prop/pad.cpp b/ngraph/test/type_prop/pad.cpp index e2f32ca..7d38999 100644 --- a/ngraph/test/type_prop/pad.cpp +++ b/ngraph/test/type_prop/pad.cpp @@ -18,6 +18,8 @@ #include "ngraph/ngraph.hpp" #include "util/type_prop.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/test/type_prop/quantize.cpp b/ngraph/test/type_prop/quantize.cpp index 493b840..ee7cfbe 100644 --- a/ngraph/test/type_prop/quantize.cpp +++ b/ngraph/test/type_prop/quantize.cpp @@ -18,6 +18,8 @@ #include "ngraph/ngraph.hpp" #include "util/type_prop.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/test/type_prop/quantized_convolution.cpp b/ngraph/test/type_prop/quantized_convolution.cpp index bc1f581..b0ad9e3 100644 --- a/ngraph/test/type_prop/quantized_convolution.cpp +++ b/ngraph/test/type_prop/quantized_convolution.cpp @@ -18,6 +18,8 @@ #include "ngraph/ngraph.hpp" #include "util/type_prop.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/test/type_prop/quantized_dot.cpp b/ngraph/test/type_prop/quantized_dot.cpp index fdab219..bbd139f 100644 --- a/ngraph/test/type_prop/quantized_dot.cpp +++ b/ngraph/test/type_prop/quantized_dot.cpp @@ -18,6 +18,8 @@ #include "ngraph/ngraph.hpp" #include "util/type_prop.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/test/type_prop/replace_slice.cpp b/ngraph/test/type_prop/replace_slice.cpp index 92c0fef..b236104 100644 --- a/ngraph/test/type_prop/replace_slice.cpp +++ b/ngraph/test/type_prop/replace_slice.cpp @@ -18,6 +18,8 @@ #include "ngraph/ngraph.hpp" #include "util/type_prop.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/test/type_prop/reshape.cpp b/ngraph/test/type_prop/reshape.cpp index 40cb9c3..a689ac4 100644 --- a/ngraph/test/type_prop/reshape.cpp +++ b/ngraph/test/type_prop/reshape.cpp @@ -18,6 +18,8 @@ #include "ngraph/ngraph.hpp" #include "util/type_prop.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/test/type_prop/reverse.cpp b/ngraph/test/type_prop/reverse.cpp index 51edd41..1213654 100644 --- a/ngraph/test/type_prop/reverse.cpp +++ b/ngraph/test/type_prop/reverse.cpp @@ -18,6 +18,8 @@ #include "ngraph/ngraph.hpp" #include "util/type_prop.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/test/type_prop/select.cpp b/ngraph/test/type_prop/select.cpp index 46611f9..e70cff0 100644 --- a/ngraph/test/type_prop/select.cpp +++ b/ngraph/test/type_prop/select.cpp @@ -18,6 +18,8 @@ #include "ngraph/ngraph.hpp" #include "util/type_prop.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/test/type_prop/slice.cpp b/ngraph/test/type_prop/slice.cpp index 139c690..b18e8da 100644 --- a/ngraph/test/type_prop/slice.cpp +++ b/ngraph/test/type_prop/slice.cpp @@ -18,6 +18,8 @@ #include "ngraph/ngraph.hpp" #include "util/type_prop.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/test/type_prop/split.cpp b/ngraph/test/type_prop/split.cpp index 2f5cbef..5c0e4a6 100644 --- a/ngraph/test/type_prop/split.cpp +++ b/ngraph/test/type_prop/split.cpp @@ -18,6 +18,8 @@ #include "ngraph/ngraph.hpp" #include "util/type_prop.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/test/type_prop/sum.cpp b/ngraph/test/type_prop/sum.cpp index b637c9a..4e1ca95 100644 --- a/ngraph/test/type_prop/sum.cpp +++ b/ngraph/test/type_prop/sum.cpp @@ -18,6 +18,8 @@ #include "ngraph/ngraph.hpp" #include "util/type_prop.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/test/type_prop/top_k.cpp b/ngraph/test/type_prop/top_k.cpp index bbe1e9a..a9a9964 100644 --- a/ngraph/test/type_prop/top_k.cpp +++ b/ngraph/test/type_prop/top_k.cpp @@ -18,6 +18,8 @@ #include "ngraph/ngraph.hpp" #include "util/type_prop.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/test/util.cpp b/ngraph/test/util.cpp index 563d095..5dea007 100644 --- a/ngraph/test/util.cpp +++ b/ngraph/test/util.cpp @@ -31,6 +31,8 @@ #include "util/all_close.hpp" #include "util/ndarray.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; diff --git a/ngraph/test/util/test_tools.cpp b/ngraph/test/util/test_tools.cpp index 2887b78..89f951c 100644 --- a/ngraph/test/util/test_tools.cpp +++ b/ngraph/test/util/test_tools.cpp @@ -20,6 +20,8 @@ #include "ngraph/util.hpp" #include "test_tools.hpp" +NGRAPH_SUPPRESS_DEPRECATED_START + using namespace std; using namespace ngraph; -- 2.7.4