diff options
Diffstat (limited to 'src/graph/nodes/PoolingLayer.cpp')
-rw-r--r-- | src/graph/nodes/PoolingLayer.cpp | 65 |
1 files changed, 11 insertions, 54 deletions
diff --git a/src/graph/nodes/PoolingLayer.cpp b/src/graph/nodes/PoolingLayer.cpp index 63579155cb..26df585e3b 100644 --- a/src/graph/nodes/PoolingLayer.cpp +++ b/src/graph/nodes/PoolingLayer.cpp @@ -23,45 +23,12 @@ */ #include "arm_compute/graph/nodes/PoolingLayer.h" -#include "arm_compute/runtime/CL/CLTensor.h" -#include "arm_compute/runtime/CL/functions/CLPoolingLayer.h" -#include "arm_compute/runtime/NEON/functions/NEPoolingLayer.h" -#include "arm_compute/runtime/Tensor.h" +#include "arm_compute/graph/NodeContext.h" +#include "arm_compute/graph/OperationRegistry.h" #include "support/ToolchainSupport.h" -#include "utils/TypePrinter.h" using namespace arm_compute::graph; -namespace -{ -template <typename PoolingType, typename TensorType, TargetHint target_hint> -std::unique_ptr<arm_compute::IFunction> instantiate_function(arm_compute::ITensor *input, arm_compute::ITensor *output, const PoolingLayerInfo &pool_info) -{ - auto pool = arm_compute::support::cpp14::make_unique<PoolingType>(); - pool->configure( - dynamic_cast<TensorType *>(input), - dynamic_cast<TensorType *>(output), - pool_info); - - return std::move(pool); -} - -template <TargetHint target_hint> -std::unique_ptr<arm_compute::IFunction> instantiate(arm_compute::ITensor *input, arm_compute::ITensor *output, const PoolingLayerInfo &pool_info); - -template <> -std::unique_ptr<arm_compute::IFunction> instantiate<TargetHint::OPENCL>(arm_compute::ITensor *input, arm_compute::ITensor *output, const PoolingLayerInfo &pool_info) -{ - return instantiate_function<arm_compute::CLPoolingLayer, arm_compute::ICLTensor, TargetHint::OPENCL>(input, output, pool_info); -} - -template <> -std::unique_ptr<arm_compute::IFunction> instantiate<TargetHint::NEON>(arm_compute::ITensor *input, arm_compute::ITensor *output, const PoolingLayerInfo &pool_info) -{ - return instantiate_function<arm_compute::NEPoolingLayer, arm_compute::ITensor, TargetHint::NEON>(input, output, pool_info); -} -} // namespace - PoolingLayer::PoolingLayer(const PoolingLayerInfo pool_info) : _pool_info(pool_info) { @@ -72,27 +39,17 @@ std::unique_ptr<arm_compute::IFunction> PoolingLayer::instantiate_node(GraphCont ARM_COMPUTE_ERROR_ON(input == nullptr || input->tensor() == nullptr); ARM_COMPUTE_ERROR_ON(output == nullptr || output->tensor() == nullptr); - std::unique_ptr<arm_compute::IFunction> func; - _target_hint = ctx.hints().target_hint(); - arm_compute::ITensor *in = input->tensor(); arm_compute::ITensor *out = output->tensor(); + _target_hint = ctx.hints().target_hint(); - if(_target_hint == TargetHint::OPENCL) - { - func = instantiate<TargetHint::OPENCL>(in, out, _pool_info); - ARM_COMPUTE_LOG_GRAPH_INFO("Instantiating CLPoolingLayer"); - } - else - { - func = instantiate<TargetHint::NEON>(in, out, _pool_info); - ARM_COMPUTE_LOG_GRAPH_INFO("Instantiating NEPoolingLayer"); - } - - ARM_COMPUTE_LOG_GRAPH_INFO(" Data Type: " << in->info()->data_type() - << " Input shape: " << in->info()->tensor_shape() - << " Output shape: " << out->info()->tensor_shape() - << " Pooling info: " << _pool_info << std::endl); + // Create node context + NodeContext node_ctx(OperationType::PoolingLayer); + node_ctx.set_target(_target_hint); + node_ctx.add_input(in); + node_ctx.add_output(out); + node_ctx.add_parameter<PoolingLayerInfo>("PoolingLayerInfo", _pool_info); - return func; + // Get function + return OperationRegistry::get().find_operation(OperationType::PoolingLayer, _target_hint)->configure(node_ctx); } |