natas_hw
/
openvino
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed leftovers after migration to new API (#19941) 

* Fixed leftovers after migration to new API

* Fixed tests

* Fixed clang format

---------

Co-authored-by: Ilya Lavrenov <ilya.lavrenov@intel.com>
This commit is contained in:
Ilya Churaev 2023-09-20 03:36:44 +04:00 committed by GitHub
parent b3ee79520f
commit 631d6d3980
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
23 changed files with 100 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/core/CMakeLists.txt
View File

@ -12,7 +12,8 @@ set(OV_CORE_DEV_API_PATH ${CMAKE_CURRENT_SOURCE_DIR}/dev_api)
file(GLOB_RECURSE LIBRARY_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/*.hpp)
file(GLOB_RECURSE PUBLIC_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/include/*.hpp)
file(GLOB_RECURSE PUBLIC_HEADERS ${OV_CORE_INCLUDE_PATH}/*.hpp)
file(GLOB_RECURSE DEV_HEADERS ${OV_CORE_DEV_API_PATH}/*.hpp)
add_subdirectory(builder)
add_subdirectory(reference)
@ -94,7 +95,7 @@ ov_abi_free_target(ngraph_obj)
ov_ncc_naming_style(FOR_TARGET ngraph_obj
SOURCE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}/include")
ov_add_clang_format_target(ngraph_clang FOR_TARGETS ngraph_obj)
ov_add_clang_format_target(ngraph_clang FOR_SOURCES ${LIBRARY_SRC} ${PUBLIC_HEADERS} ${DEV_HEADERS})
if(NOT BUILD_SHARED_LIBS)
target_compile_definitions(ngraph_obj PUBLIC OPENVINO_STATIC_LIBRARY)

4
src/core/dev_api/openvino/core/dimension_tracker.hpp
View File

@ -34,6 +34,7 @@ public:
void set_up_for_tracking(ov::Dimension& d);
void set_up_for_tracking(ov::Dimension& d, label_t label) const;
static void reset_tracking_info(ov::Dimension& d);
private:
std::shared_ptr<TableOfEquivalence> m_table_of_equivalence;
};
@ -44,13 +45,14 @@ using ValTable = std::unordered_map<label_t, ov::Dimension>;
class OPENVINO_API TableOfEquivalence {
public:
explicit TableOfEquivalence(label_t label = 1) : current_label(label) {};
explicit TableOfEquivalence(label_t label = 1) : current_label(label){};
void set_as_equal(const ov::Dimension& lhs, const ov::Dimension& rhs);
bool are_equal(const ov::Dimension& lhs, const ov::Dimension& rhs);
const EqTable& get_equivalence_table() const;
const ValTable& get_value_equivalence_table() const;
label_t get_next_label();
private:
label_t current_label;
EqTable dimension_table_of_equivalence;

5
src/core/dev_api/shape_util.hpp
View File

@ -5,6 +5,7 @@
#pragma once
#include "openvino/core/shape.hpp"
#include "openvino/op/util/attr_types.hpp"
namespace ov {
namespace util {
@ -50,7 +51,7 @@ OPENVINO_API Shape reduce(const Shape& input, const AxisSet& axes);
OPENVINO_API Shape reduce(const Shape& input, const AxisSet& axes, const bool keep_dims);
/**
* @brief Creates reduced vector from input by removing elements.
* @brief Creates reduced vector from input by removing elements.
*
* @param input Input vector for reduce calculation.
* @param axes Reduction axes.
@ -76,6 +77,6 @@ OPENVINO_API Shape reduce_keep_dims(const Shape& input, const AxisSet& axes);
*
* @return Result shape from inputs with applied broadcast specification.
*/
Shape get_broadcast_shape(const Shape& first, const Shape& second, const op::AutoBroadcastSpec& broadcast_spec);
Shape get_broadcast_shape(const Shape& first, const Shape& second, const ov::op::AutoBroadcastSpec& broadcast_spec);
} // namespace util
} // namespace ov

1
src/core/reference/src/op/if.cpp
View File

