diff --git a/src/core/include/openvino/op/ceiling.hpp b/src/core/include/openvino/op/ceiling.hpp index d22b8ad5b16..b372e3d1887 100644 --- a/src/core/include/openvino/op/ceiling.hpp +++ b/src/core/include/openvino/op/ceiling.hpp @@ -25,9 +25,7 @@ public: return true; } 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/ceiling.hpp b/src/core/reference/include/openvino/reference/ceiling.hpp index e6aafae44f3..69553d470b1 100644 --- a/src/core/reference/include/openvino/reference/ceiling.hpp +++ b/src/core/reference/include/openvino/reference/ceiling.hpp @@ -7,13 +7,36 @@ #include #include +#include "openvino/reference/copy.hpp" +#include "openvino/reference/utils/type_util.hpp" + namespace ov { namespace reference { -template -void ceiling(const T* arg, T* out, size_t count) { - for (size_t i = 0; i < count; i++) { - out[i] = static_cast(std::ceil(arg[i])); - } + +/** + * @brief Reference implementation of Ceiling operator (integral types). + * + * @param arg Input pointer to data. + * @param out Output pointer to results. + * @param count Number of elements in input buffer. + */ +template ::value>::type* = nullptr> +void ceiling(const T* arg, T* out, const size_t count) { + copy(arg, out, count); +} + +/** + * @brief Reference implementation of Ceiling operator (floating point types). + * + * @param arg Input pointer to data. + * @param out Output pointer to results. + * @param count Number of elements in input buffer. + */ +template ()>::type* = nullptr> +void ceiling(const T* arg, T* out, const size_t count) { + std::transform(arg, std::next(arg, count), out, [](const T v) { + return std::ceil(v); + }); } } // namespace reference } // namespace ov diff --git a/src/core/reference/include/openvino/reference/copy.hpp b/src/core/reference/include/openvino/reference/copy.hpp index 3e3d4910584..245489ad616 100644 --- a/src/core/reference/include/openvino/reference/copy.hpp +++ b/src/core/reference/include/openvino/reference/copy.hpp @@ -4,15 +4,13 @@ #pragma once -#include +#include namespace ov { namespace reference { template void copy(const T* arg, T* out, size_t count) { - for (size_t i = 0; i < count; i++) { - out[i] = arg[i]; - } + std::copy_n(arg, count, out); } } // namespace reference } // namespace ov diff --git a/src/core/src/op/ceiling.cpp b/src/core/src/op/ceiling.cpp index 29a36600f2d..8b8f9e96f25 100644 --- a/src/core/src/op/ceiling.cpp +++ b/src/core/src/op/ceiling.cpp @@ -2,91 +2,72 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "ngraph/op/ceiling.hpp" +#include "openvino/op/ceiling.hpp" +#include "element_visitor.hpp" #include "itt.hpp" -#include "ngraph/op/util/eval_copy.hpp" -#include "ngraph/runtime/host_tensor.hpp" -#include "ngraph/validation_util.hpp" +#include "openvino/core/validation_util.hpp" #include "openvino/reference/ceiling.hpp" -#include "openvino/reference/copy.hpp" -using namespace std; -using namespace ngraph; +namespace ov { +namespace op { +namespace ceiling { -op::Ceiling::Ceiling(const Output& arg) : UnaryElementwiseArithmetic(arg) { +struct Evaluate : element::NoAction { + using element::NoAction::visit; + + template + static result_type visit(const Tensor& arg0, Tensor& out, const size_t count) { + using T = typename element_type_traits::value_type; + reference::ceiling(arg0.data(), out.data(), count); + return true; + } +}; +} // namespace ceiling + +namespace v0 { +Ceiling::Ceiling(const Output& arg) : UnaryElementwiseArithmetic(arg) { constructor_validate_and_infer_types(); } -shared_ptr op::Ceiling::clone_with_new_inputs(const OutputVector& new_args) const { +std::shared_ptr Ceiling::clone_with_new_inputs(const OutputVector& new_args) const { OV_OP_SCOPE(v0_Ceiling_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 ceiling { -namespace { -// function used by TYPE_CASE -template -inline bool evaluate(const HostTensorPtr& arg0, const HostTensorPtr& out, const size_t count) { - using T = typename element_type_traits::value_type; - ov::reference::ceiling(arg0->get_data_ptr(), out->get_data_ptr(), count); - return true; -} - -// function used by COPY_TENSOR -template -inline bool copy_tensor(const HostTensorPtr& arg0, const HostTensorPtr& out, const size_t count) { - ov::reference::copy(arg0->get_data_ptr(), out->get_data_ptr(), count); - return true; -} - -bool evaluate_ceiling(const HostTensorPtr& arg0, const HostTensorPtr& out, const size_t count) { - bool rc = true; - out->set_unary(arg0); - - switch (arg0->get_element_type()) { - NGRAPH_COPY_TENSOR(evaluate_ceiling, i8, arg0, out, count); - NGRAPH_COPY_TENSOR(evaluate_ceiling, i16, arg0, out, count); - NGRAPH_COPY_TENSOR(evaluate_ceiling, i32, arg0, out, count); - NGRAPH_COPY_TENSOR(evaluate_ceiling, i64, arg0, out, count); - NGRAPH_COPY_TENSOR(evaluate_ceiling, u8, arg0, out, count); - NGRAPH_COPY_TENSOR(evaluate_ceiling, u16, arg0, out, count); - NGRAPH_COPY_TENSOR(evaluate_ceiling, u32, arg0, out, count); - NGRAPH_COPY_TENSOR(evaluate_ceiling, u64, arg0, out, count); - NGRAPH_TYPE_CASE(evaluate_ceiling, f16, arg0, out, count); - NGRAPH_TYPE_CASE(evaluate_ceiling, f32, arg0, out, count); - default: - rc = false; - break; - } - return rc; -} -} // namespace -} // namespace ceiling - -bool op::Ceiling::evaluate(const HostTensorVector& outputs, const HostTensorVector& inputs) const { +bool Ceiling::evaluate(TensorVector& outputs, const TensorVector& inputs) const { OV_OP_SCOPE(v0_Ceiling_evaluate); - return ceiling::evaluate_ceiling(inputs[0], outputs[0], shape_size(inputs[0]->get_shape())); + OPENVINO_ASSERT(outputs.size() == 1); + OPENVINO_ASSERT(inputs.size() == 1); + + outputs[0].set_shape(inputs[0].get_shape()); + + using namespace ov::element; + return IfTypeOf::apply( + inputs[0].get_element_type(), + inputs[0], + outputs[0], + shape_size(inputs[0].get_shape())); } -bool op::Ceiling::has_evaluate() const { +bool Ceiling::has_evaluate() const { OV_OP_SCOPE(v0_Ceiling_has_evaluate); switch (get_input_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::f16: - case ngraph::element::f32: + case element::i8: + case element::i16: + case element::i32: + case element::i64: + case element::u8: + case element::u16: + case element::u32: + case element::u64: + case element::f32: return true; default: - break; + return false; } - return false; } +} // namespace v0 +} // namespace op +} // namespace ov