Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed compilation with clang #6917

Merged
merged 1 commit into from
Aug 4, 2021
Merged

Fixed compilation with clang #6917

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion cmake/developer_package/compile_flags/os_flags.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,8 @@ else()
elseif(UNIX)
ie_add_compiler_flags(-Wuninitialized -Winit-self)
if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
ie_add_compiler_flags(-Winconsistent-missing-override)
ie_add_compiler_flags(-Winconsistent-missing-override
-Wstring-plus-int)
else()
ie_add_compiler_flags(-Wmaybe-uninitialized)
check_cxx_compiler_flag("-Wsuggest-override" SUGGEST_OVERRIDE_SUPPORTED)
Expand Down
2 changes: 1 addition & 1 deletion inference-engine/src/gna_plugin/transformations/decompose_2d_conv.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ static std::shared_ptr<ngraph::Node> Create1DConv(const GraphData& graph_data, c
}

// Max pooling
if (graph_data.max_pool && graph_data.pool_size_width > 1 || graph_data.pool_stride_width > 1) {
if ((graph_data.max_pool && graph_data.pool_size_width > 1) || graph_data.pool_stride_width > 1) {
last_conv_block_op = std::make_shared<ngraph::opset7::MaxPool>(last_conv_block_op,
ngraph::Strides{1, graph_data.pool_stride_width}, ngraph::Shape{0, 0}, ngraph::Shape{0, 0},
ngraph::Shape{1, graph_data.pool_size_width}, graph_data.max_pool->get_rounding_type(), ngraph::op::PadType::VALID);
Expand Down
3 changes: 2 additions & 1 deletion ngraph/frontend/paddlepaddle/src/op/matrix_nms.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ namespace ngraph

auto out_names = node.get_output_names();
PDPD_ASSERT(out_names.size() == 3 || out_names.size() == 2,
"Unexpected number of outputs of MatrixNMS: " + out_names.size());
"Unexpected number of outputs of MatrixNMS: " +
std::to_string(out_names.size()));

element::Type type_num = i32;
bool return_rois_num = true;
Expand Down
2 changes: 1 addition & 1 deletion ngraph/frontend/paddlepaddle/src/op/multiclass_nms.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ namespace ngraph
PDPD_ASSERT((type_index == i32 || type_index == i64) &&
(type_num == i32 || type_num == i64),
"Unexpected data type of outputs of MulticlassNMS: " +
out_names.size());
std::to_string(out_names.size()));

auto normalized = node.get_attribute<bool>("normalized");

Expand Down