From d235581310c99fa3a0545030bfb6476fe7053f56 Mon Sep 17 00:00:00 2001 From: vurusovs Date: Wed, 6 Dec 2023 11:44:14 +0400 Subject: [PATCH] Fix build --- .../transformer/nodes/fused_convolution_backprop_data.cpp | 2 +- .../single_layer_tests/convolution_backprop_data.cpp | 1 + .../single_layer_tests/convolution_backprop_data_add.cpp | 1 + .../single_layer_tests/convolution_biasadd_activation.hpp | 2 +- .../single_layer_tests/fully_connected.cpp | 4 ++-- .../single_layer_tests/gru_cell.cpp | 2 +- .../single_layer_tests/gru_sequence.cpp | 8 ++++---- .../single_layer_tests/lstm_cell.cpp | 2 +- .../single_layer_tests/lstm_sequence.cpp | 2 +- .../shared_tests_instances/single_layer_tests/topk.cpp | 1 + .../nvidia_plugin/tests/unit/cuda_multi_graph_test.cpp | 6 +++--- 11 files changed, 17 insertions(+), 14 deletions(-) diff --git a/modules/nvidia_plugin/src/transformer/nodes/fused_convolution_backprop_data.cpp b/modules/nvidia_plugin/src/transformer/nodes/fused_convolution_backprop_data.cpp index cb1a310bf..9c508957e 100644 --- a/modules/nvidia_plugin/src/transformer/nodes/fused_convolution_backprop_data.cpp +++ b/modules/nvidia_plugin/src/transformer/nodes/fused_convolution_backprop_data.cpp @@ -200,7 +200,7 @@ void FusedConvBackpropData::validate_and_infer_types() { // If auto_pad has one of following mode we infer paddings. Otherwise in // EXPLICIT auto_pad mode we use what is provided. if (auto_pad_ == ov::op::PadType::SAME_UPPER || auto_pad_ == ov::op::PadType::SAME_LOWER) { - ov::opset1::infer_conv_backprop_auto_padding( + ngraph::opset1::infer_conv_backprop_auto_padding( ov::Shape{std::next(data_shape.begin(), 2), std::end(data_shape)}, ov::Shape{std::next(filters_shape.begin(), 2), std::end(filters_shape)}, output_shape, diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/convolution_backprop_data.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/convolution_backprop_data.cpp index 8f00b4320..b17f5ab76 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/convolution_backprop_data.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/convolution_backprop_data.cpp @@ -8,6 +8,7 @@ #include #include +#include "openvino/opsets/opset1.hpp" #include #include "cuda_test_constants.hpp" diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/convolution_backprop_data_add.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/convolution_backprop_data_add.cpp index 923f87d2f..bf211dc81 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/convolution_backprop_data_add.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/convolution_backprop_data_add.cpp @@ -6,6 +6,7 @@ #include #include +#include "openvino/opsets/opset1.hpp" #include #include "cuda_test_constants.hpp" diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/convolution_biasadd_activation.hpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/convolution_biasadd_activation.hpp index 7c370a3b8..4df4af5dd 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/convolution_biasadd_activation.hpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/convolution_biasadd_activation.hpp @@ -14,11 +14,11 @@ #include #include #include -#include #include #include #include #include +#include "openvino/opsets/opset1.hpp" #include #include #include diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/fully_connected.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/fully_connected.cpp index 94c6b6985..3372bfc37 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/fully_connected.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/fully_connected.cpp @@ -98,7 +98,7 @@ class FullyConnectedLayerTest : public testing::WithParamInterface( params[0], secondaryInput, shapeRelatedParams.input1.second, shapeRelatedParams.input2.second); auto Add = std::make_shared(MatMul, thirdInput); - ov::ResultVector results{std::make_shared(Add)}; + ov::ResultVector results{std::make_shared(Add)}; function = std::make_shared(results, params, "FullyConnected"); } }; @@ -224,7 +224,7 @@ class FullyConnectedLayer2MatMulTest : public testing::WithParamInterface(matMul0, matMul1); - ov::ResultVector results{std::make_shared(Add)}; + ov::ResultVector results{std::make_shared(Add)}; function = std::make_shared(results, params, "FullyConnected"); } }; diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/gru_cell.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/gru_cell.cpp index 62a0b5514..9bb74bbf9 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/gru_cell.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/gru_cell.cpp @@ -34,7 +34,7 @@ class CUDNNGRUCellTest : public UnsymmetricalComparer { const auto& ops = function->get_ordered_ops(); int seed = SEED_FIRST; for (const auto& op : ops) { - if (std::dynamic_pointer_cast(op)) { + if (std::dynamic_pointer_cast(op)) { ov::Tensor random_tensor(op->get_element_type(), op->get_shape()); ov::test::utils::fill_tensor_random(random_tensor, up_to - start_from, start_from, 1, seed++); function->replace_node(op, std::make_shared(random_tensor)); diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/gru_sequence.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/gru_sequence.cpp index 7fa08c477..7de2c1d06 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/gru_sequence.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/gru_sequence.cpp @@ -26,7 +26,7 @@ class CUDNNGRUSequenceTest : public UnsymmetricalComparer { const auto& ops = function->get_ordered_ops(); int seed = 1; for (const auto& op : ops) { - if (std::dynamic_pointer_cast(op)) { + if (std::dynamic_pointer_cast(op)) { if (op->get_element_type() == ov::element::Type_t::f32) { ov::Tensor random_tensor(op->get_element_type(), op->get_shape()); ov::test::utils::fill_tensor_random(random_tensor, up_to - start_from, start_from, 1, seed++); @@ -56,7 +56,7 @@ class LPCNetCUDNNGRUSequenceTest : public UnsymmetricalComparer const auto& ops = function->get_ordered_ops(); int seed = 1; for (const auto& op : ops) { - if (std::dynamic_pointer_cast(op)) { + if (std::dynamic_pointer_cast(op)) { if (op->get_element_type() == ov::element::Type_t::f32) { ov::Tensor random_tensor(op->get_element_type(), op->get_shape()); ov::test::utils::fill_tensor_random(random_tensor, up_to - start_from, start_from, 1, seed++); @@ -118,8 +118,8 @@ class LPCNetCUDNNGRUSequenceTest : public UnsymmetricalComparer true, direction, mode); - ov::ResultVector results{std::make_shared(gru_sequence->output(0)), - std::make_shared(gru_sequence->output(1))}; + ov::ResultVector results{std::make_shared(gru_sequence->output(0)), + std::make_shared(gru_sequence->output(1))}; function = std::make_shared(results, params, "gru_sequence"); bool ti_found = ngraph::helpers::is_tensor_iterator_exist(function); EXPECT_EQ(ti_found, false); diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/lstm_cell.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/lstm_cell.cpp index ae774b7cc..40dacad87 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/lstm_cell.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/lstm_cell.cpp @@ -37,7 +37,7 @@ class CUDNNLSTMCellTest : public LSTMCellTest { const auto& ops = function->get_ordered_ops(); int seed = SEED_FIRST; for (const auto& op : ops) { - if (std::dynamic_pointer_cast(op)) { + if (std::dynamic_pointer_cast(op)) { ov::Tensor random_tensor(op->get_element_type(), op->get_shape()); ov::test::utils::fill_tensor_random(random_tensor, up_to - start_from, start_from, 1, seed); auto constant = std::make_shared(random_tensor); diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/lstm_sequence.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/lstm_sequence.cpp index 6888b666a..d9be77928 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/lstm_sequence.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/lstm_sequence.cpp @@ -26,7 +26,7 @@ class CUDALSTMSequenceTest : public UnsymmetricalComparer { int counter = 1; const auto& ops = function->get_ordered_ops(); for (const auto& op : ops) { - if (std::dynamic_pointer_cast(op)) { + if (std::dynamic_pointer_cast(op)) { if (op->get_element_type() == ov::element::Type_t::f32) { ov::Tensor random_tensor(op->get_element_type(), op->get_shape()); ov::test::utils::fill_tensor_random(random_tensor, up_to - start_from, start_from, 1, counter++); diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/topk.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/topk.cpp index 945ef33c0..7420e3b03 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/topk.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/topk.cpp @@ -3,6 +3,7 @@ // #include "single_layer_tests/topk.hpp" +#include "openvino/opsets/opset4.hpp" #include diff --git a/modules/nvidia_plugin/tests/unit/cuda_multi_graph_test.cpp b/modules/nvidia_plugin/tests/unit/cuda_multi_graph_test.cpp index b58c8cb0a..1bbebc52c 100644 --- a/modules/nvidia_plugin/tests/unit/cuda_multi_graph_test.cpp +++ b/modules/nvidia_plugin/tests/unit/cuda_multi_graph_test.cpp @@ -68,7 +68,7 @@ class AddMul { const auto add1 = ngraph::builder::makeEltwise(params[2], params[3], EltwiseTypes::ADD); const auto mul = ngraph::builder::makeEltwise(add0, add1, EltwiseTypes::MULTIPLY); - const auto result = std::make_shared(mul); + const auto result = std::make_shared(mul); return std::make_shared(result, params, "AddMul"); } @@ -114,8 +114,8 @@ class AddConcat { constexpr int64_t axis = CONCAT_AXIS; const auto concat = - std::make_shared(ov::OutputVector{add0, add1}, axis); - const auto result = std::make_shared(concat); + std::make_shared(ov::OutputVector{add0, add1}, axis); + const auto result = std::make_shared(concat); return std::make_shared(result, params, "AddConcat"); }