Skip to content

Commit 0026448

Browse files
authored
Remove -Wno-error=deprecated suppression (#30132)
### Details: Fix `implicit capture of 'this' with a capture default of '=' is deprecated` warnings ### Tickets: - N/A
1 parent 4c248f6 commit 0026448

21 files changed

+19
-45
lines changed

docs/snippets/CMakeLists.txt

-4
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,6 @@ if(UNUSED_BUT_SET_VARIABLE_SUPPORTED)
1212
ov_add_compiler_flags(-Wno-unused-but-set-variable)
1313
endif()
1414

15-
if((CMAKE_COMPILER_IS_GNUCXX OR OV_COMPILER_IS_CLANG) AND CMAKE_CXX_STANDARD GREATER_EQUAL 20)
16-
set(CMAKE_CXX_FLAGS "-Wno-error=deprecated ${CMAKE_CXX_FLAGS}")
17-
endif()
18-
1915
file(GLOB SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp"
2016
"${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp"
2117
"${CMAKE_CURRENT_SOURCE_DIR}/src/*.c"

src/common/low_precision_transformations/CMakeLists.txt

-4
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,6 @@ source_group("src" FILES ${LIBRARY_SRC})
1616
source_group("include" FILES ${PUBLIC_HEADERS})
1717

1818
# Create library
19-
if((CMAKE_COMPILER_IS_GNUCXX OR OV_COMPILER_IS_CLANG) AND CMAKE_CXX_STANDARD GREATER_EQUAL 20)
20-
set(CMAKE_CXX_FLAGS "-Wno-error=deprecated ${CMAKE_CXX_FLAGS}")
21-
endif()
22-
2319
add_library(${TARGET_NAME}_obj OBJECT
2420
${LIBRARY_SRC}
2521
${PUBLIC_HEADERS})

src/common/snippets/src/pass/collapse_subgraph.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ TokenizeSnippets::TokenizeSnippets(const SnippetsTokenization::Config& config) {
232232
ov::is_type_any_of<ov::op::v0::MatMul, ov::op::v1::Transpose>(n)) &&
233233
AppropriateForSubgraph(n);
234234
});
235-
ov::graph_rewrite_callback callback = [=](ov::pass::pattern::Matcher &m) -> bool {
235+
ov::graph_rewrite_callback callback = [OV_CAPTURE_CPY_AND_THIS](ov::pass::pattern::Matcher &m) -> bool {
236236
OV_ITT_SCOPED_TASK(ov::pass::itt::domains::SnippetsTransform, "Snippets::CreateSubgraph_callback")
237237
auto node = m.get_match_root();
238238
if (transformation_callback(node)) {

src/common/transformations/CMakeLists.txt

-4
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,6 @@ source_group("src" FILES ${LIBRARY_SRC})
1616
source_group("include" FILES ${PUBLIC_HEADERS})
1717

1818
# Create library
19-
if((CMAKE_COMPILER_IS_GNUCXX OR OV_COMPILER_IS_CLANG) AND CMAKE_CXX_STANDARD GREATER_EQUAL 20)
20-
set(CMAKE_CXX_FLAGS "-Wno-error=deprecated ${CMAKE_CXX_FLAGS}")
21-
endif()
22-
2319
add_library(${TARGET_NAME}_obj OBJECT ${LIBRARY_SRC} ${PUBLIC_HEADERS})
2420
target_compile_definitions(${TARGET_NAME}_obj PRIVATE IMPLEMENT_OPENVINO_API)
2521

src/common/transformations/src/transformations/common_optimizations/activations_scaling.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ ov::pass::activations_scaling::ScaleDownSingleLayer::ScaleDownSingleLayer(float
5858
auto matmul_m = wrap_type<ov::op::v0::MatMul>({activation_m, weights_m});
5959
auto scaled_op_m = std::make_shared<Or>(OutputVector{convolution_m, matmul_m});
6060

61-
ov::matcher_pass_callback callback = [=](pattern::Matcher& m) {
61+
ov::matcher_pass_callback callback = [OV_CAPTURE_CPY_AND_THIS](pattern::Matcher& m) {
6262
const auto& pattern_map = m.get_pattern_value_map();
6363

6464
OPENVINO_ASSERT(pattern_map.count(convolution_m) || pattern_map.count(matmul_m),
@@ -189,7 +189,7 @@ ov::pass::activations_scaling::EliminateScalarMul::EliminateScalarMul() {
189189
auto shape_of_m = wrap_type<ov::op::v3::ShapeOf>({mul_m});
190190
auto norm_m = std::make_shared<Or>(OutputVector{mvn_m, rms_m, group_norm_m, shape_of_m});
191191

192-
ov::matcher_pass_callback callback = [=](pattern::Matcher& m) {
192+
ov::matcher_pass_callback callback = [OV_CAPTURE_CPY_AND_THIS](pattern::Matcher& m) {
193193
const auto& pattern_map = m.get_pattern_value_map();
194194

195195
if (transformation_callback(m.get_match_root())) {
@@ -245,7 +245,7 @@ ov::pass::activations_scaling::MulShareTransformation::MulShareTransformation()
245245
auto shape_of_m = wrap_type<ov::op::v3::ShapeOf>({any_input()});
246246
auto norm_m = std::make_shared<Or>(OutputVector{mvn_m, rms_m, group_norm_m, shape_of_m});
247247

248-
ov::matcher_pass_callback callback = [=](pattern::Matcher& m) {
248+
ov::matcher_pass_callback callback = [OV_CAPTURE_CPY_AND_THIS](pattern::Matcher& m) {
249249
const auto& pattern_map = m.get_pattern_value_map();
250250

251251
if (transformation_callback(m.get_match_root())) {
@@ -319,7 +319,7 @@ ov::pass::activations_scaling::MoveDownScalarMul::MoveDownScalarMul() {
319319
auto activation_a_m = any_input(is_non_const_node);
320320
auto mul_a_m = wrap_type<ov::op::v1::Multiply>({activation_a_m, mul_b_m});
321321

322-
ov::matcher_pass_callback callback = [=](pattern::Matcher& m) {
322+
ov::matcher_pass_callback callback = [OV_CAPTURE_CPY_AND_THIS](pattern::Matcher& m) {
323323
const auto& pattern_map = m.get_pattern_value_map();
324324

325325
if (transformation_callback(m.get_match_root())) {

src/common/transformations/src/transformations/common_optimizations/convert_pagedattn_inputs.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ ov::pass::ConvertPagedAttnInputs::ConvertPagedAttnInputs(const KVCacheConfig& co
7070
rotation_deltas,
7171
rotation_trig_lut});
7272
auto result = pa_1 | pa_2;
73-
ov::matcher_pass_callback callback = [=](ov::pass::pattern::Matcher& m) {
73+
ov::matcher_pass_callback callback = [OV_CAPTURE_CPY_AND_THIS](ov::pass::pattern::Matcher& m) {
7474
const auto pa_op = m.get_match_root();
7575
auto key_cache = ov::as_type_ptr<ov::op::v0::Parameter>(pa_op->get_input_node_shared_ptr(3));
7676
auto value_cache = ov::as_type_ptr<ov::op::v0::Parameter>(pa_op->get_input_node_shared_ptr(4));

src/common/transformations/src/transformations/common_optimizations/fq_reshape_fusion.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ ov::pass::FakeQuantizeReshapeFusion::FakeQuantizeReshapeFusion() {
4141
});
4242
});
4343

44-
ov::matcher_pass_callback callback = [=](pattern::Matcher& m) {
44+
ov::matcher_pass_callback callback = [OV_CAPTURE_CPY_AND_THIS](pattern::Matcher& m) {
4545
const auto& pattern_map = m.get_pattern_value_map();
4646
const auto& fq_node = pattern_map.at(fq_node_p).get_node_shared_ptr();
4747
const auto& reshape_node = pattern_map.at(reshape_node_p).get_node_shared_ptr();

src/common/transformations/src/transformations/common_optimizations/lstm_cell_fusion.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -554,7 +554,7 @@ ov::pass::LSTMCellFusionWithSplitWeights::LSTMCellFusionWithSplitWeights() {
554554
auto ct_activated_label = pattern::wrap_type<ov::op::v0::Relu, ov::op::v0::Sigmoid, ov::op::v0::Tanh>({ct_label});
555555
auto ht_label = pattern::wrap_type<ov::op::v1::Multiply>({ct_activated_label, ot_label});
556556

557-
matcher_pass_callback callback = [=](pattern::Matcher& m) {
557+
matcher_pass_callback callback = [OV_CAPTURE_CPY_AND_THIS](pattern::Matcher& m) {
558558
NodeRegistry rg;
559559

560560
const auto& pattern_map = m.get_pattern_value_map();

src/common/transformations/src/transformations/common_optimizations/mark_rope_input_to_keep_in_mixed_precision.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ ov::pass::MarkRopeInputsToKeepInMixedPrecision::MarkRopeInputsToKeepInMixedPreci
2323
auto sin_tab = any_input();
2424
auto rope = makePattern<ov::op::internal::RoPE>({any_input(), cos_tab, sin_tab});
2525

26-
ov::matcher_pass_callback callback = [=](ov::pass::pattern::Matcher& m) {
26+
ov::matcher_pass_callback callback = [OV_CAPTURE_CPY_AND_THIS](ov::pass::pattern::Matcher& m) {
2727
const auto& pattern_map = m.get_pattern_value_map();
2828
auto cos_input_node = pattern_map.at(cos_tab).get_node();
2929
auto sin_input_node = pattern_map.at(sin_tab).get_node();

src/common/transformations/src/transformations/common_optimizations/pull_transpose_through_fq.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ ov::pass::PullTransposeThroughFQUp::PullTransposeThroughFQUp() {
3232
auto m_transpose_perm = pattern::wrap_type<ov::op::v0::Constant>();
3333
auto m_transpose = pattern::wrap_type<ov::op::v1::Transpose>({m_fq, m_transpose_perm});
3434

35-
ov::matcher_pass_callback callback = [=](pattern::Matcher& m) {
35+
ov::matcher_pass_callback callback = [OV_CAPTURE_CPY_AND_THIS](pattern::Matcher& m) {
3636
auto& pattern_map = m.get_pattern_value_map();
3737
auto transpose = pattern_map[m_transpose].get_node_shared_ptr();
3838
auto fq = pattern_map[m_fq].get_node_shared_ptr();

src/common/transformations/src/transformations/common_optimizations/rms_fusion.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ RMSFusion::RMSFusion(bool force_tail_convert) {
8585
comp = wrap_type<ov::op::v0::Convert>({mul2});
8686
}
8787

88-
ov::matcher_pass_callback callback = [=](ov::pass::pattern::Matcher& m) {
88+
ov::matcher_pass_callback callback = [OV_CAPTURE_CPY_AND_THIS](ov::pass::pattern::Matcher& m) {
8989
const auto& pattern_map = m.get_pattern_value_map();
9090
auto node = m.get_match_root();
9191
if (transformation_callback(node)) {

src/common/transformations/src/transformations/common_optimizations/sdpa_fusion.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#include "openvino/pass/pattern/op/optional.hpp"
1818
#include "openvino/pass/pattern/op/pattern.hpp"
1919
#include "openvino/pass/pattern/op/wrap_type.hpp"
20+
#include "openvino/util/pp.hpp"
2021
#include "transformations/utils/gen_pattern.hpp"
2122

2223
namespace ov {
@@ -56,7 +57,7 @@ SDPAFusion::SDPAFusion() {
5657
q_pshape[q_head_size_idx].get_length() == k_pshape[k_head_size_idx].get_length();
5758
};
5859

59-
ov::matcher_pass_callback callback = [=](ov::pass::pattern::Matcher& m) {
60+
ov::matcher_pass_callback callback = [OV_CAPTURE_CPY_AND_THIS](ov::pass::pattern::Matcher& m) {
6061
const auto& pattern_map = m.get_pattern_value_map();
6162
if (transformation_callback(m.get_match_root())) {
6263
return false;

src/common/transformations/src/transformations/common_optimizations/sdpa_scale_fusion.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#include "openvino/op/scaled_dot_product_attention.hpp"
1515
#include "openvino/pass/pattern/op/optional.hpp"
1616
#include "openvino/pass/pattern/op/pattern.hpp"
17+
#include "openvino/util/pp.hpp"
1718
#include "transformations/utils/gen_pattern.hpp"
1819

1920
namespace ov {
@@ -42,7 +43,7 @@ SDPAScaleFusion::SDPAScaleFusion() {
4243
makePattern<ov::op::v13::ScaledDotProductAttention>({scaled_q, scaled_k, v}, {{"causal", false}});
4344
auto sdpa = sdpa_simple | sdpa_mask | sdpa_mask_scale;
4445

45-
ov::matcher_pass_callback callback = [=](ov::pass::pattern::Matcher& m) {
46+
ov::matcher_pass_callback callback = [OV_CAPTURE_CPY_AND_THIS](ov::pass::pattern::Matcher& m) {
4647
const auto& pattern_map = m.get_pattern_value_map();
4748
if (transformation_callback(m.get_match_root())) {
4849
return false;

src/common/transformations/src/transformations/op_conversions/convert_ti_to_sequences.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1156,7 +1156,7 @@ ov::pass::ConvertLoopWithSlicedInputConcatOutputToLSTMSequence::ConvertLoopWithS
11561156

11571157
auto loop_label = pattern::wrap_type<ov::op::v5::Loop>();
11581158

1159-
matcher_pass_callback callback = [=](pattern::Matcher& m) {
1159+
matcher_pass_callback callback = [OV_CAPTURE_CPY_AND_THIS](pattern::Matcher& m) {
11601160
auto loop = ov::as_type_ptr<ov::op::v5::Loop>(m.get_match_root());
11611161
if (!loop) {
11621162
return false;

src/frontends/jax/src/CMakeLists.txt

-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22
# SPDX-License-Identifier: Apache-2.0
33
#
44

5-
if((CMAKE_COMPILER_IS_GNUCXX OR OV_COMPILER_IS_CLANG) AND CMAKE_CXX_STANDARD GREATER_EQUAL 20)
6-
set(CMAKE_CXX_FLAGS "-Wno-error=deprecated ${CMAKE_CXX_FLAGS}")
7-
endif()
8-
95
ov_add_frontend(NAME jax
106
LINKABLE_FRONTEND
117
DISABLE_CPP_INSTALL

src/frontends/paddle/src/CMakeLists.txt

-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22
# SPDX-License-Identifier: Apache-2.0
33
#
44

5-
if((CMAKE_COMPILER_IS_GNUCXX OR OV_COMPILER_IS_CLANG) AND CMAKE_CXX_STANDARD GREATER_EQUAL 20)
6-
set(CMAKE_CXX_FLAGS "-Wno-error=deprecated ${CMAKE_CXX_FLAGS}")
7-
endif()
8-
95
ov_add_frontend(NAME paddle
106
LINKABLE_FRONTEND
117
PROTOBUF_REQUIRED

src/frontends/pytorch/src/CMakeLists.txt

-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22
# SPDX-License-Identifier: Apache-2.0
33
#
44

5-
if((CMAKE_COMPILER_IS_GNUCXX OR OV_COMPILER_IS_CLANG) AND CMAKE_CXX_STANDARD GREATER_EQUAL 20)
6-
set(CMAKE_CXX_FLAGS "-Wno-error=deprecated ${CMAKE_CXX_FLAGS}")
7-
endif()
8-
95
ov_add_frontend(NAME pytorch
106
LINKABLE_FRONTEND
117
SHUTDOWN_PROTOBUF

src/plugins/intel_gpu/CMakeLists.txt

-4
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,6 @@ if(OV_COMPILER_IS_INTEL_LLVM)
2222
endif()
2323
endif()
2424

25-
if((CMAKE_COMPILER_IS_GNUCXX OR OV_COMPILER_IS_CLANG) AND CMAKE_CXX_STANDARD GREATER_EQUAL 20)
26-
set(CMAKE_CXX_FLAGS "-Wno-error=deprecated ${CMAKE_CXX_FLAGS}")
27-
endif()
28-
2925
if(CMAKE_COMPILER_IS_GNUCXX)
3026
ov_add_compiler_flags(-Wno-strict-aliasing)
3127
endif()

src/plugins/intel_gpu/src/plugin/transformations/convert_stridedslices_to_variadicsplit.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ ConvertStridedSlicesToVariadicSplit::ConvertStridedSlicesToVariadicSplit() {
3838
auto bias_m = any_input();
3939
auto fully_connected_compressed_m = wrap_type<op::FullyConnectedCompressed>({data_m, weights_m, bias_m, any_input(), any_input()}, fc_predicate);
4040

41-
ov::matcher_pass_callback callback = [=](Matcher& m) {
41+
ov::matcher_pass_callback callback = [OV_CAPTURE_CPY_AND_THIS](Matcher& m) {
4242
if (transformation_callback(m.get_match_root())) {
4343
return false;
4444
}

src/plugins/intel_gpu/src/plugin/transformations/dynamic_quantize_fully_connected.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ DynamicQuantizeFullyConnected::DynamicQuantizeFullyConnected(uint64_t group_size
2828
auto fully_connected_compressed = std::make_shared<ov::pass::pattern::op::Or>(OutputVector{fully_connected_compressed3, fully_connected_compressed4});
2929

3030

31-
ov::matcher_pass_callback callback = [=](Matcher& m) {
31+
ov::matcher_pass_callback callback = [OV_CAPTURE_CPY_AND_THIS](Matcher& m) {
3232
if (transformation_callback(m.get_match_root())) {
3333
return false;
3434
}

src/plugins/intel_gpu/src/plugin/transformations_pipeline.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,7 @@ void TransformationsPipeline::apply(std::shared_ptr<ov::Model> func) {
437437
return !is_decompression_multiply(node, device_info.supports_immad);
438438
});
439439

440-
pass_config->set_callback<ov::pass::RMSFusion>([=](const_node_ptr& root) -> bool {
440+
pass_config->set_callback<ov::pass::RMSFusion>([OV_CAPTURE_CPY_AND_THIS](const_node_ptr& root) -> bool {
441441
if (!root->get_input_partial_shape(0).is_static()) {
442442
return false;
443443
}

0 commit comments

Comments
 (0)