@ -35,7 +35,6 @@ void if_reference(const std::vector<std::shared_ptr<Model>>& bodies,
"Incorrect associating! If has not output with id ",
out_descr->m_output_index);
auto res = outs_from_body[out_descr->m_body_value_index];
out[out_descr->m_output_index].set_shape(res.get_shape());
res.copy_to(out[out_descr->m_output_index]);
}
}

1
src/core/reference/src/op/loop.cpp
View File

@ -196,7 +196,6 @@ void loop(const std::shared_ptr<Model>& func,
for (const auto& desc : out_descs) {
if (const auto& body_desc = std::dynamic_pointer_cast<op::v5::Loop::BodyOutputDescription>(desc)) {
const auto& res = body_outputs[body_desc->m_body_value_index];
out[body_desc->m_output_index].set_shape(res.get_shape());
res.copy_to(out[body_desc->m_output_index]);
}
}

2
src/core/reference/src/op/non_max_suppression.cpp
View File

@ -372,13 +372,11 @@ void nms_postprocessing(ov::TensorVector& outputs,
const std::vector<float>& selected_scores,
int64_t valid_outputs,
const ov::element::Type selected_scores_type) {
// outputs[0].set_element_type(output_type);
outputs[0].set_shape(Shape{static_cast<size_t>(valid_outputs), 3});
size_t num_of_outputs = outputs.size();
if (num_of_outputs >= 2) {
// outputs[1].set_element_type(selected_scores_type);
outputs[1].set_shape(Shape{static_cast<size_t>(valid_outputs), 3});
}

1
src/core/reference/src/op/tensor_iterator.cpp
View File

@ -109,7 +109,6 @@ void tensor_iterator(uint64_t num_iterations,
if (const auto& body_desc = std::dynamic_pointer_cast<op::v0::TensorIterator::BodyOutputDescription>(desc)) {
// Copy output values from the last iteration
const auto& res = body_outputs[body_desc->m_body_value_index];
out[body_desc->m_output_index].set_shape(res.get_shape());
res.copy_to(out[body_desc->m_output_index]);
}
}

1
src/core/src/node.cpp
View File

@ -742,7 +742,6 @@ inline void update_output_tensors(ov::TensorVector& output_values, const ngraph:
}
if (output_values[i]) {
// Copy value to the original tensor
output_values[i].set_shape(tensor.get_shape());
tensor.copy_to(output_values[i]);
} else {
// Tensor is not initialized, so create the new tensor

5
src/core/src/runtime/itensor.cpp
View File

@ -10,6 +10,7 @@
#include "openvino/runtime/allocator.hpp"
#include "openvino/runtime/iremote_tensor.hpp"
#include "openvino/runtime/properties.hpp"
#include "shape_util.hpp"
namespace ov {
@ -63,8 +64,10 @@ void ITensor::copy_to(const std::shared_ptr<ov::ITensor>& dst) const {
" != dst: ",
dst->get_element_type(),
")");
if (dst->get_shape() == ov::Shape{0})
OPENVINO_SUPPRESS_DEPRECATED_START
if (dst->get_shape() == ov::Shape{0} || ov::util::is_dynamic_shape(dst->get_shape()))
dst->set_shape(get_shape());
OPENVINO_SUPPRESS_DEPRECATED_END
OPENVINO_ASSERT(shapes_equal(get_shape(), dst->get_shape()),
"Tensor shapes are not equal. (src: ",
get_shape(),

1
src/plugins/template/backend/ops/assign.cpp
View File

@ -7,7 +7,6 @@
bool evaluate(const std::shared_ptr<ov::op::v3::Assign>& op,
ov::TensorVector& outputs,
const ov::TensorVector& inputs) {
outputs[0].set_shape(inputs[0].get_shape());
inputs[0].copy_to(outputs[0]);
return true;
}

51
src/plugins/template/backend/ops/if.cpp
View File

@ -74,14 +74,14 @@ void function(const std::shared_ptr<ov::Model>& function, const ov::TensorVector
const auto& parameters = function->get_parameters();
const auto& parametersNumber = parameters.size();
const auto& inputsNumber = inputs.size();
NGRAPH_CHECK(parametersNumber == inputsNumber,
"Got function (",
function->get_friendly_name(),
") with ",
parametersNumber,
" parameters, but ",
inputsNumber,
" input blobs");
OPENVINO_ASSERT(parametersNumber == inputsNumber,
"Got function (",
function->get_friendly_name(),
") with ",
parametersNumber,
" parameters, but ",
inputsNumber,
" input blobs");
for (const auto& parameter : parameters) {
const auto& parameterIndex = function->get_parameter_index(parameter);
@ -91,16 +91,16 @@ void function(const std::shared_ptr<ov::Model>& function, const ov::TensorVector
const auto& input = inputs[parameterIndex];
const auto& inputSize = input.get_byte_size();
NGRAPH_CHECK(parameterSize == inputSize,
"Got parameter (",
parameter->get_friendly_name(),
") of size ",
parameterSize,
" bytes, but corresponding input with index ",
parameterIndex,
" has ",
inputSize,
" bytes");
OPENVINO_ASSERT(parameterSize == inputSize,
"Got parameter (",
parameter->get_friendly_name(),
") of size ",
parameterSize,
" bytes, but corresponding input with index ",
parameterIndex,
" has ",
inputSize,
" bytes");
}
const auto& results = function->get_results();
@ -120,7 +120,7 @@ void if_reference(const std::vector<std::shared_ptr<ov::Model>>& bodies,
const std::vector<ov::op::util::MultiSubGraphOp::MultiSubgraphInputDescriptionVector>& input_descs,
ov::TensorVector& out,
const ov::TensorVector& args) {
NGRAPH_CHECK(args.size() > 0, "If operation must have input condition value");
OPENVINO_ASSERT(args.size() > 0, "If operation must have input condition value");
auto condition_value = args[0].data<bool>()[0];
auto branch_index = (condition_value) ? ov::op::v8::If::THEN_BODY_INDEX : ov::op::v8::If::ELSE_BODY_INDEX;
@ -130,18 +130,17 @@ void if_reference(const std::vector<std::shared_ptr<ov::Model>>& bodies,
auto inputs_size = args.size();
auto output_size = out.size();
for (const auto& input_desc : input_descs[branch_index]) {
NGRAPH_CHECK(inputs_size > input_desc->m_input_index,
"Incorrect associating! If has not input with id ",
input_desc->m_input_index);
OPENVINO_ASSERT(inputs_size > input_desc->m_input_index,
"Incorrect associating! If has not input with id ",
input_desc->m_input_index);
inputs_to_body[input_desc->m_body_parameter_index] = args[input_desc->m_input_index];
}
function(bodies[branch_index], inputs_to_body, outs_from_body);
for (const auto& out_descr : out_descs[branch_index]) {
NGRAPH_CHECK(output_size > out_descr->m_output_index,
"Incorrect associating! If has not output with id ",
out_descr->m_output_index);
OPENVINO_ASSERT(output_size > out_descr->m_output_index,
"Incorrect associating! If has not output with id ",
out_descr->m_output_index);
auto res = outs_from_body[out_descr->m_body_value_index];
out[out_descr->m_output_index].set_shape(res.get_shape());
res.copy_to(out[out_descr->m_output_index]);
}

4
src/plugins/template/backend/ops/interpolate.cpp
View File

@ -176,7 +176,7 @@ static void pad_input_data(const uint8_t* data_ptr,
const ov::Shape& input_shape,
const ov::Shape& padded_input_shape,
const std::vector<size_t>& pads_begin) {
NGRAPH_SUPPRESS_DEPRECATED_START
OPENVINO_SUPPRESS_DEPRECATED_START
ov::CoordinateTransform input_transform(input_shape);
ov::CoordinateTransform padded_transform(padded_input_shape);
@ -191,7 +191,7 @@ static void pad_input_data(const uint8_t* data_ptr,
const uint8_t* src_ptr = data_ptr + type_size * input_transform.index(input_coord);
memcpy(dst_ptr, src_ptr, type_size);
}
NGRAPH_SUPPRESS_DEPRECATED_END
OPENVINO_SUPPRESS_DEPRECATED_END
}
namespace v11 {

1
src/plugins/template/backend/ops/read_value.cpp
View File

@ -7,7 +7,6 @@
bool evaluate(const std::shared_ptr<ov::op::v3::ReadValue>& op,
ov::TensorVector& outputs,
const ov::TensorVector& inputs) {
outputs[0].set_shape(inputs[0].get_shape());
inputs[0].copy_to(outputs[0]);
return true;
}

2
src/plugins/template/backend/ops/roi_align.cpp
View File

@ -24,7 +24,7 @@ bool evaluate(const std::shared_ptr<ov::op::v9::ROIAlign>& op,
break;
}
default: {
NGRAPH_CHECK(false, "unsupported PoolingMode ");
OPENVINO_THROW("unsupported PoolingMode ");
}
}
ov::reference::roi_align<T>(inputs[0].data<const T>(),

16
src/plugins/template/backend/ops/tensor_iterator.cpp
View File

@ -14,14 +14,14 @@ ov::reference::custom_evaluate_function evaluate =
const auto& parameters = function->get_parameters();
const auto& parametersNumber = parameters.size();
const auto& inputsNumber = inputs.size();
NGRAPH_CHECK(parametersNumber == inputsNumber,
"Got function (",
function->get_friendly_name(),
") with ",
parametersNumber,
" parameters, but ",
inputsNumber,
" input blobs");
OPENVINO_ASSERT(parametersNumber == inputsNumber,
"Got function (",
function->get_friendly_name(),
") with ",
parametersNumber,
" parameters, but ",
inputsNumber,
" input blobs");
const auto& results = function->get_results();
outputs.reserve(results.size());

6
src/plugins/template/src/plugin.cpp
View File

@ -29,7 +29,7 @@ ov::template_plugin::Plugin::Plugin() {
// TODO: fill with actual device name, backend engine
set_device_name("TEMPLATE");
// create ngraph backend which performs inference using ngraph reference implementations
// create backend which performs inference using openvino reference implementations
m_backend = ov::runtime::Backend::create();
// create default stream executor with a given name
@ -177,9 +177,9 @@ ov::SupportedOpsMap ov::template_plugin::Plugin::query_model(const std::shared_p
// 1. It is needed to apply all transformations as it is done in compile_model
transform_model(model);
},
[&](std::shared_ptr<ngraph::Node> node) {
[&](std::shared_ptr<ov::Node> node) {
// 2. Сheck whether node is supported
ngraph::OpSet op_super_set;
ov::OpSet op_super_set;
#define _OPENVINO_OP_REG(NAME, NAMESPACE) op_super_set.insert<NAMESPACE::NAME>();
// clang-format off
#include "openvino/opsets/opset1_tbl.hpp"

4
src/plugins/template/tests/functional/shared_tests_instances/behavior/ov_plugin/remote.cpp
View File

@ -20,8 +20,8 @@ std::vector<std::pair<ov::AnyMap, ov::AnyMap>> generate_remote_params() {
INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests,
OVRemoteTest,
::testing::Combine(::testing::Values(ngraph::element::f32),
::testing::Values(::ov::test::utils::DEVICE_TEMPLATE),
::testing::Combine(::testing::Values(ov::element::f32),
::testing::Values(ov::test::utils::DEVICE_TEMPLATE),
::testing::ValuesIn(template_config()),
::testing::ValuesIn(generate_remote_params())),
OVRemoteTest::getTestCaseName);

11
src/plugins/template/tests/functional/shared_tests_instances/single_layer_tests/convolution.cpp
View File

@ -26,7 +26,7 @@ const std::vector<std::vector<ptrdiff_t>> padBegins = {{0, 0}, {0, 3}};
const std::vector<std::vector<ptrdiff_t>> padEnds = {{0, 0}, {0, 3}};
const std::vector<std::vector<size_t>> dilations = {{1, 1}, {3, 1}};
const std::vector<size_t> numOutChannels = {1, 5};
const std::vector<ngraph::op::PadType> padTypes = {ngraph::op::PadType::EXPLICIT, ngraph::op::PadType::VALID};
const std::vector<ov::op::PadType> padTypes = {ov::op::PadType::EXPLICIT, ov::op::PadType::VALID};
const auto conv2DParams_ExplicitPadding = ::testing::Combine(::testing::ValuesIn(kernels),
::testing::ValuesIn(strides),
@ -34,7 +34,7 @@ const auto conv2DParams_ExplicitPadding = ::testing::Combine(::testing::ValuesIn
::testing::ValuesIn(padEnds),
::testing::ValuesIn(dilations),
::testing::ValuesIn(numOutChannels),
::testing::Values(ngraph::op::PadType::EXPLICIT));
::testing::Values(ov::op::PadType::EXPLICIT));
// ! [test_convolution:declare_parameters]
const auto conv2DParams_AutoPadValid = ::testing::Combine(::testing::ValuesIn(kernels),
@ -43,7 +43,7 @@ const auto conv2DParams_AutoPadValid = ::testing::Combine(::testing::ValuesIn(ke
::testing::Values(std::vector<ptrdiff_t>({0, 0})),
::testing::ValuesIn(dilations),
::testing::ValuesIn(numOutChannels),
::testing::Values(ngraph::op::PadType::VALID));
::testing::Values(ov::op::PadType::VALID));
// ! [test_convolution:instantiate]
INSTANTIATE_TEST_SUITE_P(Convolution2D_ExplicitPadding,
@ -85,14 +85,15 @@ const auto conv3DParams_ExplicitPadding = ::testing::Combine(::testing::ValuesIn
::testing::ValuesIn(paddings3d),
::testing::ValuesIn(dilations3d),
::testing::Values(5),
::testing::Values(ngraph::op::PadType::EXPLICIT));
::testing::Values(ov::op::PadType::EXPLICIT));
const auto conv3DParams_AutoPadValid = ::testing::Combine(::testing::ValuesIn(kernels3d),
::testing::ValuesIn(strides3d),
::testing::Values(std::vector<ptrdiff_t>({0, 0, 0})),
::testing::Values(std::vector<ptrdiff_t>({0, 0, 0})),
::testing::ValuesIn(dilations3d),
::testing::Values(5),
::testing::Values(ngraph::op::PadType::VALID));
::testing::Values(ov::op::PadType::VALID));
INSTANTIATE_TEST_SUITE_P(smoke_Convolution3D_ExplicitPadding,
ConvolutionLayerTest,

42
src/plugins/template/tests/functional/shared_tests_instances/single_layer_tests/eltwise.cpp
View File

@ -28,7 +28,7 @@ std::vector<std::vector<ov::Shape>> inShapesStatic = {
};
std::vector<std::vector<ov::test::InputShape>> inShapesDynamic = {
{{{ngraph::Dimension(1, 10), 200}, {{2, 200}, {1, 200}}}, {{ngraph::Dimension(1, 10), 200}, {{2, 200}, {5, 200}}}},
{{{ov::Dimension(1, 10), 200}, {{2, 200}, {1, 200}}}, {{ov::Dimension(1, 10), 200}, {{2, 200}, {5, 200}}}},
};
std::vector<ov::test::ElementType> netPrecisions = {
@ -37,13 +37,13 @@ std::vector<ov::test::ElementType> netPrecisions = {
ov::element::i32,
};
std::vector<ngraph::helpers::InputLayerType> secondaryInputTypes = {
ngraph::helpers::InputLayerType::CONSTANT,
ngraph::helpers::InputLayerType::PARAMETER,
std::vector<ov::test::utils::InputLayerType> secondaryInputTypes = {
ov::test::utils::InputLayerType::CONSTANT,
ov::test::utils::InputLayerType::PARAMETER,
};
std::vector<ngraph::helpers::InputLayerType> secondaryInputTypesDynamic = {
ngraph::helpers::InputLayerType::PARAMETER,
std::vector<ov::test::utils::InputLayerType> secondaryInputTypesDynamic = {
ov::test::utils::InputLayerType::PARAMETER,
};
std::vector<ov::test::utils::OpType> opTypes = {
@ -55,19 +55,19 @@ std::vector<ov::test::utils::OpType> opTypesDynamic = {
ov::test::utils::OpType::VECTOR,
};
std::vector<ngraph::helpers::EltwiseTypes> eltwiseOpTypes = {ngraph::helpers::EltwiseTypes::ADD,
ngraph::helpers::EltwiseTypes::MULTIPLY,
ngraph::helpers::EltwiseTypes::SUBTRACT,
ngraph::helpers::EltwiseTypes::DIVIDE,
ngraph::helpers::EltwiseTypes::FLOOR_MOD,
ngraph::helpers::EltwiseTypes::SQUARED_DIFF,
ngraph::helpers::EltwiseTypes::POWER,
ngraph::helpers::EltwiseTypes::MOD};
std::vector<ov::test::utils::EltwiseTypes> eltwiseOpTypes = {ov::test::utils::EltwiseTypes::ADD,
ov::test::utils::EltwiseTypes::MULTIPLY,
ov::test::utils::EltwiseTypes::SUBTRACT,
ov::test::utils::EltwiseTypes::DIVIDE,
ov::test::utils::EltwiseTypes::FLOOR_MOD,
ov::test::utils::EltwiseTypes::SQUARED_DIFF,
ov::test::utils::EltwiseTypes::POWER,
ov::test::utils::EltwiseTypes::MOD};
std::vector<ngraph::helpers::EltwiseTypes> eltwiseOpTypesDynamic = {
ngraph::helpers::EltwiseTypes::ADD,
ngraph::helpers::EltwiseTypes::MULTIPLY,
ngraph::helpers::EltwiseTypes::SUBTRACT,
std::vector<ov::test::utils::EltwiseTypes> eltwiseOpTypesDynamic = {
ov::test::utils::EltwiseTypes::ADD,
ov::test::utils::EltwiseTypes::MULTIPLY,
ov::test::utils::EltwiseTypes::SUBTRACT,
};
ov::test::Config additional_config = {};
@ -108,9 +108,9 @@ std::vector<std::vector<ov::Shape>> inShapesSingleThread = {
{{2, 1, 2, 1, 2, 2}},
};
std::vector<ngraph::helpers::EltwiseTypes> eltwiseOpTypesSingleThread = {
ngraph::helpers::EltwiseTypes::ADD,
ngraph::helpers::EltwiseTypes::POWER,
std::vector<ov::test::utils::EltwiseTypes> eltwiseOpTypesSingleThread = {
ov::test::utils::EltwiseTypes::ADD,
ov::test::utils::EltwiseTypes::POWER,
};
ov::AnyMap additional_config_single_thread = {{"CPU_THREADS_NUM", "1"}};

27
src/plugins/template/tests/functional/shared_tests_instances/single_layer_tests/softmax.cpp
View File

@ -24,10 +24,10 @@ const std::vector<ov::Shape> inputStaticShape2D = {
};
const std::vector<ov::test::InputShape> inputDynamicShape2D = {
{{ngraph::Dimension::dynamic(), 10}, {{1, 10}, {2, 10}, {10, 10}}},
{{ngraph::Dimension(1, 10), 10}, {{1, 10}, {2, 10}, {10, 10}}},
{{10, ngraph::Dimension::dynamic()}, {{10, 1}, {10, 5}, {10, 10}}},
{{ngraph::Dimension::dynamic(), ngraph::Dimension::dynamic()}, {{1, 10}, {2, 10}, {10, 10}}}};
{{ov::Dimension::dynamic(), 10}, {{1, 10}, {2, 10}, {10, 10}}},
{{ov::Dimension(1, 10), 10}, {{1, 10}, {2, 10}, {10, 10}}},
{{10, ov::Dimension::dynamic()}, {{10, 1}, {10, 5}, {10, 10}}},
{{ov::Dimension::dynamic(), ov::Dimension::dynamic()}, {{1, 10}, {2, 10}, {10, 10}}}};
const std::vector<int64_t> axis2D = {-2, -1, 0, 1};
@ -65,11 +65,8 @@ const std::vector<ov::Shape> inputStaticShape4D = {
};
const std::vector<ov::test::InputShape> inputDynamicShape4D = {
{{ngraph::Dimension::dynamic(), 100, ngraph::Dimension(1, 10), 1}, {{1, 100, 1, 1}, {100, 100, 5, 1}}},
{{ngraph::Dimension::dynamic(),
ngraph::Dimension::dynamic(),
ngraph::Dimension::dynamic(),
ngraph::Dimension::dynamic()},
{{ov::Dimension::dynamic(), 100, ov::Dimension(1, 10), 1}, {{1, 100, 1, 1}, {100, 100, 5, 1}}},
{{ov::Dimension::dynamic(), ov::Dimension::dynamic(), ov::Dimension::dynamic(), ov::Dimension::dynamic()},
{{1, 100, 1, 1}, {50, 100, 4, 1}, {2, 100, 10, 1}}},
};
@ -110,12 +107,12 @@ const std::vector<ov::Shape> inputStaticShape5D = {
};
const std::vector<ov::test::InputShape> inputDynamicShape5D = {
{{ngraph::Dimension::dynamic(), 100, ngraph::Dimension(1, 10), 1, 1}, {{1, 100, 1, 1, 1}, {100, 100, 5, 1, 1}}},
{{ngraph::Dimension::dynamic(),
ngraph::Dimension::dynamic(),
ngraph::Dimension::dynamic(),
ngraph::Dimension::dynamic(),
ngraph::Dimension::dynamic()},
{{ov::Dimension::dynamic(), 100, ov::Dimension(1, 10), 1, 1}, {{1, 100, 1, 1, 1}, {100, 100, 5, 1, 1}}},
{{ov::Dimension::dynamic(),
ov::Dimension::dynamic(),
ov::Dimension::dynamic(),
ov::Dimension::dynamic(),
ov::Dimension::dynamic()},
{{1, 100, 1, 1, 1}, {50, 100, 4, 1, 1}, {2, 100, 10, 1, 1}}},
};

1
src/plugins/template/tests/functional/subgraph_reference/base_reference_cnn_test.cpp
View File

@ -6,7 +6,6 @@
#include <gtest/gtest.h>
#include "functional_test_utils/ov_plugin_cache.hpp"
#include "ie_ngraph_utils.hpp"
#include "openvino/core/type/element_type.hpp"
#include "openvino/runtime/allocator.hpp"
#include "openvino/runtime/tensor.hpp"

10
src/plugins/template/tests/functional/subgraph_reference/preprocess.cpp
View File

@ -4,15 +4,11 @@
#include <gtest/gtest.h>
#include <ie_core.hpp>
#include <ie_ngraph_utils.hpp>
#include <ngraph/ngraph.hpp>
#include <openvino/core/preprocess/pre_post_process.hpp>
#include <shared_test_classes/base/layer_test_utils.hpp>
#include <vector>
#include "../op_reference/base_reference_test.hpp"
#include "ngraph_functions/builders.hpp"
#include "base_reference_test.hpp"
#include "openvino/core/preprocess/pre_post_process.hpp"
#include "shared_test_classes/base/layer_test_utils.hpp"
using namespace ov;
using namespace ov::preprocess;

10
src/plugins/template/tests/functional/subgraph_reference/preprocess_legacy.cpp
View File

@ -4,15 +4,13 @@
#include <gtest/gtest.h>
#include <ie_ngraph_utils.hpp>
#include <openvino/core/preprocess/pre_post_process.hpp>
#include <shared_test_classes/base/layer_test_utils.hpp>
#include <shared_test_classes/single_layer/convert_color_i420.hpp>
#include <shared_test_classes/single_layer/convert_color_nv12.hpp>
#include <vector>
#include "base_reference_cnn_test.hpp"
#include "ngraph_functions/builders.hpp"
#include "openvino/core/preprocess/pre_post_process.hpp"
#include "shared_test_classes/base/layer_test_utils.hpp"
#include "shared_test_classes/single_layer/convert_color_i420.hpp"
#include "shared_test_classes/single_layer/convert_color_nv12.hpp"
using namespace ov;
using namespace ov::preprocess;