diff options
author | Michalis Spyrou <michalis.spyrou@arm.com> | 2019-10-10 14:33:47 +0100 |
---|---|---|
committer | Michalis Spyrou <michalis.spyrou@arm.com> | 2019-10-16 12:04:25 +0000 |
commit | 7c60c990fbed62aab1369c0e4462c4081dc3cfeb (patch) | |
tree | 94329c7a6214b1385b15bc5225c198fd77cec5c9 /utils/GraphUtils.cpp | |
parent | a07ce151674e28a3e755f1c48785b599f1d34827 (diff) | |
download | ComputeLibrary-7c60c990fbed62aab1369c0e4462c4081dc3cfeb.tar.gz |
COMPMID-2486: Remove disabled compiler warnings
Removed the following flags:
-Wno-format-nonliteral: This had a side effect on
Error.h that resulted in rewriting most of the macros. Since
I was at it I removed all the va_args in order to comply
with DCL50-CPP.
-Wno-deprecated-increment-bool
-Wno-vla-extension
-Wno-mismatched-tags
-Wno-redundant-move
Change-Id: I7c593854ecc3b7d595b8edcbd6a86d3c2563c6bd
Signed-off-by: Michalis Spyrou <michalis.spyrou@arm.com>
Reviewed-on: https://review.mlplatform.org/c/2069
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>
Diffstat (limited to 'utils/GraphUtils.cpp')
-rw-r--r-- | utils/GraphUtils.cpp | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/utils/GraphUtils.cpp b/utils/GraphUtils.cpp index eaa7d79778..e07e26f2fd 100644 --- a/utils/GraphUtils.cpp +++ b/utils/GraphUtils.cpp @@ -35,6 +35,7 @@ #pragma GCC diagnostic pop #include "utils/Utils.h" +#include <inttypes.h> #include <iomanip> #include <limits> @@ -258,9 +259,9 @@ bool ImageAccessor::access_tensor(ITensor &tensor) { std::tie(permuted_shape, perm) = compute_permutation_parameters(tensor.info()->tensor_shape(), tensor.info()->data_layout()); } - ARM_COMPUTE_EXIT_ON_MSG(image_loader->width() != permuted_shape.x() || image_loader->height() != permuted_shape.y(), - "Failed to load image file: dimensions [%d,%d] not correct, expected [%d,%d].", - image_loader->width(), image_loader->height(), permuted_shape.x(), permuted_shape.y()); + ARM_COMPUTE_EXIT_ON_MSG_VAR(image_loader->width() != permuted_shape.x() || image_loader->height() != permuted_shape.y(), + "Failed to load image file: dimensions [%d,%d] not correct, expected [%" PRIu32 ",%" PRIu32 "].", + image_loader->width(), image_loader->height(), permuted_shape.x(), permuted_shape.y()); // Fill the tensor with the PPM content (BGR) image_loader->fill_planar_tensor(tensor, _bgr); @@ -310,7 +311,7 @@ ValidationInputAccessor::ValidationInputAccessor(const std::string & } catch(const std::ifstream::failure &e) { - ARM_COMPUTE_ERROR("Accessing %s: %s", image_list.c_str(), e.what()); + ARM_COMPUTE_ERROR_VAR("Accessing %s: %s", image_list.c_str(), e.what()); } } @@ -334,9 +335,9 @@ bool ValidationInputAccessor::access_tensor(arm_compute::ITensor &tensor) std::tie(permuted_shape, perm) = compute_permutation_parameters(tensor.info()->tensor_shape(), tensor.info()->data_layout()); } - ARM_COMPUTE_EXIT_ON_MSG(jpeg.width() != permuted_shape.x() || jpeg.height() != permuted_shape.y(), - "Failed to load image file: dimensions [%d,%d] not correct, expected [%d,%d].", - jpeg.width(), jpeg.height(), permuted_shape.x(), permuted_shape.y()); + ARM_COMPUTE_EXIT_ON_MSG_VAR(jpeg.width() != permuted_shape.x() || jpeg.height() != permuted_shape.y(), + "Failed to load image file: dimensions [%d,%d] not correct, expected [%" PRIu32 ",%" PRIu32 "].", + jpeg.width(), jpeg.height(), permuted_shape.x(), permuted_shape.y()); // Fill the tensor with the JPEG content (BGR) jpeg.fill_planar_tensor(tensor, _bgr); @@ -383,7 +384,7 @@ ValidationOutputAccessor::ValidationOutputAccessor(const std::string &image_list } catch(const std::ifstream::failure &e) { - ARM_COMPUTE_ERROR("Accessing %s: %s", image_list.c_str(), e.what()); + ARM_COMPUTE_ERROR_VAR("Accessing %s: %s", image_list.c_str(), e.what()); } } @@ -499,7 +500,7 @@ DetectionOutputAccessor::DetectionOutputAccessor(const std::string &labels_path, } catch(const std::ifstream::failure &e) { - ARM_COMPUTE_ERROR("Accessing %s: %s", labels_path.c_str(), e.what()); + ARM_COMPUTE_ERROR_VAR("Accessing %s: %s", labels_path.c_str(), e.what()); } } @@ -570,7 +571,7 @@ TopNPredictionsAccessor::TopNPredictionsAccessor(const std::string &labels_path, } catch(const std::ifstream::failure &e) { - ARM_COMPUTE_ERROR("Accessing %s: %s", labels_path.c_str(), e.what()); + ARM_COMPUTE_ERROR_VAR("Accessing %s: %s", labels_path.c_str(), e.what()); } } |