From 67fff4adcc44506ea9cc65efc2803ab9d2c76fc8 Mon Sep 17 00:00:00 2001 From: Haiqi Pan Date: Tue, 14 Feb 2023 16:11:59 +0800 Subject: [PATCH] Fix sign-compare warnings in PDPD FE (#15635) * fix warnings in /paddle * fix bmp_reader.c * add -Wsign-compare * fix code style * fix sum.cpp * remove paddle sign-compare * fix return in input_model.cpp * fix bmp_reader.c --- samples/c/common/opencv_c_wrapper/bmp_reader.c | 2 +- samples/c/hello_nv12_input_classification/main.c | 2 +- src/frontends/paddle/CMakeLists.txt | 3 --- src/frontends/paddle/src/frontend.cpp | 2 +- src/frontends/paddle/src/input_model.cpp | 6 ++---- .../paddle/src/internal/op/conditional_block.cpp | 4 ++-- src/frontends/paddle/src/internal/op/while.cpp | 2 +- .../paddle/src/internal/pass/transform_if.cpp | 4 ++-- src/frontends/paddle/src/op/meshgrid.cpp | 2 +- src/frontends/paddle/src/op/slice_ops.hpp | 2 +- src/frontends/paddle/src/op/sum.cpp | 2 +- src/frontends/paddle/src/place.cpp | 10 ++++++---- 12 files changed, 19 insertions(+), 22 deletions(-) diff --git a/samples/c/common/opencv_c_wrapper/bmp_reader.c b/samples/c/common/opencv_c_wrapper/bmp_reader.c index 564d26c1ee8..72d4e0cf221 100644 --- a/samples/c/common/opencv_c_wrapper/bmp_reader.c +++ b/samples/c/common/opencv_c_wrapper/bmp_reader.c @@ -96,7 +96,7 @@ int readBmpImage(const char* fileName, BitMap* image) { int i; int image_height = image->height; for (i = 0; i < image_height; i++) { - unsigned int storeAt = image->infoHeader.height < 0 ? i : (unsigned int)image_height - 1 - i; + int storeAt = image->infoHeader.height < 0 ? i : image_height - 1 - i; cnt = fread(image->data + row_size * storeAt, row_size, sizeof(unsigned char), input); if (cnt != sizeof(unsigned char)) { printf("[BMP] file read error\n"); diff --git a/samples/c/hello_nv12_input_classification/main.c b/samples/c/hello_nv12_input_classification/main.c index ac6c71ec5e1..259f5931c7e 100644 --- a/samples/c/hello_nv12_input_classification/main.c +++ b/samples/c/hello_nv12_input_classification/main.c @@ -150,7 +150,7 @@ size_t read_image_from_file(const char* img_path, unsigned char* img_data, size_ if (fp) { fseek(fp, 0, SEEK_END); - if (ftell(fp) >= size) { + if ((size_t)ftell(fp) >= size) { fseek(fp, 0, SEEK_SET); read_size = fread(img_data, 1, size, fp); } diff --git a/src/frontends/paddle/CMakeLists.txt b/src/frontends/paddle/CMakeLists.txt index 8c149f99868..7cd24e56b75 100644 --- a/src/frontends/paddle/CMakeLists.txt +++ b/src/frontends/paddle/CMakeLists.txt @@ -2,9 +2,6 @@ # SPDX-License-Identifier: Apache-2.0 # -if(CMAKE_COMPILER_IS_GNUCXX) - ie_add_compiler_flags(-Wno-sign-compare) -endif() add_subdirectory(src) diff --git a/src/frontends/paddle/src/frontend.cpp b/src/frontends/paddle/src/frontend.cpp index db622cbc32b..2a7f22e36fe 100644 --- a/src/frontends/paddle/src/frontend.cpp +++ b/src/frontends/paddle/src/frontend.cpp @@ -275,7 +275,7 @@ std::map> FrontEnd::convert_each_node_recurs // TODO: figure a way to safely handle unused outputs if (named_outputs.count(port.parameter())) { const auto& ng_outputs = named_outputs.at(port.parameter()); - FRONT_END_OP_CONVERSION_CHECK(ng_outputs.size() == port.arguments_size(), + FRONT_END_OP_CONVERSION_CHECK(ng_outputs.size() == (size_t)port.arguments_size(), "The number of output tensors must be equal to " "the number of outputs of the OV node."); for (size_t idx = 0; idx < ng_outputs.size(); ++idx) { diff --git a/src/frontends/paddle/src/input_model.cpp b/src/frontends/paddle/src/input_model.cpp index a3461f974f9..2600001f222 100644 --- a/src/frontends/paddle/src/input_model.cpp +++ b/src/frontends/paddle/src/input_model.cpp @@ -163,9 +163,7 @@ bool read_tensor(std::istream& is, char* data, size_t len) { std::vector dims_struct(dims_len); is.read(&dims_struct[0], dims_len); is.read(data, len); - if (is.gcount() != len) - return false; - return true; + return (size_t)is.gcount() == len; } template @@ -365,7 +363,7 @@ void InputModel::InputModelImpl::createTempConsts() { var_place->set_partial_shape(tensor_ps); Shape shape(tensor_ps.size(), 0); - for (auto i = 0; i < tensor_ps.size(); i++) { + for (size_t i = 0; i < tensor_ps.size(); i++) { const auto& dim = tensor_ps[i]; if (dim.is_static()) { shape[i] = dim.get_length(); diff --git a/src/frontends/paddle/src/internal/op/conditional_block.cpp b/src/frontends/paddle/src/internal/op/conditional_block.cpp index 97de6d029e8..96d475ba057 100644 --- a/src/frontends/paddle/src/internal/op/conditional_block.cpp +++ b/src/frontends/paddle/src/internal/op/conditional_block.cpp @@ -48,7 +48,7 @@ std::shared_ptr op::internal::ConditionalBlock::clone_with_new_inputs(cons return make_shared(new_args.at(0), m_is_scalar_condition, m_sub_block_index, m_output_infos); } else { OutputVector inputs_args; - for (auto i = 0; i < new_args.size() - 1; i++) { + for (size_t i = 0; i < new_args.size() - 1; i++) { inputs_args.push_back(new_args[i]); } return make_shared(inputs_args, @@ -66,7 +66,7 @@ bool op::internal::ConditionalBlock::visit_attributes(AttributeVisitor& visitor) } void op::internal::ConditionalBlock::validate_and_infer_types() { - for (auto i = 0; i < m_output_infos.size(); i++) { + for (size_t i = 0; i < m_output_infos.size(); i++) { set_output_type(i, m_output_infos[i].first, m_output_infos[i].second); } } diff --git a/src/frontends/paddle/src/internal/op/while.cpp b/src/frontends/paddle/src/internal/op/while.cpp index 0806b35bd79..6d06f4fe2ec 100644 --- a/src/frontends/paddle/src/internal/op/while.cpp +++ b/src/frontends/paddle/src/internal/op/while.cpp @@ -32,7 +32,7 @@ bool op::internal::While::visit_attributes(AttributeVisitor& visitor) { } void op::internal::While::validate_and_infer_types() { - for (auto i = 0; i < m_output_infos.size(); i++) { + for (size_t i = 0; i < m_output_infos.size(); i++) { set_output_type(i, m_output_infos[i].first, m_output_infos[i].second); } } diff --git a/src/frontends/paddle/src/internal/pass/transform_if.cpp b/src/frontends/paddle/src/internal/pass/transform_if.cpp index 116e2ef0f7c..11664b84f4d 100644 --- a/src/frontends/paddle/src/internal/pass/transform_if.cpp +++ b/src/frontends/paddle/src/internal/pass/transform_if.cpp @@ -50,7 +50,7 @@ ov::frontend::paddle::pass::TransformIf::TransformIf(std::vectorget_output_size(); i++) { + for (size_t i = 0; i < then_branch->get_output_size(); i++) { const auto param = std::make_shared(then_branch->get_output_element_type(i), then_branch->get_output_partial_shape(i)); param->set_friendly_name(then_branch->get_output_op(i)->get_output_tensor(0).get_any_name()); @@ -96,7 +96,7 @@ ov::frontend::paddle::pass::TransformIf::TransformIf(std::vectorget_results(); auto then_results = then_branch->get_results(); - for (auto i = 0; i < else_results.size(); i++) { + for (size_t i = 0; i < else_results.size(); i++) { if_node->set_output(then_results[i], else_results[i]); } replace_node(conditional_block, if_node); diff --git a/src/frontends/paddle/src/op/meshgrid.cpp b/src/frontends/paddle/src/op/meshgrid.cpp index 81ce52e400e..343666edcb4 100644 --- a/src/frontends/paddle/src/op/meshgrid.cpp +++ b/src/frontends/paddle/src/op/meshgrid.cpp @@ -22,7 +22,7 @@ NamedOutputs meshgrid(const NodeContext& node) { } const auto out_shape = std::make_shared(dims, 0); OutputVector outs; - for (auto i = 0; i < inputs.size(); i++) { + for (size_t i = 0; i < inputs.size(); i++) { const auto& input = inputs[i]; const auto out = std::make_shared(input, diff --git a/src/frontends/paddle/src/op/slice_ops.hpp b/src/frontends/paddle/src/op/slice_ops.hpp index 9f8de3f7660..37026111d15 100644 --- a/src/frontends/paddle/src/op/slice_ops.hpp +++ b/src/frontends/paddle/src/op/slice_ops.hpp @@ -103,7 +103,7 @@ NamedOutputs slice_op(const NodeContext& node, const bool& stride_input) { const auto decreased_node = std::make_shared(stride_slice_node, squeeze_index_node); const auto input_rank = input_shape.rank().get_length(); - if (input_rank == decrease_axis.size()) { + if ((size_t)input_rank == decrease_axis.size()) { auto restore_node = std::make_shared( decreased_node, std::make_shared(element::i64, Shape{1}, 1), diff --git a/src/frontends/paddle/src/op/sum.cpp b/src/frontends/paddle/src/op/sum.cpp index b5955a950e8..653b68bd9a1 100644 --- a/src/frontends/paddle/src/op/sum.cpp +++ b/src/frontends/paddle/src/op/sum.cpp @@ -12,7 +12,7 @@ namespace op { NamedOutputs sum(const NodeContext& node) { auto data = node.get_ng_inputs("X"); auto sum = data[0].get_node_shared_ptr(); - for (int i = 1; i < data.size(); i++) { + for (size_t i = 1; i < data.size(); i++) { sum = std::make_shared(sum, data[i]); } return node.default_single_output_mapping({sum}, {"Out"}); diff --git a/src/frontends/paddle/src/place.cpp b/src/frontends/paddle/src/place.cpp index 29331c02f85..8a5a4663235 100644 --- a/src/frontends/paddle/src/place.cpp +++ b/src/frontends/paddle/src/place.cpp @@ -47,13 +47,14 @@ const std::map>>& OpPlace: std::shared_ptr OpPlace::get_output_port_paddle(const std::string& outputName, int outputPortIndex) const { - FRONT_END_GENERAL_CHECK(outputPortIndex <= m_output_ports.at(outputName).size(), + FRONT_END_GENERAL_CHECK((size_t)outputPortIndex <= m_output_ports.at(outputName).size(), "outputPortIndex is out of bounds."); return m_output_ports.at(outputName)[outputPortIndex]; } std::shared_ptr OpPlace::get_input_port_paddle(const std::string& inputName, int inputPortIndex) const { - FRONT_END_GENERAL_CHECK(inputPortIndex <= m_input_ports.at(inputName).size(), "inputPortIndex is out of bounds."); + FRONT_END_GENERAL_CHECK((size_t)inputPortIndex <= m_input_ports.at(inputName).size(), + "inputPortIndex is out of bounds."); return m_input_ports.at(inputName)[inputPortIndex]; } @@ -145,13 +146,14 @@ std::vector OpPlace::get_consuming_ports() const { } Place::Ptr OpPlace::get_output_port(const std::string& outputName, int outputPortIndex) const { - FRONT_END_GENERAL_CHECK(outputPortIndex <= m_output_ports.at(outputName).size(), + FRONT_END_GENERAL_CHECK((size_t)outputPortIndex <= m_output_ports.at(outputName).size(), "outputPortIndex is Out of bounds."); return m_output_ports.at(outputName)[outputPortIndex]; } Place::Ptr OpPlace::get_input_port(const std::string& inputName, int inputPortIndex) const { - FRONT_END_GENERAL_CHECK(inputPortIndex <= m_input_ports.at(inputName).size(), "inputPortIndex is out of bounds."); + FRONT_END_GENERAL_CHECK((size_t)inputPortIndex <= m_input_ports.at(inputName).size(), + "inputPortIndex is out of bounds."); return m_input_ports.at(inputName)[inputPortIndex]; }