diff options
| author | Anthony Barbier <anthony.barbier@arm.com> | 2018-02-19 19:36:02 +0000 |
|---|---|---|
| committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-11-02 16:47:18 +0000 |
| commit | 1fbb8120aa4f5ea2e73393421611ffea803a05b4 (patch) | |
| tree | 87d2d8e7cf220bbcf04b7ceecd9d826bade6acdf /src/runtime/MultiImage.cpp | |
| parent | 562fe0fcedace39735ead089cfdc4e2b07e40aad (diff) | |
| download | ComputeLibrary-1fbb8120aa4f5ea2e73393421611ffea803a05b4.tar.gz | |
Revert "COMPMID-582: Add validation to channel_extract kernels."
This reverts commit 9a0875951d43dda035f32d2e0728cf59d80cb4d3.
Change-Id: I6af0bc64c656f91cf1e0357f8760defa08f2e78d
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/121190
Reviewed-by: Anthony Barbier <anthony.barbier@arm.com>
Tested-by: Anthony Barbier <anthony.barbier@arm.com>
Diffstat (limited to 'src/runtime/MultiImage.cpp')
| -rw-r--r-- | src/runtime/MultiImage.cpp | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/runtime/MultiImage.cpp b/src/runtime/MultiImage.cpp index 6eba71bf1d..bdafe4c9a2 100644 --- a/src/runtime/MultiImage.cpp +++ b/src/runtime/MultiImage.cpp @@ -25,7 +25,6 @@ #include "arm_compute/core/Error.h" #include "arm_compute/core/TensorInfo.h" -#include "arm_compute/core/Utils.h" #include "arm_compute/runtime/TensorAllocator.h" using namespace arm_compute; @@ -52,8 +51,7 @@ void MultiImage::init_auto_padding(unsigned int width, unsigned int height, Form void MultiImage::internal_init(unsigned int width, unsigned int height, Format format, bool auto_padding) { - TensorShape shape = adjust_odd_shape(TensorShape{ width, height }, format); - TensorInfo info(shape, Format::U8); + TensorInfo info(width, height, Format::U8); if(auto_padding) { @@ -74,7 +72,7 @@ void MultiImage::internal_init(unsigned int width, unsigned int height, Format f case Format::YUYV422: case Format::UYVY422: { - TensorInfo info_full(shape, format); + TensorInfo info_full(width, height, format); if(auto_padding) { @@ -87,8 +85,7 @@ void MultiImage::internal_init(unsigned int width, unsigned int height, Format f case Format::NV12: case Format::NV21: { - const TensorShape shape_uv88 = calculate_subsampled_shape(shape, Format::UV88); - TensorInfo info_uv88(shape_uv88, Format::UV88); + TensorInfo info_uv88(width / 2, height / 2, Format::UV88); if(auto_padding) { @@ -101,8 +98,7 @@ void MultiImage::internal_init(unsigned int width, unsigned int height, Format f } case Format::IYUV: { - const TensorShape shape_sub2 = calculate_subsampled_shape(shape, Format::IYUV); - TensorInfo info_sub2(shape_sub2, Format::U8); + TensorInfo info_sub2(width / 2, height / 2, Format::U8); if(auto_padding) { @@ -124,7 +120,7 @@ void MultiImage::internal_init(unsigned int width, unsigned int height, Format f break; } - _info.init(shape.x(), shape.y(), format); + _info.init(width, height, format); } void MultiImage::allocate() |