diff --git a/ngraph/core/include/ngraph/op/multiply.hpp b/ngraph/core/include/ngraph/op/multiply.hpp index d6e83f5175a0c6..b20e10959b8eeb 100644 --- a/ngraph/core/include/ngraph/op/multiply.hpp +++ b/ngraph/core/include/ngraph/op/multiply.hpp @@ -22,41 +22,6 @@ namespace ngraph { namespace op { - namespace v0 - { - /// \brief Elementwise multiplication operation. - 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; } - /// \brief Constructs a multiplication operation. - Multiply() - : util::BinaryElementwiseArithmetic(AutoBroadcastSpec::NONE) - { - } - /// \brief Constructs a multiplication operation. - /// - /// \param arg0 Node that produces the first input tensor. - /// \param arg1 Node that produces the second input tensor. - /// \param auto_broadcast Auto broadcast specification - Multiply(const Output& arg0, - const Output& arg1, - const AutoBroadcastSpec& auto_broadcast = AutoBroadcastSpec()); - - virtual std::shared_ptr - 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 - namespace v1 { /// \brief Elementwise multiplication operation. diff --git a/ngraph/core/src/op/multiply.cpp b/ngraph/core/src/op/multiply.cpp index c7942b8a3d0348..13dbd192dacbf9 100644 --- a/ngraph/core/src/op/multiply.cpp +++ b/ngraph/core/src/op/multiply.cpp @@ -19,8 +19,6 @@ #include "ngraph/runtime/host_tensor.hpp" #include "ngraph/runtime/reference/multiply.hpp" -NGRAPH_SUPPRESS_DEPRECATED_START - using namespace std; using namespace ngraph; @@ -63,32 +61,6 @@ namespace multiplyop } } -// ------------------------------------ v0 ------------------------------------- - -constexpr NodeTypeInfo op::v0::Multiply::type_info; - -op::v0::Multiply::Multiply(const Output& arg0, - const Output& arg1, - const AutoBroadcastSpec& auto_broadcast) - : BinaryElementwiseArithmetic(arg0, arg1, auto_broadcast) -{ - constructor_validate_and_infer_types(); -} - -shared_ptr op::v0::Multiply::clone_with_new_inputs(const OutputVector& new_args) const -{ - NGRAPH_OP_SCOPE(v0_Multiply_clone_with_new_inputs); - check_new_args_count(this, new_args); - return make_shared(new_args.at(0), new_args.at(1), this->get_autob()); -} - -bool op::v0::Multiply::evaluate(const HostTensorVector& outputs, - const HostTensorVector& inputs) const -{ - NGRAPH_OP_SCOPE(v0_Multiply_evaluate); - return multiplyop::evaluate_multiply(inputs[0], inputs[1], outputs[0], get_autob()); -} - // ------------------------------------ v1 ------------------------------------- NGRAPH_RTTI_DEFINITION(op::v1::Multiply, "Multiply", 1, util::BinaryElementwiseArithmetic); diff --git a/ngraph/test/op_is.cpp b/ngraph/test/op_is.cpp index 64b85fa95fe23d..2665d4afb2668a 100644 --- a/ngraph/test/op_is.cpp +++ b/ngraph/test/op_is.cpp @@ -407,15 +407,6 @@ namespace EXPECT_FALSE(op::is_binary_elementwise_logical(&node)); } - void op_is_Multiply() - { - op::v0::Multiply node; - EXPECT_FALSE(op::is_unary_elementwise_arithmetic(&node)); - EXPECT_TRUE(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_NormalizeL2() { op::NormalizeL2 node; diff --git a/ngraph/test/runtime/opset0_tbl.hpp b/ngraph/test/runtime/opset0_tbl.hpp index 3e627eada76e4c..724131c84c0dd6 100644 --- a/ngraph/test/runtime/opset0_tbl.hpp +++ b/ngraph/test/runtime/opset0_tbl.hpp @@ -84,7 +84,6 @@ NGRAPH_OP(Log, ngraph::op) NGRAPH_OP(LRN, ngraph::op) NGRAPH_OP(LSTMSequence, ngraph::op::v0) NGRAPH_OP(MatMul, ngraph::op) -NGRAPH_OP(Multiply, ngraph::op::v0) NGRAPH_OP(MVN, ngraph::op) NGRAPH_OP(Negative, ngraph::op) NGRAPH_OP(NormalizeL2, ngraph::op) diff --git a/ngraph/test/runtime/pass/opset1_upgrade.cpp b/ngraph/test/runtime/pass/opset1_upgrade.cpp index f0fd7b66298110..9843ade5bf5dd4 100644 --- a/ngraph/test/runtime/pass/opset1_upgrade.cpp +++ b/ngraph/test/runtime/pass/opset1_upgrade.cpp @@ -49,11 +49,6 @@ namespace opset1_upgrade // Default is that we didn nothing shared_ptr op_cast(shared_ptr node) { return nullptr; } - shared_ptr op_cast(shared_ptr node) - { - return op_cast_binary_elementwise_node(node); - } - shared_ptr op_cast(shared_ptr node) { auto data_batch_shape = node->get_data_batch_shape();