aboutsummaryrefslogtreecommitdiff
path: root/src/core/NEON/kernels/NEPixelWiseMultiplicationKernel.cpp
diff options
context:
space:
mode:
authorSiCongLi <sicong.li@arm.com>2021-02-22 14:28:33 +0000
committerSiCong Li <sicong.li@arm.com>2021-03-08 09:39:03 +0000
commitc7b1e84ac5f3ada1b2f78c66979ef4d44804a955 (patch)
tree3f2dd18121727cf8000a84ed0030523ce7c0e91e /src/core/NEON/kernels/NEPixelWiseMultiplicationKernel.cpp
parentb861074c74ea99222207a4a0a71954f8852f8704 (diff)
downloadComputeLibrary-c7b1e84ac5f3ada1b2f78c66979ef4d44804a955.tar.gz
Remove usage of valid window region in NHWC CPU kernels - Part1
Replace all calculate_max_window(ValidRegion, ...) with calculate_max_window(TensorShape, ...) in CPU kernels Resolves COMPMID-4152 (1/2) Change-Id: I7403ea6b24b9e7889890839142a06439d6c8a499 Signed-off-by: SiCongLi <sicong.li@arm.com> Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/5202 Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com> Tested-by: Arm Jenkins <bsgcomp@arm.com> Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Diffstat (limited to 'src/core/NEON/kernels/NEPixelWiseMultiplicationKernel.cpp')
-rw-r--r--src/core/NEON/kernels/NEPixelWiseMultiplicationKernel.cpp20
1 files changed, 5 insertions, 15 deletions
diff --git a/src/core/NEON/kernels/NEPixelWiseMultiplicationKernel.cpp b/src/core/NEON/kernels/NEPixelWiseMultiplicationKernel.cpp
index 6661326ea8..b287e18281 100644
--- a/src/core/NEON/kernels/NEPixelWiseMultiplicationKernel.cpp
+++ b/src/core/NEON/kernels/NEPixelWiseMultiplicationKernel.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016-2020 Arm Limited.
+ * Copyright (c) 2016-2021 Arm Limited.
*
* SPDX-License-Identifier: MIT
*
@@ -1486,9 +1486,7 @@ void NEPixelWiseMultiplicationKernel::configure(ITensorInfo *input1, ITensorInfo
ARM_COMPUTE_ERROR_THROW_ON(validate_arguments(input1, input2, output, scale, overflow_policy, rounding_policy));
- const std::pair<TensorShape, ValidRegion> broadcast_pair = ITensorInfo::broadcast_shape_and_valid_region(*input1, *input2);
- const TensorShape &out_shape = broadcast_pair.first;
- const ValidRegion &valid_region = broadcast_pair.second;
+ const TensorShape &out_shape = TensorShape::broadcast_shape(input1->tensor_shape(), input2->tensor_shape());
// Auto initialize output if not initialized
set_shape_if_empty(*output, out_shape);
@@ -1624,10 +1622,7 @@ void NEPixelWiseMultiplicationKernel::configure(ITensorInfo *input1, ITensorInfo
}
// Configure kernel window
- Coordinates coord;
- coord.set_num_dimensions(output->num_dimensions());
- output->set_valid_region(valid_region);
- Window win = calculate_max_window(valid_region, Steps());
+ Window win = calculate_max_window(out_shape);
INEKernel::configure(win);
}
@@ -1692,19 +1687,14 @@ void NEComplexPixelWiseMultiplicationKernel::configure(ITensorInfo *input1, ITen
ARM_COMPUTE_ERROR_ON_NULLPTR(input1, input2, output);
ARM_COMPUTE_ERROR_THROW_ON(validate_arguments_complex(input1, input2, output));
- const std::pair<TensorShape, ValidRegion> broadcast_pair = ITensorInfo::broadcast_shape_and_valid_region(*input1, *input2);
- const TensorShape &out_shape = broadcast_pair.first;
- const ValidRegion &valid_region = broadcast_pair.second;
+ const TensorShape &out_shape = TensorShape::broadcast_shape(input1->tensor_shape(), input2->tensor_shape());
// Auto initialize output if not initialized
const TensorInfo out_info(out_shape, input1->num_channels(), input1->data_type());
auto_init_if_empty(*output, out_info);
// Configure kernel window
- Coordinates coord;
- coord.set_num_dimensions(output->num_dimensions());
- output->set_valid_region(valid_region);
- Window win = calculate_max_window(valid_region, Steps());
+ Window win = calculate_max_window(out_shape);
INEKernel::configure(win);
}