diff options
Diffstat (limited to 'arm_compute/core')
-rw-r--r-- | arm_compute/core/NEON/NEKernels.h | 1 | ||||
-rw-r--r-- | arm_compute/core/NEON/kernels/NEMemsetKernel.h | 71 | ||||
-rw-r--r-- | arm_compute/core/utils/misc/ShapeCalculator.h | 4 |
3 files changed, 75 insertions, 1 deletions
diff --git a/arm_compute/core/NEON/NEKernels.h b/arm_compute/core/NEON/NEKernels.h index a99b7d08e1..b7810cbd51 100644 --- a/arm_compute/core/NEON/NEKernels.h +++ b/arm_compute/core/NEON/NEKernels.h @@ -94,6 +94,7 @@ #include "arm_compute/core/NEON/kernels/NEMagnitudePhaseKernel.h" #include "arm_compute/core/NEON/kernels/NEMeanStdDevKernel.h" #include "arm_compute/core/NEON/kernels/NEMedian3x3Kernel.h" +#include "arm_compute/core/NEON/kernels/NEMemsetKernel.h" #include "arm_compute/core/NEON/kernels/NEMinMaxLayerKernel.h" #include "arm_compute/core/NEON/kernels/NEMinMaxLocationKernel.h" #include "arm_compute/core/NEON/kernels/NENonLinearFilterKernel.h" diff --git a/arm_compute/core/NEON/kernels/NEMemsetKernel.h b/arm_compute/core/NEON/kernels/NEMemsetKernel.h new file mode 100644 index 0000000000..721ecf9ae2 --- /dev/null +++ b/arm_compute/core/NEON/kernels/NEMemsetKernel.h @@ -0,0 +1,71 @@ +/* + * Copyright (c) 2018-2019 ARM Limited. + * + * SPDX-License-Identifier: MIT + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +#ifndef __ARM_COMPUTE_NEMEMSETKERNEL_H__ +#define __ARM_COMPUTE_NEMEMSETKERNEL_H__ + +#include "arm_compute/core/NEON/INEKernel.h" +#include "arm_compute/core/PixelValue.h" +#include "arm_compute/core/Types.h" + +namespace arm_compute +{ +// Forward declarations +class ITensor; + +/** Interface for filling the planes of a tensor */ +class NEMemsetKernel : public INEKernel +{ +public: + const char *name() const override + { + return "NEMemsetKernel"; + } + /** Default constructor */ + NEMemsetKernel(); + /** Default destructor */ + ~NEMemsetKernel() = default; + /** Prevent instances of this class from being copied (As this class contains pointers) */ + NEMemsetKernel(const NEMemsetKernel &) = delete; + /** Prevent instances of this class from being copied (As this class contains pointers) */ + NEMemsetKernel &operator=(const NEMemsetKernel &) = delete; + /** Allow instances of this class to be moved */ + NEMemsetKernel(NEMemsetKernel &&) = default; + /** Allow instances of this class to be moved */ + NEMemsetKernel &operator=(NEMemsetKernel &&) = default; + /** Initialise the kernel's tensor and filling value + * + * @param[in,out] tensor Input tensor to fill. Supported data types: U8/S8/QASYMM8/U16/S16/F16/U32/S32/F32 + * @param[in] constant_value The value used to fill the planes of the tensor + */ + void configure(ITensor *tensor, const PixelValue &constant_value); + + // Inherited methods overridden: + void run(const Window &window, const ThreadInfo &info) override; + +private: + ITensor *_tensor; + PixelValue _constant_value; +}; +} // namespace arm_compute +#endif /*__ARM_COMPUTE_NEMEMSETKERNEL_H__ */ diff --git a/arm_compute/core/utils/misc/ShapeCalculator.h b/arm_compute/core/utils/misc/ShapeCalculator.h index 619234d306..f8a6df7fe7 100644 --- a/arm_compute/core/utils/misc/ShapeCalculator.h +++ b/arm_compute/core/utils/misc/ShapeCalculator.h @@ -1011,7 +1011,9 @@ inline TensorShape compute_padded_shape(const TensorShape &input_shape, const Pa TensorShape padded_shape = input_shape; for(size_t dim = 0; dim < padding.size(); ++dim) { - padded_shape.set(dim, padding[dim].first + input_shape[dim] + padding[dim].second); + const auto &padding_pair = padding[dim]; + const uint32_t shape_on_index = (padded_shape.num_dimensions() <= dim) ? 1 : input_shape[dim]; + padded_shape.set(dim, padding_pair.first + shape_on_index + padding_pair.second); } return padded_shape; } |