From eba2410411c0abb4050d395f481a8d9d7ed2e4b7 Mon Sep 17 00:00:00 2001 From: Katarzyna Mitrus Date: Mon, 24 May 2021 19:05:29 +0200 Subject: [PATCH] Remove deprecated legacy transpose ref function (#5765) --- .../ngraph/runtime/reference/transpose.hpp | 44 ------------------- ngraph/test/op_eval/transpose.cpp | 12 +---- 2 files changed, 2 insertions(+), 54 deletions(-) diff --git a/ngraph/core/reference/include/ngraph/runtime/reference/transpose.hpp b/ngraph/core/reference/include/ngraph/runtime/reference/transpose.hpp index 82dd4075546..669547dd4b9 100644 --- a/ngraph/core/reference/include/ngraph/runtime/reference/transpose.hpp +++ b/ngraph/core/reference/include/ngraph/runtime/reference/transpose.hpp @@ -31,50 +31,6 @@ namespace ngraph runtime::opt_kernel::reshape( data, out, data_shape, axis_vector, out_shape, element_size); } - - // Legacy function template to ensure backward compatibility - // Can be removed after ARM plugin start using evaluate or no template function - template - NGRAPH_DEPRECATED( - "Traspose function with template types is deprecated, use function with char* " - "args.") - void transpose(const T* arg, T* out, Shape arg_shape, const U* axes_order = nullptr) - { - std::vector converted_axes_order(arg_shape.size()); - if (axes_order == nullptr) - { - std::iota(converted_axes_order.begin(), converted_axes_order.end(), 0); - std::reverse(converted_axes_order.begin(), converted_axes_order.end()); - } - else - { - for (size_t i = 0; i < converted_axes_order.size(); ++i) - { - converted_axes_order[i] = static_cast(axes_order[i]); - } - } - Shape output_shape(arg_shape.size()); - std::transform( - converted_axes_order.begin(), - converted_axes_order.end(), - output_shape.begin(), - [&](const int64_t& v) { - NGRAPH_CHECK(v >= 0, - "Negative values for transpose axes order are not supported."); - NGRAPH_CHECK(v < int64_t(arg_shape.size()), - "Transpose axis ", - v, - " is out of shape range."); - return arg_shape[v]; - }); - - transpose(reinterpret_cast(arg), - reinterpret_cast(out), - arg_shape, - sizeof(T), - converted_axes_order.data(), - output_shape); - } } // namespace reference } // namespace runtime } // namespace ngraph diff --git a/ngraph/test/op_eval/transpose.cpp b/ngraph/test/op_eval/transpose.cpp index addf68ed10a..d05c03d75b5 100644 --- a/ngraph/test/op_eval/transpose.cpp +++ b/ngraph/test/op_eval/transpose.cpp @@ -34,7 +34,7 @@ void test_tranpose_eval(shared_ptr fun) std::vector> expected_results{ {1, 2, 3, 4, 5, 6}, {1, 4, 2, 5, 3, 6}, {1, 4, 2, 5, 3, 6}, {1, 4, 2, 5, 3, 6}, {1, 7, 4, 10, 2, 8, 5, 11, 3, 9, 6, 12}}; std::vector expected_result_shapes{{2, 3}, {3, 2}, {3, 2}, {3, 1, 2}, {3, 2, 2}}; - + for (size_t i = 0; i < data_shapes.size(); i++) { auto result_tensor = make_shared(element::dynamic, PartialShape::dynamic()); @@ -44,14 +44,6 @@ void test_tranpose_eval(shared_ptr fun) auto actual_results = read_vector(result_tensor); ASSERT_EQ(actual_results, expected_results[i]); - - { // Temporary test for legacy reference function template - NGRAPH_SUPPRESS_DEPRECATED_START - std::vector ref_results(input_data[i].size()); - runtime::reference::transpose(input_data[i].data(), ref_results.data(), data_shapes[i], axes_order[i].data()); - ASSERT_EQ(ref_results, expected_results[i]); - NGRAPH_SUPPRESS_DEPRECATED_END - } } } @@ -77,7 +69,7 @@ TEST(op_eval, eval_transpose) const auto input_floating = make_shared(element::f32, PartialShape::dynamic()); const auto transpose_floating = make_shared(input_floating, axis); const auto function_floating = make_shared(OutputVector{transpose_floating}, ParameterVector{input_floating, axis}); - + switch (axis->get_element_type()) { case element::Type_t::i8: