diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/core/CL/kernels/CLFloorKernel.cpp | 6 | ||||
-rw-r--r-- | src/core/NEON/kernels/NEFloorKernel.cpp | 6 | ||||
-rw-r--r-- | src/graph/nodes/BatchNormalizationLayer.cpp | 110 | ||||
-rw-r--r-- | src/graph/nodes/FloorLayer.cpp | 87 | ||||
-rw-r--r-- | src/graph/nodes/L2NormalizeLayer.cpp | 89 |
5 files changed, 290 insertions, 8 deletions
diff --git a/src/core/CL/kernels/CLFloorKernel.cpp b/src/core/CL/kernels/CLFloorKernel.cpp index 6c9f83f166..11f8e33319 100644 --- a/src/core/CL/kernels/CLFloorKernel.cpp +++ b/src/core/CL/kernels/CLFloorKernel.cpp @@ -44,10 +44,8 @@ void CLFloorKernel::configure(const ICLTensor *input, ICLTensor *output) { ARM_COMPUTE_ERROR_ON_NULLPTR(input, output); - set_shape_if_empty(*output->info(), input->info()->tensor_shape()); - - set_data_type_if_unknown(*input->info(), DataType::F32); - set_data_type_if_unknown(*output->info(), DataType::F32); + // Auto initialize output + auto_init_if_empty(*output->info(), input->info()->tensor_shape(), 1, input->info()->data_type(), input->info()->fixed_point_position()); ARM_COMPUTE_ERROR_ON_DATA_TYPE_CHANNEL_NOT_IN(input, 1, DataType::F32); ARM_COMPUTE_ERROR_ON_MISMATCHING_SHAPES(input, output); diff --git a/src/core/NEON/kernels/NEFloorKernel.cpp b/src/core/NEON/kernels/NEFloorKernel.cpp index dd85ac1fd6..72b652d5dc 100644 --- a/src/core/NEON/kernels/NEFloorKernel.cpp +++ b/src/core/NEON/kernels/NEFloorKernel.cpp @@ -39,10 +39,8 @@ void NEFloorKernel::configure(const ITensor *input, ITensor *output) { ARM_COMPUTE_ERROR_ON_NULLPTR(input, output); - set_shape_if_empty(*output->info(), input->info()->tensor_shape()); - - set_data_type_if_unknown(*input->info(), DataType::F32); - set_data_type_if_unknown(*output->info(), DataType::F32); + // Auto initialize output + auto_init_if_empty(*output->info(), input->info()->tensor_shape(), 1, input->info()->data_type(), input->info()->fixed_point_position()); ARM_COMPUTE_ERROR_ON_DATA_TYPE_CHANNEL_NOT_IN(input, 1, DataType::F32); ARM_COMPUTE_ERROR_ON_MISMATCHING_SHAPES(input, output); diff --git a/src/graph/nodes/BatchNormalizationLayer.cpp b/src/graph/nodes/BatchNormalizationLayer.cpp new file mode 100644 index 0000000000..a6a990fd3f --- /dev/null +++ b/src/graph/nodes/BatchNormalizationLayer.cpp @@ -0,0 +1,110 @@ +/* + * Copyright (c) 2017 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. + */ +#include "arm_compute/graph/nodes/BatchNormalizationLayer.h" + +#include "arm_compute/core/Logger.h" +#include "arm_compute/runtime/CL/CLTensor.h" +#include "arm_compute/runtime/CL/functions/CLBatchNormalizationLayer.h" +#include "arm_compute/runtime/NEON/functions/NEBatchNormalizationLayer.h" +#include "arm_compute/runtime/Tensor.h" +#include "support/ToolchainSupport.h" +#include "utils/TypePrinter.h" + +using namespace arm_compute::graph; + +namespace +{ +template <typename BatchBatchNormalizationLayer, typename TensorType, TargetHint target_hint> +std::unique_ptr<arm_compute::IFunction> instantiate_function(ITensor *input, ITensor *output, Tensor &mean, Tensor &var, Tensor &beta, Tensor &gamma, float epsilon) +{ + auto norm = arm_compute::support::cpp14::make_unique<BatchBatchNormalizationLayer>(); + norm->configure( + dynamic_cast<TensorType *>(input), + dynamic_cast<TensorType *>(output), + dynamic_cast<TensorType *>(mean.set_target(target_hint)), + dynamic_cast<TensorType *>(var.set_target(target_hint)), + dynamic_cast<TensorType *>(beta.set_target(target_hint)), + dynamic_cast<TensorType *>(gamma.set_target(target_hint)), + epsilon); + + return std::move(norm); +} + +template <TargetHint target_hint> +std::unique_ptr<arm_compute::IFunction> instantiate(ITensor *input, ITensor *output, Tensor &mean, Tensor &var, Tensor &beta, Tensor &gamma, float epsilon); + +template <> +std::unique_ptr<arm_compute::IFunction> instantiate<TargetHint::OPENCL>(ITensor *input, ITensor *output, Tensor &mean, Tensor &var, Tensor &beta, Tensor &gamma, float epsilon) +{ + return instantiate_function<arm_compute::CLBatchNormalizationLayer, arm_compute::ICLTensor, TargetHint::OPENCL>(input, output, mean, var, beta, gamma, epsilon); +} + +template <> +std::unique_ptr<arm_compute::IFunction> instantiate<TargetHint::NEON>(ITensor *input, ITensor *output, Tensor &mean, Tensor &var, Tensor &beta, Tensor &gamma, float epsilon) +{ + return instantiate_function<arm_compute::NEBatchNormalizationLayer, arm_compute::ITensor, TargetHint::NEON>(input, output, mean, var, beta, gamma, epsilon); +} +} // namespace + +std::unique_ptr<arm_compute::IFunction> BatchNormalizationLayer::instantiate_node(GraphContext &ctx, ITensor *input, ITensor *output) +{ + std::unique_ptr<arm_compute::IFunction> func; + _target_hint = ctx.hints().target_hint(); + + unsigned int batch_norm_size = input->info()->dimension(2); + if(_mean.tensor() == nullptr) + { + _mean.set_info(TensorInfo(TensorShape(batch_norm_size), input->info()->num_channels(), input->info()->data_type(), input->info()->fixed_point_position())); + } + if(_var.tensor() == nullptr) + { + _var.set_info(TensorInfo(TensorShape(batch_norm_size), input->info()->num_channels(), input->info()->data_type(), input->info()->fixed_point_position())); + } + if(_beta.tensor() == nullptr) + { + _beta.set_info(TensorInfo(TensorShape(batch_norm_size), input->info()->num_channels(), input->info()->data_type(), input->info()->fixed_point_position())); + } + if(_gamma.tensor() == nullptr) + { + _gamma.set_info(TensorInfo(TensorShape(batch_norm_size), input->info()->num_channels(), input->info()->data_type(), input->info()->fixed_point_position())); + } + + if(_target_hint == TargetHint::OPENCL) + { + func = instantiate<TargetHint::OPENCL>(input, output, _mean, _var, _beta, _gamma, _epsilon); + ARM_COMPUTE_LOG("Instantiating CLBatchNormalizationLayer"); + } + else + { + func = instantiate<TargetHint::NEON>(input, output, _mean, _var, _beta, _gamma, _epsilon); + ARM_COMPUTE_LOG("Instantiating NEBatchNormalizationLayer"); + } + + ARM_COMPUTE_LOG(" Data Type: " << input->info()->data_type() + << " Input shape: " << input->info()->tensor_shape() + << " Output shape: " << output->info()->tensor_shape() + << std::endl); + + return func; +}
\ No newline at end of file diff --git a/src/graph/nodes/FloorLayer.cpp b/src/graph/nodes/FloorLayer.cpp new file mode 100644 index 0000000000..722cfdf609 --- /dev/null +++ b/src/graph/nodes/FloorLayer.cpp @@ -0,0 +1,87 @@ +/* + * Copyright (c) 2017 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. + */ +#include "arm_compute/graph/nodes/FloorLayer.h" + +#include "arm_compute/core/Logger.h" +#include "arm_compute/runtime/CL/CLTensor.h" +#include "arm_compute/runtime/CL/functions/CLFloor.h" +#include "arm_compute/runtime/NEON/functions/NEFloor.h" +#include "arm_compute/runtime/Tensor.h" +#include "support/ToolchainSupport.h" +#include "utils/TypePrinter.h" + +using namespace arm_compute::graph; + +namespace +{ +template <typename FloorType, typename TensorType, TargetHint hint> +std::unique_ptr<arm_compute::IFunction> instantiate_function(ITensor *input, ITensor *output) +{ + auto floorlayer = arm_compute::support::cpp14::make_unique<FloorType>(); + floorlayer->configure( + dynamic_cast<TensorType *>(input), + dynamic_cast<TensorType *>(output)); + + return std::move(floorlayer); +} + +template <TargetHint target_hint> +std::unique_ptr<arm_compute::IFunction> instantiate(ITensor *input, ITensor *output); + +template <> +std::unique_ptr<arm_compute::IFunction> instantiate<TargetHint::OPENCL>(ITensor *input, ITensor *output) +{ + return instantiate_function<arm_compute::CLFloor, arm_compute::ICLTensor, TargetHint::OPENCL>(input, output); +} + +template <> +std::unique_ptr<arm_compute::IFunction> instantiate<TargetHint::NEON>(ITensor *input, ITensor *output) +{ + return instantiate_function<arm_compute::NEFloor, arm_compute::ITensor, TargetHint::NEON>(input, output); +} +} // namespace + +std::unique_ptr<arm_compute::IFunction> FloorLayer::instantiate_node(GraphContext &ctx, ITensor *input, ITensor *output) +{ + std::unique_ptr<arm_compute::IFunction> func; + _target_hint = ctx.hints().target_hint(); + + if(_target_hint == TargetHint::OPENCL) + { + func = instantiate<TargetHint::OPENCL>(input, output); + ARM_COMPUTE_LOG("Instantiating CLFloorLayer"); + } + else + { + func = instantiate<TargetHint::NEON>(input, output); + ARM_COMPUTE_LOG("Instantiating NEFloorLayer"); + } + + ARM_COMPUTE_LOG(" Data Type: " << input->info()->data_type() + << " Input shape: " << input->info()->tensor_shape() + << " Output shape: " << output->info()->tensor_shape() + << std::endl); + + return func; +} diff --git a/src/graph/nodes/L2NormalizeLayer.cpp b/src/graph/nodes/L2NormalizeLayer.cpp new file mode 100644 index 0000000000..46d1552733 --- /dev/null +++ b/src/graph/nodes/L2NormalizeLayer.cpp @@ -0,0 +1,89 @@ +/* + * Copyright (c) 2017 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. + */ +#include "arm_compute/graph/nodes/L2NormalizeLayer.h" + +#include "arm_compute/core/Logger.h" +#include "arm_compute/runtime/CL/CLTensor.h" +#include "arm_compute/runtime/CL/functions/CLL2Normalize.h" +#include "arm_compute/runtime/NEON/functions/NEL2Normalize.h" +#include "arm_compute/runtime/Tensor.h" +#include "support/ToolchainSupport.h" +#include "utils/TypePrinter.h" + +using namespace arm_compute::graph; + +namespace +{ +template <typename L2NormalizeType, typename TensorType, TargetHint hint> +std::unique_ptr<arm_compute::IFunction> instantiate_function(ITensor *input, ITensor *output, unsigned int axis, float epsilon) +{ + auto l2norm = arm_compute::support::cpp14::make_unique<L2NormalizeType>(); + l2norm->configure( + dynamic_cast<TensorType *>(input), + dynamic_cast<TensorType *>(output), + axis, + epsilon); + + return std::move(l2norm); +} + +template <TargetHint target_hint> +std::unique_ptr<arm_compute::IFunction> instantiate(ITensor *input, ITensor *output, unsigned int axis, float epsilon); + +template <> +std::unique_ptr<arm_compute::IFunction> instantiate<TargetHint::OPENCL>(ITensor *input, ITensor *output, unsigned int axis, float epsilon) +{ + return instantiate_function<arm_compute::CLL2Normalize, arm_compute::ICLTensor, TargetHint::OPENCL>(input, output, axis, epsilon); +} + +template <> +std::unique_ptr<arm_compute::IFunction> instantiate<TargetHint::NEON>(ITensor *input, ITensor *output, unsigned int axis, float epsilon) +{ + return instantiate_function<arm_compute::NEL2Normalize, arm_compute::ITensor, TargetHint::NEON>(input, output, axis, epsilon); +} +} // namespace + +std::unique_ptr<arm_compute::IFunction> L2NormalizeLayer::instantiate_node(GraphContext &ctx, ITensor *input, ITensor *output) +{ + std::unique_ptr<arm_compute::IFunction> func; + _target_hint = ctx.hints().target_hint(); + + if(_target_hint == TargetHint::OPENCL) + { + func = instantiate<TargetHint::OPENCL>(input, output, _axis, _epsilon); + ARM_COMPUTE_LOG("Instantiating CLL2NormalizeLayer"); + } + else + { + func = instantiate<TargetHint::NEON>(input, output, _axis, _epsilon); + ARM_COMPUTE_LOG("Instantiating NEL2NormalizeLayer"); + } + + ARM_COMPUTE_LOG(" Data Type: " << input->info()->data_type() + << " Input shape: " << input->info()->tensor_shape() + << " Output shape: " << output->info()->tensor_shape() + << std::endl); + + return func; +} |