From dcdf6750a748d51b61757790d89d2a057530ed3b Mon Sep 17 00:00:00 2001 From: Pawel Raasz Date: Tue, 7 Nov 2023 08:31:04 +0100 Subject: [PATCH] [core]Migrate Sign operator to new API (#20875) * Migrate Sign operator to new API * Optimize Sign reference implementation * Fix code style --- src/core/include/openvino/op/sign.hpp | 5 +- .../include/openvino/reference/sign.hpp | 26 ++++- src/core/src/op/sign.cpp | 100 ++++++++---------- 3 files changed, 67 insertions(+), 64 deletions(-) diff --git a/src/core/include/openvino/op/sign.hpp b/src/core/include/openvino/op/sign.hpp index 841f54c359d..b2f4e1305ab 100644 --- a/src/core/include/openvino/op/sign.hpp +++ b/src/core/include/openvino/op/sign.hpp @@ -22,11 +22,8 @@ public: /// \param arg Node that produces the input tensor. Sign(const Output& arg); - bool visit_attributes(AttributeVisitor& visitor) override; std::shared_ptr clone_with_new_inputs(const OutputVector& new_args) const override; - OPENVINO_SUPPRESS_DEPRECATED_START - bool evaluate(const HostTensorVector& outputs, const HostTensorVector& inputs) const override; - OPENVINO_SUPPRESS_DEPRECATED_END + bool evaluate(TensorVector& outputs, const TensorVector& inputs) const override; bool has_evaluate() const override; }; } // namespace v0 diff --git a/src/core/reference/include/openvino/reference/sign.hpp b/src/core/reference/include/openvino/reference/sign.hpp index 5666eb5ebf4..6363a725164 100644 --- a/src/core/reference/include/openvino/reference/sign.hpp +++ b/src/core/reference/include/openvino/reference/sign.hpp @@ -4,15 +4,35 @@ #pragma once +#include #include +#include "openvino/reference/utils/type_util.hpp" + namespace ov { namespace reference { +namespace func { +template ::value>::type* = nullptr> +constexpr T sign(const T v) { + return static_cast(static_cast(v)); +} + +template () || std::is_signed::value>::type* = nullptr> +constexpr T sign(const T v) { + return static_cast((T{0} < v) - (v < T{0})); +} +} // namespace func + +/** + * @brief Reference implementation of Sign operator. + * + * @param arg Pointer to input data. + * @param out Pointer to output data. + * @param count Number of elements in input buffer. + */ template void sign(const T* arg, T* out, size_t count) { - for (size_t i = 0; i < count; i++) { - out[i] = (arg[i] < T(0) ? T(-1) : (arg[i] > T(0) ? T(1) : T(0))); - } + std::transform(arg, arg + count, out, func::sign); } } // namespace reference } // namespace ov diff --git a/src/core/src/op/sign.cpp b/src/core/src/op/sign.cpp index 9e22a7f75d4..f22798bfcdc 100644 --- a/src/core/src/op/sign.cpp +++ b/src/core/src/op/sign.cpp @@ -2,81 +2,67 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "ngraph/op/sign.hpp" +#include "openvino/op/sign.hpp" +#include "element_visitor.hpp" #include "itt.hpp" -#include "ngraph/runtime/host_tensor.hpp" -#include "ngraph/validation_util.hpp" #include "openvino/reference/sign.hpp" -using namespace std; -using namespace ngraph; +namespace ov { +namespace op { -op::Sign::Sign(const Output& arg) : UnaryElementwiseArithmetic(arg) { +namespace sign { +struct Evaluate : element::NoAction { + using element::NoAction::visit; + + template > + static result_type visit(const Tensor& arg, Tensor& out, const size_t count) { + reference::sign(arg.data(), out.data(), count); + return true; + } +}; +} // namespace sign +namespace v0 { + +Sign::Sign(const Output& arg) : UnaryElementwiseArithmetic(arg) { constructor_validate_and_infer_types(); } -bool ngraph::op::v0::Sign::visit_attributes(AttributeVisitor& visitor) { - OV_OP_SCOPE(v0_Sign_visit_attributes); - return true; -} - -shared_ptr op::Sign::clone_with_new_inputs(const OutputVector& new_args) const { +std::shared_ptr Sign::clone_with_new_inputs(const OutputVector& new_args) const { OV_OP_SCOPE(v0_Sign_clone_with_new_inputs); check_new_args_count(this, new_args); - return make_shared(new_args.at(0)); + return std::make_shared(new_args.at(0)); } -OPENVINO_SUPPRESS_DEPRECATED_START -namespace signop { -namespace { -template -inline bool evaluate(const HostTensorPtr& arg0, const HostTensorPtr& out, const size_t count) { - using T = typename element_type_traits::value_type; - ov::reference::sign(arg0->get_data_ptr(), out->get_data_ptr(), count); - return true; -} - -bool evaluate_sign(const HostTensorPtr& arg0, const HostTensorPtr& out, const size_t count) { - bool rc = true; - out->set_unary(arg0); - - switch (arg0->get_element_type()) { - OPENVINO_TYPE_CASE(evaluate_sign, i32, arg0, out, count); - OPENVINO_TYPE_CASE(evaluate_sign, i64, arg0, out, count); - OPENVINO_TYPE_CASE(evaluate_sign, u32, arg0, out, count); - OPENVINO_TYPE_CASE(evaluate_sign, u64, arg0, out, count); - OPENVINO_TYPE_CASE(evaluate_sign, f16, arg0, out, count); - OPENVINO_TYPE_CASE(evaluate_sign, f32, arg0, out, count); - default: - rc = false; - break; - } - return rc; -} -} // namespace -} // namespace signop - -bool op::Sign::evaluate(const HostTensorVector& outputs, const HostTensorVector& inputs) const { +bool Sign::evaluate(TensorVector& outputs, const TensorVector& inputs) const { OV_OP_SCOPE(v0_Sign_evaluate); - OPENVINO_SUPPRESS_DEPRECATED_START - OPENVINO_ASSERT(validate_host_tensor_vector(outputs, 1) && validate_host_tensor_vector(inputs, 1)); - OPENVINO_SUPPRESS_DEPRECATED_END - return signop::evaluate_sign(inputs[0], outputs[0], shape_size(inputs[0]->get_shape())); + OPENVINO_ASSERT(outputs.size() == 1); + OPENVINO_ASSERT(inputs.size() == 1); + + const auto& in_shape = inputs[0].get_shape(); + outputs[0].set_shape(in_shape); + + using namespace ov::element; + return IfTypeOf::apply(inputs[0].get_element_type(), + inputs[0], + outputs[0], + shape_size(in_shape)); } -bool op::Sign::has_evaluate() const { +bool Sign::has_evaluate() const { OV_OP_SCOPE(v0_Sign_has_evaluate); switch (get_input_element_type(0)) { - case ngraph::element::i32: - case ngraph::element::i64: - case ngraph::element::u32: - case ngraph::element::u64: - case ngraph::element::f16: - case ngraph::element::f32: + case element::f16: + case element::f32: + case element::i32: + case element::i64: + case element::u32: + case element::u64: return true; default: - break; + return false; } - return false; } +} // namespace v0 +} // namespace op +} // namespace ov