Skip to content

Commit dcf9247

Browse files
vurusovsvurusovs
authored
Clean up of tests/ov_helpers leftovers (openvinotoolkit#21416)
* CLean up ov_helpers headers from ngraph/ * Move `ngraph/` includes from ov_helpers to tests * Remove include of all opsets in builders.hpp * Remove opsets includes from ov_helpers * Fix GNA tests * Delete comments * ClangFormat * Fix build * Fix `-fpermissive` * Fix build #2 * Fix `<` && `>` in includes * Fix build #3 * Build fix
1 parent adb4703 commit dcf9247

File tree

393 files changed

+3551
-3642
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

393 files changed

+3551
-3642
lines changed

‎src/plugins/auto/tests/functional/shared_tests_instances/behavior/ov_infer_request/infer_request_dynamic.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ std::shared_ptr<ngraph::Function> getFunction2() {
2424

2525
auto in2add = ngraph::builder::makeConstant(ngPrc, {1, 2, 1, 1}, std::vector<float>{}, true);
2626
auto add = ngraph::builder::makeEltwise(split->output(0), in2add, ngraph::helpers::EltwiseTypes::ADD);
27-
auto relu1 = std::make_shared<ngraph::opset1::Relu>(add);
27+
auto relu1 = std::make_shared<ov::op::v0::Relu>(add);
2828

2929
auto in2mult = ngraph::builder::makeConstant(ngPrc, {1, 2, 1, 1}, std::vector<float>{}, true);
3030
auto mult = ngraph::builder::makeEltwise(split->output(1), in2mult, ngraph::helpers::EltwiseTypes::MULTIPLY);
31-
auto relu2 = std::make_shared<ngraph::opset1::Relu>(mult);
31+
auto relu2 = std::make_shared<ov::op::v0::Relu>(mult);
3232

33-
auto concat = std::make_shared<ngraph::opset1::Concat>(ngraph::OutputVector{relu1->output(0), relu2->output(0)}, 3);
33+
auto concat = std::make_shared<ov::op::v0::Concat>(ngraph::OutputVector{relu1->output(0), relu2->output(0)}, 3);
3434
concat->get_output_tensor(0).set_names({"concat"});
3535

3636
return std::make_shared<ngraph::Function>(concat, params, "SplitAddConcat");

‎src/plugins/intel_cpu/tests/functional/shared_tests_instances/behavior/ov_infer_request/infer_request_dynamic.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ std::shared_ptr<ngraph::Function> getFunction1() {
2929

3030
auto in2add = ngraph::builder::makeConstant(ngPrc, {1, 4, 1, 1}, std::vector<float>{}, true);
3131
auto add = ngraph::builder::makeEltwise(params[0], in2add, ngraph::helpers::EltwiseTypes::ADD);
32-
auto relu1 = std::make_shared<ngraph::opset1::Relu>(add->output(0));
32+
auto relu1 = std::make_shared<ov::op::v0::Relu>(add->output(0));
3333
relu1->get_output_tensor(0).set_names({"relu1"});
34-
auto relu2 = std::make_shared<ngraph::opset1::Relu>(add->output(0));
34+
auto relu2 = std::make_shared<ov::op::v0::Relu>(add->output(0));
3535
relu2->get_output_tensor(0).set_names({"relu2"});
3636

3737
ngraph::NodeVector results{relu1, relu2};
@@ -51,13 +51,13 @@ std::shared_ptr<ngraph::Function> getFunction2() {
5151

5252
auto in2add = ngraph::builder::makeConstant(ngPrc, {1, 2, 1, 1}, std::vector<float>{}, true);
5353
auto add = ngraph::builder::makeEltwise(split->output(0), in2add, ngraph::helpers::EltwiseTypes::ADD);
54-
auto relu1 = std::make_shared<ngraph::opset1::Relu>(add);
54+
auto relu1 = std::make_shared<ov::op::v0::Relu>(add);
5555

5656
auto in2mult = ngraph::builder::makeConstant(ngPrc, {1, 2, 1, 1}, std::vector<float>{}, true);
5757
auto mult = ngraph::builder::makeEltwise(split->output(1), in2mult, ngraph::helpers::EltwiseTypes::MULTIPLY);
58-
auto relu2 = std::make_shared<ngraph::opset1::Relu>(mult);
58+
auto relu2 = std::make_shared<ov::op::v0::Relu>(mult);
5959

60-
auto concat = std::make_shared<ngraph::opset1::Concat>(ngraph::OutputVector{relu1->output(0), relu2->output(0)}, 3);
60+
auto concat = std::make_shared<ov::op::v0::Concat>(ngraph::OutputVector{relu1->output(0), relu2->output(0)}, 3);
6161
concat->get_output_tensor(0).set_names({"concat"});
6262

6363
return std::make_shared<ngraph::Function>(concat, params, "SplitAddConcat");

‎src/plugins/intel_cpu/tests/functional/shared_tests_instances/behavior/plugin/caching_tests.cpp‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -40,37 +40,37 @@ namespace {
4040
};
4141

4242
static std::shared_ptr<ngraph::Function> simple_function_non_max_suppression_internal(ngraph::element::Type, size_t) {
43-
auto boxes = std::make_shared<opset1::Parameter>(element::f32, Shape{1, 1000, 4});
44-
auto scores = std::make_shared<opset1::Parameter>(element::f32, Shape{1, 1, 1000});
45-
auto max_output_boxes_per_class = opset1::Constant::create(element::i32, Shape{1}, {10});
46-
auto iou_threshold = opset1::Constant::create(element::f32, Shape{1}, {0.75});
47-
auto score_threshold = opset1::Constant::create(element::f32, Shape{1}, {0.7});
43+
auto boxes = std::make_shared<ov::op::v0::Parameter>(element::f32, Shape{1, 1000, 4});
44+
auto scores = std::make_shared<ov::op::v0::Parameter>(element::f32, Shape{1, 1, 1000});
45+
auto max_output_boxes_per_class = ov::op::v0::Constant::create(element::i32, Shape{1}, {10});
46+
auto iou_threshold = ov::op::v0::Constant::create(element::f32, Shape{1}, {0.75});
47+
auto score_threshold = ov::op::v0::Constant::create(element::f32, Shape{1}, {0.7});
4848
auto nms = std::make_shared<ov::op::internal::NonMaxSuppressionIEInternal>(boxes, scores, max_output_boxes_per_class,
4949
iou_threshold, score_threshold, 0, true, element::i32);
50-
auto res = std::make_shared<ngraph::opset6::Result>(nms);
50+
auto res = std::make_shared<ov::op::v0::Result>(nms);
5151
auto func = std::make_shared<Function>(NodeVector{nms}, ParameterVector{boxes, scores});
5252
return func;
5353
}
5454

5555
static std::shared_ptr<ngraph::Function> simple_function_matrix_nms_internal(ngraph::element::Type, size_t) {
56-
auto boxes = std::make_shared<opset1::Parameter>(element::f32, Shape{1, 1000, 4});
57-
auto scores = std::make_shared<opset1::Parameter>(element::f32, Shape{1, 1, 1000});
56+
auto boxes = std::make_shared<ov::op::v0::Parameter>(element::f32, Shape{1, 1000, 4});
57+
auto scores = std::make_shared<ov::op::v0::Parameter>(element::f32, Shape{1, 1, 1000});
5858
ov::op::v8::MatrixNms::Attributes attr;
5959
// convert_precision does not support internal op 'NmsStaticShapeIE'
6060
attr.output_type = element::i32;
6161
auto nms = std::make_shared<ov::op::internal::NmsStaticShapeIE<ov::op::v8::MatrixNms>>(boxes, scores, attr);
62-
auto res = std::make_shared<ngraph::opset6::Result>(nms);
62+
auto res = std::make_shared<ov::op::v0::Result>(nms);
6363
auto func = std::make_shared<Function>(NodeVector{nms}, ParameterVector{boxes, scores});
6464
return func;
6565
}
6666

6767
static std::shared_ptr<ngraph::Function> simple_function_multiclass_nms_internal(ngraph::element::Type, size_t) {
68-
auto boxes = std::make_shared<opset1::Parameter>(element::f32, Shape{1, 1000, 4});
69-
auto scores = std::make_shared<opset1::Parameter>(element::f32, Shape{1, 1, 1000});
70-
op::util::MulticlassNmsBase::Attributes attr;
68+
auto boxes = std::make_shared<ov::op::v0::Parameter>(element::f32, Shape{1, 1000, 4});
69+
auto scores = std::make_shared<ov::op::v0::Parameter>(element::f32, Shape{1, 1, 1000});
70+
ov::op::util::MulticlassNmsBase::Attributes attr;
7171
attr.output_type = element::i32;
7272
auto nms = std::make_shared<ov::op::internal::MulticlassNmsIEInternal>(boxes, scores, attr);
73-
auto res = std::make_shared<ngraph::opset6::Result>(nms);
73+
auto res = std::make_shared<ov::op::v0::Result>(nms);
7474
auto func = std::make_shared<Function>(NodeVector{nms}, ParameterVector{boxes, scores});
7575
return func;
7676
}

‎src/plugins/intel_cpu/tests/functional/shared_tests_instances/execution_graph_tests/add_output.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ inline InferenceEngine::CNNNetwork getTargetNetwork() {
1818
auto input = std::make_shared<op::v0::Parameter>(type, shape);
1919
auto mem_i = std::make_shared<op::v0::Constant>(type, shape, 0);
2020
auto mem_r = std::make_shared<op::v3::ReadValue>(mem_i, "id");
21-
auto mul = std::make_shared<ngraph::op::v1::Multiply>(mem_r, input);
21+
auto mul = std::make_shared<ov::op::v1::Multiply>(mem_r, input);
2222
auto mem_w = std::make_shared<op::v3::Assign>(mul, "id");
2323
auto sigm = std::make_shared<ngraph::op::Sigmoid>(mul);
2424
mem_r->set_friendly_name("Memory");

‎src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/concat_transformation.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ const std::vector<ConcatTransformationTestValues> testValues = {
108108
{},
109109
{ 256ul, ngraph::Shape({}), {0.f}, {2.55f}, {0.f}, {2.55f} },
110110
{},
111-
std::make_shared<ngraph::opset1::Constant>(ov::element::u8, ov::Shape{1, 3, 16, 16}, std::vector<float>(3 * 16 * 16, 1.0)),
111+
std::make_shared<ov::op::v0::Constant>(ov::element::u8, ov::Shape{1, 3, 16, 16}, std::vector<float>(3 * 16 * 16, 1.0)),
112112
{},
113113
{
114114
{ ov::element::f16 },

‎src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/depth_to_space_transformation.cpp‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,16 @@
99

1010
using namespace LayerTestsDefinitions;
1111
using namespace InferenceEngine::details;
12-
using namespace ngraph::opset1;
1312

1413
namespace {
1514
const std::vector<ngraph::element::Type> precisions = {
1615
ngraph::element::f32,
1716
// ngraph::element::f16
1817
};
1918

20-
const std::vector<DepthToSpace::DepthToSpaceMode> modes = {
21-
DepthToSpace::DepthToSpaceMode::BLOCKS_FIRST,
22-
DepthToSpace::DepthToSpaceMode::DEPTH_FIRST
19+
const std::vector<ov::op::v0::DepthToSpace::DepthToSpaceMode> modes = {
20+
ov::op::v0::DepthToSpace::DepthToSpaceMode::BLOCKS_FIRST,
21+
ov::op::v0::DepthToSpace::DepthToSpaceMode::DEPTH_FIRST
2322
};
2423

2524
const std::vector<ngraph::PartialShape> inputShapesBS2 = {

‎src/plugins/intel_cpu/tests/functional/shared_tests_instances/single_layer_tests/depth_to_space.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ const std::vector<ov::element::Type> model_types = {
1515
ov::element::i16,
1616
};
1717

18-
const std::vector<DepthToSpace::DepthToSpaceMode> modes = {
19-
DepthToSpace::DepthToSpaceMode::BLOCKS_FIRST,
20-
DepthToSpace::DepthToSpaceMode::DEPTH_FIRST
18+
const std::vector<ov::op::v0::DepthToSpace::DepthToSpaceMode> modes = {
19+
ov::op::v0::DepthToSpace::DepthToSpaceMode::BLOCKS_FIRST,
20+
ov::op::v0::DepthToSpace::DepthToSpaceMode::DEPTH_FIRST
2121
};
2222

2323
const std::vector<std::vector<ov::Shape>> input_shapes_bs2_static = {

‎src/plugins/intel_cpu/tests/functional/single_layer_tests/psroi_pooling.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,13 +89,13 @@ class PSROIPoolingLayerCPUTest : public testing::WithParamInterface<PSROIPooling
8989
auto coords = ngraph::builder::makeConstant<float>(ngraph::element::f32, proposalShape, proposal);
9090
ov::ParameterVector params {std::make_shared<ov::op::v0::Parameter>(ngraph::element::f32, ov::Shape(featureMapShape))};
9191

92-
auto psroi = std::make_shared<ngraph::op::v0::PSROIPooling>(params[0], coords, outputDim, groupSize,
92+
auto psroi = std::make_shared<ov::op::v0::PSROIPooling>(params[0], coords, outputDim, groupSize,
9393
spatialScale, spatialBinsX, spatialBinsY, mode);
9494
psroi->get_rt_info() = getCPUInfo();
9595
selectedType = getPrimitiveType() + "_" + inPrc.name();
9696

9797
threshold = 1e-2f;
98-
const ngraph::ResultVector results{std::make_shared<ngraph::opset3::Result>(psroi)};
98+
const ngraph::ResultVector results{std::make_shared<ov::op::v0::Result>(psroi)};
9999
function = std::make_shared<ngraph::Function>(results, params, "PSROIPooling");
100100
}
101101
};

‎src/plugins/intel_cpu/tests/functional/single_layer_tests/range.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -112,17 +112,17 @@
112112
// step = std::get<2>(rangeInputs);
113113
// auto ngOutPr = FuncTestUtils::PrecisionUtils::convertIE2nGraphPrc(outPrc);
114114
// auto ngNetPrc = FuncTestUtils::PrecisionUtils::convertIE2nGraphPrc(inPrc);
115-
// auto startPar = std::make_shared<ngraph::opset5::Parameter>(ngNetPrc, ngraph::Shape{});
116-
// auto stopPar = std::make_shared<ngraph::opset5::Parameter>(ngNetPrc, ngraph::Shape{});
117-
// auto stepPar = std::make_shared<ngraph::opset5::Parameter>(ngNetPrc, ngraph::Shape{});
118-
// auto range = std::make_shared<ngraph::opset4::Range>(startPar, stopPar, stepPar, ngOutPr);
115+
// auto startPar = std::make_shared<ov::op::v0::Parameter>(ngNetPrc, ngraph::Shape{});
116+
// auto stopPar = std::make_shared<ov::op::v0::Parameter>(ngNetPrc, ngraph::Shape{});
117+
// auto stepPar = std::make_shared<ov::op::v0::Parameter>(ngNetPrc, ngraph::Shape{});
118+
// auto range = std::make_shared<ov::op::v4::Range>(startPar, stopPar, stepPar, ngOutPr);
119119
// range->get_rt_info() = getCPUInfo();
120120
// selectedType = std::string("ref_any_") + (inPrc == outPrc ? inPrc.name() : "FP32");
121121
// startPar->set_friendly_name("start");
122122
// stopPar->set_friendly_name("stop");
123123
// stepPar->set_friendly_name("step");
124124
//
125-
// const ngraph::ResultVector results{std::make_shared<ngraph::opset3::Result>(range)};
125+
// const ngraph::ResultVector results{std::make_shared<ov::op::v0::Result>(range)};
126126
// function = std::make_shared<ngraph::Function>(results, ngraph::ParameterVector {
127127
// startPar, stopPar, stepPar}, "Range");
128128
// functionRefs = ngraph::clone_function(*function);

‎src/plugins/intel_cpu/tests/functional/subgraph_tests/src/concat_sdp.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ class ConcatSDPTest : public testing::WithParamInterface<ConcatSDPTestParams>, v
102102
auto concatV = std::make_shared<ov::op::v0::Concat>(OutputVector{pastv, inputParams[2]}, 2);
103103
auto sdp = std::make_shared<ov::opset13::ScaledDotProductAttention>(inputParams[0], concatK, concatV, false);
104104
sdp->set_friendly_name("mha");
105-
auto add = std::make_shared<op::v1::Add>(sdp, op::v0::Constant::create(inType, {1}, {1.0f}));
105+
auto add = std::make_shared<ov::op::v1::Add>(sdp, op::v0::Constant::create(inType, {1}, {1.0f}));
106106
auto pastk_assign = std::make_shared<op::v6::Assign>(concatK, var_k);
107107
auto pastv_assign = std::make_shared<op::v6::Assign>(concatV, var_v);
108108
pastk_assign->set_friendly_name("pastk_w");

0 commit comments

Comments
 (0)