From afbf8461ed38f20dabd2623734e3aff3989c0935 Mon Sep 17 00:00:00 2001 From: Tomasz Jankowski Date: Wed, 22 Nov 2023 21:57:31 +0100 Subject: [PATCH] Drop legacy stuff --- src/core/src/op/select.cpp | 86 ++++++++++++++++++++------------------ 1 file changed, 45 insertions(+), 41 deletions(-) diff --git a/src/core/src/op/select.cpp b/src/core/src/op/select.cpp index 106d0f3b967..27176394e46 100644 --- a/src/core/src/op/select.cpp +++ b/src/core/src/op/select.cpp @@ -2,30 +2,32 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "ngraph/op/select.hpp" +#include "openvino/op/select.hpp" #include #include "bound_evaluate.hpp" #include "itt.hpp" -#include "ngraph/attribute_visitor.hpp" -#include "ngraph/validation_util.hpp" +#include "ngraph/validation_util.hpp" // tbr +#include "openvino/core/attribute_visitor.hpp" #include "openvino/reference/select.hpp" #include "select_shape_inference.hpp" -using namespace std; using namespace ngraph; -op::v1::Select::Select(const Output& arg0, - const Output& arg1, - const Output& arg2, - const AutoBroadcastSpec& auto_broadcast) +namespace ov { +namespace op { +namespace v1 { +Select::Select(const Output& arg0, + const Output& arg1, + const Output& arg2, + const AutoBroadcastSpec& auto_broadcast) : Op({arg0, arg1, arg2}), m_auto_broadcast(auto_broadcast) { constructor_validate_and_infer_types(); } -void op::v1::Select::validate_and_infer_types() { +void Select::validate_and_infer_types() { OV_OP_SCOPE(v1_Select_validate_and_infer_types); // Condition element type check NODE_VALIDATION_CHECK(this, @@ -47,13 +49,13 @@ void op::v1::Select::validate_and_infer_types() { set_output_type(0, result_et, output_shapes[0]); } -shared_ptr op::v1::Select::clone_with_new_inputs(const OutputVector& new_args) const { +std::shared_ptr Select::clone_with_new_inputs(const OutputVector& new_args) const { OV_OP_SCOPE(v1_Select_clone_with_new_inputs); check_new_args_count(this, new_args); - return make_shared(new_args.at(0), new_args.at(1), new_args.at(2), m_auto_broadcast); + return std::make_shared(new_args.at(0), new_args.at(1), new_args.at(2), m_auto_broadcast); } -bool op::v1::Select::visit_attributes(AttributeVisitor& visitor) { +bool Select::visit_attributes(AttributeVisitor& visitor) { OV_OP_SCOPE(v1_Select_visit_attributes); visitor.on_attribute("auto_broadcast", m_auto_broadcast); return true; @@ -65,7 +67,7 @@ namespace { template bool evaluate(const HostTensorVector& output_values, const HostTensorVector& input_values, - const op::AutoBroadcastSpec& autob) { + const AutoBroadcastSpec& autob) { using T = typename element_type_traits::value_type; const auto& in_cond = input_values[0]; @@ -74,20 +76,20 @@ bool evaluate(const HostTensorVector& output_values, const auto& out = output_values[0]; - ov::reference::select(in_cond->get_data_ptr(), - in_then->get_data_ptr(), - in_else->get_data_ptr(), - out->get_data_ptr(), - in_cond->get_shape(), - in_then->get_shape(), - in_else->get_shape(), - autob); + reference::select(in_cond->get_data_ptr(), + in_then->get_data_ptr(), + in_else->get_data_ptr(), + out->get_data_ptr(), + in_cond->get_shape(), + in_then->get_shape(), + in_else->get_shape(), + autob); return true; } bool evaluate_select(const HostTensorVector& output_values, const HostTensorVector& input_values, - const op::AutoBroadcastSpec& autob, + const AutoBroadcastSpec& autob, const element::Type_t& et) { bool rc = false; @@ -115,7 +117,7 @@ bool evaluate_select(const HostTensorVector& output_values, } // namespace } // namespace detail -bool op::v1::Select::evaluate(const HostTensorVector& output_values, const HostTensorVector& input_values) const { +bool Select::evaluate(const HostTensorVector& output_values, const HostTensorVector& input_values) const { OV_OP_SCOPE(v1_Select_evaluate); OPENVINO_SUPPRESS_DEPRECATED_START OPENVINO_ASSERT(validate_host_tensor_vector(input_values, 3)); @@ -125,33 +127,35 @@ bool op::v1::Select::evaluate(const HostTensorVector& output_values, const HostT return detail::evaluate_select(output_values, input_values, autob, output_values[0]->get_element_type()); } -bool op::v1::Select::evaluate_lower(ov::TensorVector& output_values) const { +bool Select::evaluate_lower(TensorVector& output_values) const { return get_input_tensor(0).has_and_set_bound() && default_lower_bound_evaluator(this, output_values); } -bool op::v1::Select::evaluate_upper(ov::TensorVector& output_values) const { +bool Select::evaluate_upper(TensorVector& output_values) const { return get_input_tensor(0).has_and_set_bound() && default_upper_bound_evaluator(this, output_values); } -bool op::v1::Select::has_evaluate() const { +bool Select::has_evaluate() const { OV_OP_SCOPE(v1_Select_has_evaluate); switch (get_output_element_type(0)) { - case ngraph::element::i8: - case ngraph::element::i16: - case ngraph::element::i32: - case ngraph::element::i64: - case ngraph::element::u8: - case ngraph::element::u16: - case ngraph::element::u32: - case ngraph::element::u64: - case ngraph::element::bf16: - case ngraph::element::f16: - case ngraph::element::f32: - case ngraph::element::f64: - case ngraph::element::boolean: + case element::boolean: + case element::bf16: + case element::f16: + case element::f32: + case element::f64: + case element::i8: + case element::i16: + case element::i32: + case element::i64: + case element::u8: + case element::u16: + case element::u32: + case element::u64: return true; default: - break; + return false; } - return false; } +} // namespace v1 +} // namespace op +} // namespace ov