From 51a3a02115020ba383aa28a2fe8c894e44d2dd81 Mon Sep 17 00:00:00 2001 From: Xuejun Zhai Date: Wed, 1 Mar 2023 11:43:48 +0800 Subject: [PATCH] Xuejun/remove api result related (#15806) * [Remove APIs] remove api Result(const Output& arg, bool), set_needs_default_layout(bool) & needs_default_layout() Signed-off-by: Zhai, Xuejun * [Remove APIs] remove const AutoBroadcastSpec NUMPY & NONE Signed-off-by: Zhai, Xuejun * [Remove APIs] clear code Signed-off-by: Zhai, Xuejun --------- Signed-off-by: Zhai, Xuejun --- src/core/include/openvino/op/result.hpp | 10 ---------- src/core/include/openvino/op/util/attr_types.hpp | 4 ---- src/core/src/op/result.cpp | 4 ---- src/core/src/op/util/attr_types.cpp | 3 --- 4 files changed, 21 deletions(-) diff --git a/src/core/include/openvino/op/result.hpp b/src/core/include/openvino/op/result.hpp index e84e8f270fb..43fd2368803 100644 --- a/src/core/include/openvino/op/result.hpp +++ b/src/core/include/openvino/op/result.hpp @@ -24,21 +24,11 @@ public: /// \param arg Node that produces the input tensor. Result(const Output& arg); - OPENVINO_DEPRECATED("This constructor is redundant, use Result(const Output& arg) instead.") - Result(const Output& arg, bool); - bool visit_attributes(AttributeVisitor& visitor) override; void validate_and_infer_types() override; std::shared_ptr clone_with_new_inputs(const OutputVector& new_args) const override; - OPENVINO_DEPRECATED("This method provides no usage and has no replacement.") - void set_needs_default_layout(bool) {} - OPENVINO_DEPRECATED("This method provides no usage and has no replacement.") - bool needs_default_layout() const { - return false; - } - OPENVINO_SUPPRESS_DEPRECATED_START bool evaluate(const HostTensorVector& outputs, const HostTensorVector& inputs) const override; OPENVINO_SUPPRESS_DEPRECATED_END diff --git a/src/core/include/openvino/op/util/attr_types.hpp b/src/core/include/openvino/op/util/attr_types.hpp index 3e1da68e787..5c716e45861 100644 --- a/src/core/include/openvino/op/util/attr_types.hpp +++ b/src/core/include/openvino/op/util/attr_types.hpp @@ -170,10 +170,6 @@ struct OPENVINO_API AutoBroadcastSpec { bool operator!=(const AutoBroadcastSpec& a) const { return !(*this == a); } - OPENVINO_DEPRECATED("Use ov::op::AutoBroadcastType::NUMPY") - static const AutoBroadcastSpec NUMPY; - OPENVINO_DEPRECATED("Use ov::op::AutoBroadcastType::NONE") - static const AutoBroadcastSpec NONE; private: AutoBroadcastType type_from_string(const std::string& type) const; diff --git a/src/core/src/op/result.cpp b/src/core/src/op/result.cpp index 5e8b347ec87..1354615cca6 100644 --- a/src/core/src/op/result.cpp +++ b/src/core/src/op/result.cpp @@ -19,10 +19,6 @@ op::Result::Result(const Output& arg) : Op({arg}) { constructor_validate_and_infer_types(); } -op::Result::Result(const Output& arg, bool) : Op({arg}) { - constructor_validate_and_infer_types(); -} - bool ngraph::op::v0::Result::visit_attributes(AttributeVisitor& visitor) { OV_OP_SCOPE(v0_Result_visit_attributes); return true; diff --git a/src/core/src/op/util/attr_types.cpp b/src/core/src/op/util/attr_types.cpp index b9cdaafaed8..3a4f1f33ec1 100644 --- a/src/core/src/op/util/attr_types.cpp +++ b/src/core/src/op/util/attr_types.cpp @@ -122,9 +122,6 @@ NGRAPH_API EnumNames& EnumNames