Skip to content

Commit a1a7793

Browse files
ilya-lavrenovilya-lavrenov
authored
WA for gcc-5 (opencv#77)
1 parent 5fe8fd3 commit a1a7793

34 files changed

+58
-52
lines changed

‎modules/arm_plugin/src/arm_converter/arm_converter.hpp‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -316,10 +316,12 @@ struct Converter {
316316
void* host_ptr = static_cast<void*>(hostsArgument._hosts[i]->get_data_ptr());
317317
void* tensor_ptr = static_cast<void*>(hostsArgument._tensors[i]->buffer());
318318
if (host_ptr != tensor_ptr) {
319+
IE_SUPPRESS_DEPRECATED_START
319320
hostsArgument._hosts[i] = std::make_shared<ngraph::HostTensor>(hostsArgument._hosts[i]->get_element_type(),
320321
hostsArgument._hosts[i]->get_shape(),
321322
tensor_ptr,
322323
hostsArgument._hosts[i]->get_name());
324+
IE_SUPPRESS_DEPRECATED_END
323325
}
324326
if (hostsArgument._tensors[i]->info()->has_padding()) {
325327
if (hostsArgument._type == type) {
@@ -399,10 +401,12 @@ struct Converter {
399401
Argument<ngraph::HostTensorVector> MakeArgument(ngraph::HostTensorVector& hosts) {
400402
std::vector<arm_compute::ITensor*> tensors;
401403
for (size_t i = 0; i < hosts.size(); i++) {
404+
IE_SUPPRESS_DEPRECATED_START
402405
if (_converter._layers.find(hosts[i]->get_name()) == _converter._layers.end()) {
403406
THROW_IE_EXCEPTION << "Output " << hosts[i]->get_name() << " was not allocated";
404407
}
405408
tensors.push_back(_converter._layers.at(hosts[i]->get_name())._outputs.at(i).get());
409+
IE_SUPPRESS_DEPRECATED_END
406410
}
407411
return {hosts, tensors, ArgumentType::Output};
408412
}

‎modules/arm_plugin/src/arm_converter/arm_converter_activation.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ template<> Converter::Conversion::Ptr Converter::Convert(const opset::Log& node)
8787

8888
template<> Converter::Conversion::Ptr Converter::Convert(const opset::HSigmoid& node) {
8989
auto make = [&] (auto refFunction) {
90-
return MakeConversion(refFunction, node.input(0), node.output(0), ngraph::shape_size(node.get_output_shape(0)));
90+
return this->MakeConversion(refFunction, node.input(0), node.output(0), ngraph::shape_size(node.get_output_shape(0)));
9191
};
9292
if (node.input(0).get_element_type() != ngraph::element::f32) {
9393
THROW_IE_EXCEPTION << "Unsupported Type: " << node.get_element_type();
@@ -97,7 +97,7 @@ template<> Converter::Conversion::Ptr Converter::Convert(const opset::HSigmoid&
9797

9898
template<> Converter::Conversion::Ptr Converter::Convert(const opset::Gelu& node) {
9999
auto make = [&] (auto refFunction) {
100-
return MakeConversion(refFunction, node.input(0), node.output(0), node.get_approximation_mode(), ngraph::shape_size(node.get_output_shape(0)));
100+
return this->MakeConversion(refFunction, node.input(0), node.output(0), node.get_approximation_mode(), ngraph::shape_size(node.get_output_shape(0)));
101101
};
102102
if (node.input(0).get_element_type() != ngraph::element::f32) {
103103
THROW_IE_EXCEPTION << "Unsupported Type: " << node.get_element_type();
@@ -107,7 +107,7 @@ template<> Converter::Conversion::Ptr Converter::Convert(const opset::Gelu& node
107107

108108
template<> Converter::Conversion::Ptr Converter::Convert(const opset::HardSigmoid& node) {
109109
auto make = [&] (auto refFunction, auto alpha, auto beta) {
110-
return MakeConversion(refFunction, node.input(0), alpha, beta, node.output(0), ngraph::shape_size(node.get_output_shape(0)));
110+
return this->MakeConversion(refFunction, node.input(0), alpha, beta, node.output(0), ngraph::shape_size(node.get_output_shape(0)));
111111
};
112112

113113
if (node.input(0).get_element_type() != ngraph::element::f32) {
@@ -123,7 +123,7 @@ template<> Converter::Conversion::Ptr Converter::Convert(const opset::HardSigmoi
123123

124124
template<> Converter::Conversion::Ptr Converter::Convert(const opset::Selu& node) {
125125
auto make = [&] (auto refFunction) {
126-
return MakeConversion(refFunction,
126+
return this->MakeConversion(refFunction,
127127
node.input(0),
128128
node.input(1),
129129
node.input(2),

‎modules/arm_plugin/src/arm_converter/arm_converter_arithmetic_unary.cpp‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
namespace ArmPlugin {
2222
template<> Converter::Conversion::Ptr Converter::Convert(const opset::Acos& node) {
2323
auto make = [&] (auto refFunction) {
24-
return MakeConversion(refFunction, node.input(0), node.output(0), ngraph::shape_size(node.get_output_shape(0)));
24+
return this->MakeConversion(refFunction, node.input(0), node.output(0), ngraph::shape_size(node.get_output_shape(0)));
2525
};
2626
switch (node.input(0).get_element_type()) {
2727
case ngraph::element::Type_t::f16 : return make(ngraph::runtime::reference::acos<half_float::half>);
@@ -32,7 +32,7 @@ template<> Converter::Conversion::Ptr Converter::Convert(const opset::Acos& node
3232

3333
template<> Converter::Conversion::Ptr Converter::Convert(const opset::Acosh& node) {
3434
auto make = [&] (auto refFunction) {
35-
return MakeConversion(refFunction, node.input(0), node.output(0), ngraph::shape_size(node.get_output_shape(0)));
35+
return this->MakeConversion(refFunction, node.input(0), node.output(0), ngraph::shape_size(node.get_output_shape(0)));
3636
};
3737
switch (node.input(0).get_element_type()) {
3838
case ngraph::element::Type_t::f16 : return make(ngraph::runtime::reference::acosh<half_float::half>);
@@ -43,7 +43,7 @@ template<> Converter::Conversion::Ptr Converter::Convert(const opset::Acosh& nod
4343

4444
template<> Converter::Conversion::Ptr Converter::Convert(const opset::Asin& node) {
4545
auto make = [&] (auto refFunction) {
46-
return MakeConversion(refFunction, node.input(0), node.output(0), ngraph::shape_size(node.get_output_shape(0)));
46+
return this->MakeConversion(refFunction, node.input(0), node.output(0), ngraph::shape_size(node.get_output_shape(0)));
4747
};
4848
switch (node.input(0).get_element_type()) {
4949
case ngraph::element::Type_t::f16 : return make(ngraph::runtime::reference::asin<half_float::half>);
@@ -54,7 +54,7 @@ template<> Converter::Conversion::Ptr Converter::Convert(const opset::Asin& node
5454

5555
template<> Converter::Conversion::Ptr Converter::Convert(const opset::Asinh& node) {
5656
auto make = [&] (auto refFunction) {
57-
return MakeConversion(refFunction, node.input(0), node.output(0), ngraph::shape_size(node.get_output_shape(0)));
57+
return this->MakeConversion(refFunction, node.input(0), node.output(0), ngraph::shape_size(node.get_output_shape(0)));
5858
};
5959
switch (node.input(0).get_element_type()) {
6060
case ngraph::element::Type_t::f16 : return make(ngraph::runtime::reference::asinh<half_float::half>);
@@ -65,7 +65,7 @@ template<> Converter::Conversion::Ptr Converter::Convert(const opset::Asinh& nod
6565

6666
template<> Converter::Conversion::Ptr Converter::Convert(const opset::Atan& node) {
6767
auto make = [&] (auto refFunction) {
68-
return MakeConversion(refFunction, node.input(0), node.output(0), ngraph::shape_size(node.get_output_shape(0)));
68+
return this->MakeConversion(refFunction, node.input(0), node.output(0), ngraph::shape_size(node.get_output_shape(0)));
6969
};
7070
switch (node.input(0).get_element_type()) {
7171
case ngraph::element::Type_t::f16 : return make(ngraph::runtime::reference::atan<half_float::half>);
@@ -76,7 +76,7 @@ template<> Converter::Conversion::Ptr Converter::Convert(const opset::Atan& node
7676

7777
template<> Converter::Conversion::Ptr Converter::Convert(const opset::Atanh& node) {
7878
auto make = [&] (auto refFunction) {
79-
return MakeConversion(refFunction, node.input(0), node.output(0), ngraph::shape_size(node.get_output_shape(0)));
79+
return this->MakeConversion(refFunction, node.input(0), node.output(0), ngraph::shape_size(node.get_output_shape(0)));
8080
};
8181
switch (node.input(0).get_element_type()) {
8282
case ngraph::element::Type_t::f16 : return make(ngraph::runtime::reference::atanh<half_float::half>);
@@ -87,7 +87,7 @@ template<> Converter::Conversion::Ptr Converter::Convert(const opset::Atanh& nod
8787

8888
template<> Converter::Conversion::Ptr Converter::Convert(const opset::Cos& node) {
8989
auto make = [&] (auto refFunction) {
90-
return MakeConversion(refFunction, node.input(0), node.output(0), ngraph::shape_size(node.get_output_shape(0)));
90+
return this->MakeConversion(refFunction, node.input(0), node.output(0), ngraph::shape_size(node.get_output_shape(0)));
9191
};
9292
switch (node.input(0).get_element_type()) {
9393
case ngraph::element::Type_t::f16 : return make(ngraph::runtime::reference::cos<half_float::half>);
@@ -98,7 +98,7 @@ template<> Converter::Conversion::Ptr Converter::Convert(const opset::Cos& node)
9898

9999
template<> Converter::Conversion::Ptr Converter::Convert(const opset::Cosh& node) {
100100
auto make = [&] (auto refFunction) {
101-
return MakeConversion(refFunction, node.input(0), node.output(0), ngraph::shape_size(node.get_output_shape(0)));
101+
return this->MakeConversion(refFunction, node.input(0), node.output(0), ngraph::shape_size(node.get_output_shape(0)));
102102
};
103103
switch (node.input(0).get_element_type()) {
104104
case ngraph::element::Type_t::f16 : return make(ngraph::runtime::reference::cosh<half_float::half>);
@@ -113,7 +113,7 @@ template<> Converter::Conversion::Ptr Converter::Convert(const opset::Sin& node)
113113

114114
template<> Converter::Conversion::Ptr Converter::Convert(const opset::Sinh& node) {
115115
auto make = [&] (auto refFunction) {
116-
return MakeConversion(refFunction, node.input(0), node.output(0), ngraph::shape_size(node.get_output_shape(0)));
116+
return this->MakeConversion(refFunction, node.input(0), node.output(0), ngraph::shape_size(node.get_output_shape(0)));
117117
};
118118
switch (node.input(0).get_element_type()) {
119119
case ngraph::element::Type_t::f16 : return make(ngraph::runtime::reference::sinh<half_float::half>);
@@ -124,7 +124,7 @@ template<> Converter::Conversion::Ptr Converter::Convert(const opset::Sinh& node
124124

125125
template<> Converter::Conversion::Ptr Converter::Convert(const opset::Tan& node) {
126126
auto make = [&] (auto refFunction) {
127-
return MakeConversion(refFunction, node.input(0), node.output(0), ngraph::shape_size(node.get_output_shape(0)));
127+
return this->MakeConversion(refFunction, node.input(0), node.output(0), ngraph::shape_size(node.get_output_shape(0)));
128128
};
129129
switch (node.input(0).get_element_type()) {
130130
case ngraph::element::Type_t::f16 : return make(ngraph::runtime::reference::tan<half_float::half>);
@@ -135,7 +135,7 @@ template<> Converter::Conversion::Ptr Converter::Convert(const opset::Tan& node)
135135

136136
template<> Converter::Conversion::Ptr Converter::Convert(const opset::Erf& node) {
137137
auto make = [&] (auto refFunction) {
138-
return MakeConversion(refFunction, node.input(0), node.output(0), ngraph::shape_size(node.get_output_shape(0)));
138+
return this->MakeConversion(refFunction, node.input(0), node.output(0), ngraph::shape_size(node.get_output_shape(0)));
139139
};
140140
switch (node.input(0).get_element_type()) {
141141
case ngraph::element::Type_t::f16 : return make(ngraph::runtime::reference::erf<half_float::half>);

‎modules/arm_plugin/src/arm_converter/arm_converter_concat.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ template<> Converter::Conversion::Ptr Converter::Convert(const opset::Concat& no
3434
for (const auto& input : node.inputs()) {
3535
in_shapes.push_back(input.get_shape());
3636
}
37-
return MakeConversion(refFunction,
37+
return this->MakeConversion(refFunction,
3838
node.inputs(),
3939
node.output(0),
4040
in_shapes,

‎modules/arm_plugin/src/arm_converter/arm_converter_conv_backprop_data.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ template<> Converter::Conversion::Ptr Converter::Convert(const opset::Convolutio
1212
auto out_shape = node.get_shape();
1313
ngraph::Strides in_dilation(std::vector<size_t>(node.get_input_shape(0).size() - 2));
1414
std::fill(in_dilation.begin(), in_dilation.end(), 1);
15-
return MakeConversion(refFunction,
15+
return this->MakeConversion(refFunction,
1616
node.input(0),
1717
node.input(1),
1818
node.output(0),

‎modules/arm_plugin/src/arm_converter/arm_converter_convert.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ using type = ngraph::element::Type_t;
1212
namespace ArmPlugin {
1313
template <> Converter::Conversion::Ptr Converter::Convert(const opset::Convert& node) {
1414
auto make = [&] (auto refFunction) {
15-
return MakeConversion(refFunction,
15+
return this->MakeConversion(refFunction,
1616
node.input(0),
1717
node.output(0),
1818
ngraph::shape_size(node.get_input_shape(0)));

‎modules/arm_plugin/src/arm_converter/arm_converter_convert_like.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ using type = ngraph::element::Type_t;
1212
namespace ArmPlugin {
1313
template <> Converter::Conversion::Ptr Converter::Convert(const opset::ConvertLike& node) {
1414
auto make = [&] (auto refFunction) {
15-
return MakeConversion(refFunction,
15+
return this->MakeConversion(refFunction,
1616
node.input(0),
1717
node.output(0),
1818
ngraph::shape_size(node.get_input_shape(0)));

‎modules/arm_plugin/src/arm_converter/arm_converter_ctc_greedy_decoder.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
namespace ArmPlugin {
1010
template<> Converter::Conversion::Ptr Converter::Convert(const opset::CTCGreedyDecoder& node) {
1111
auto make = [&] (auto refFunction) {
12-
return MakeConversion(refFunction,
12+
return this->MakeConversion(refFunction,
1313
node.input(0),
1414
node.input(1),
1515
node.output(0),

‎modules/arm_plugin/src/arm_converter/arm_converter_ctc_loss.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ template<> Converter::Conversion::Ptr Converter::Convert(const opset::CTCLoss& n
1313
}
1414

1515
auto make = [&] (auto refFunction) {
16-
return MakeConversion(refFunction,
16+
return this->MakeConversion(refFunction,
1717
node.input(0),
1818
node.get_input_shape(0),
1919
node.input(1),
@@ -25,7 +25,7 @@ template<> Converter::Conversion::Ptr Converter::Convert(const opset::CTCLoss& n
2525
node.get_unique(),
2626
node.output(0));
2727
};
28-
switch (node.get_input_element_type(0)) {
28+
switch (node.get_input_element_type(0)) {
2929
// case ngraph::element::Type_t::f16 :
3030
// if (node.get_input_element_type(1) == ngraph::element::i32) {
3131
// return make(ngraph::runtime::reference::CTCLoss<half_float::half, std::int32_t>);

‎modules/arm_plugin/src/arm_converter/arm_converter_cumsum.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
namespace ArmPlugin {
1010
template<> Converter::Conversion::Ptr Converter::Convert(const opset::CumSum& node) {
1111
auto make = [&] (auto refFunction) {
12-
return MakeConversion(refFunction, node.input(0), node.input(1), node.output(0),
12+
return this->MakeConversion(refFunction, node.input(0), node.input(1), node.output(0),
1313
node.get_input_shape(0), node.is_exclusive(), node.is_reverse());
1414
};
1515
switch (node.get_input_element_type(0)) {

0 commit comments

Comments
 (0)