diff options
| author | Kevin DuBois <kevindubois@google.com> | 2021-02-23 17:55:18 -0800 |
|---|---|---|
| committer | Kevin DuBois <kevindubois@google.com> | 2021-02-23 19:49:18 -0800 |
| commit | c2a1825c569adf2b8f0afdb44b758924fae7fa34 (patch) | |
| tree | 711b33483fe6b3e4d894b1d9a948ebbffa79d8b7 | |
| parent | c05589415cb811c99f14137800e6d0540b6d4fe2 (diff) | |
| download | ComputeLibrary-c2a1825c569adf2b8f0afdb44b758924fae7fa34.tar.gz | |
ComputeLibrary: fix incorrect format specifier
Fixes incorrect format specifier causing build break on 32bit x86 aosp
target.
Fixes: 181071194
Test: build sc-dev arm64, arm
Test: build without-vendor x86, x86_64
Change-Id: I43634591e8ed99bd7d0a2b2831824c3773abe1ab
| -rw-r--r-- | utils/GraphUtils.cpp | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/utils/GraphUtils.cpp b/utils/GraphUtils.cpp index e543cabea..1d18fb5f9 100644 --- a/utils/GraphUtils.cpp +++ b/utils/GraphUtils.cpp @@ -273,15 +273,9 @@ bool ImageAccessor::access_tensor(ITensor &tensor) std::tie(permuted_shape, perm) = compute_permutation_parameters(tensor.info()->tensor_shape(), tensor.info()->data_layout()); } -#ifdef __arm__ 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 "].", + "Failed to load image file: dimensions [%d,%d] not correct, expected [%zu ,%zu ].", image_loader->width(), image_loader->height(), permuted_shape.x(), permuted_shape.y()); -#else // __arm__ - 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 [%" PRIu64 ",%" PRIu64 "].", - image_loader->width(), image_loader->height(), permuted_shape.x(), permuted_shape.y()); -#endif // __arm__ // Fill the tensor with the PPM content (BGR) image_loader->fill_planar_tensor(tensor, _bgr); @@ -356,15 +350,9 @@ bool ValidationInputAccessor::access_tensor(arm_compute::ITensor &tensor) tensor.info()->data_layout()); } -#ifdef __arm__ - 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()); -#else // __arm__ 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 [%" PRIu64 ",%" PRIu64 "].", + "Failed to load image file: dimensions [%d,%d] not correct, expected [%zu,%zu ].", jpeg.width(), jpeg.height(), permuted_shape.x(), permuted_shape.y()); -#endif // __arm__ // Fill the tensor with the JPEG content (BGR) jpeg.fill_planar_tensor(tensor, _bgr); |