diff options
author | Georgios Pinitas <georgios.pinitas@arm.com> | 2018-07-20 13:23:44 +0100 |
---|---|---|
committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-11-02 16:54:54 +0000 |
commit | e2220551b7a64b929650ba9a60529c31e70c13c5 (patch) | |
tree | 5d609887f15b4392cdade7bb388710ceafc62260 /src/graph/backends/NEON | |
parent | eff8d95991205e874091576e2d225f63246dd0bb (diff) | |
download | ComputeLibrary-e2220551b7a64b929650ba9a60529c31e70c13c5.tar.gz |
COMPMID-1367: Enable NHWC in graph examples
Change-Id: Iabc54a3a1bdcd46a9a921cda39c7c85fef672b72
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/141449
Reviewed-by: Giorgio Arena <giorgio.arena@arm.com>
Reviewed-by: Anthony Barbier <anthony.barbier@arm.com>
Tested-by: Jenkins <bsgcomp@arm.com>
Diffstat (limited to 'src/graph/backends/NEON')
-rw-r--r-- | src/graph/backends/NEON/NEFunctionFactory.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/graph/backends/NEON/NEFunctionFactory.cpp b/src/graph/backends/NEON/NEFunctionFactory.cpp index 3b7417da3f..6c912a02f1 100644 --- a/src/graph/backends/NEON/NEFunctionFactory.cpp +++ b/src/graph/backends/NEON/NEFunctionFactory.cpp @@ -102,7 +102,7 @@ std::unique_ptr<IFunction> create_convolution_layer<NEConvolutionLayerFunctions, std::shared_ptr<IMemoryManager> mm = get_memory_manager(ctx, Target::NEON); std::unique_ptr<IFunction> func; std::string func_name; - if(conv_algorithm == ConvolutionMethod::DIRECT) + if(conv_algorithm == ConvolutionMethod::Direct) { std::tie(func, func_name) = create_named_memory_managed_function<NEDirectConvolutionLayer>( std::string("DirectConvolutionLayer"), mm, input, weights, biases, output, conv_info); @@ -112,7 +112,7 @@ std::unique_ptr<IFunction> create_convolution_layer<NEConvolutionLayerFunctions, std::tie(func, func_name) = create_named_memory_managed_function<NEGEMMConvolutionLayer>( std::string("GEMMConvolutionLayer"), mm, input, weights, biases, output, conv_info); } - else if(conv_algorithm == ConvolutionMethod::WINOGRAD) + else if(conv_algorithm == ConvolutionMethod::Winograd) { std::tie(func, func_name) = create_named_memory_managed_function<NEWinogradConvolutionLayer>( std::string("WinogradConvolutionLayer"), mm, input, weights, biases, output, conv_info); @@ -183,8 +183,8 @@ std::unique_ptr<IFunction> NEFunctionFactory::create(INode *node, GraphContext & return detail::create_convolution_layer<NEConvolutionLayerFunctions, NETargetInfo>(*polymorphic_downcast<ConvolutionLayerNode *>(node), ctx); case NodeType::DeconvolutionLayer: return detail::create_deconvolution_layer<NEDeconvolutionLayer, NETargetInfo>(*polymorphic_downcast<DeconvolutionLayerNode *>(node), ctx); - case NodeType::DepthConcatenateLayer: - return detail::create_depth_concatenate_layer<NEDepthConcatenateLayer, NETargetInfo>(*polymorphic_downcast<DepthConcatenateLayerNode *>(node)); + case NodeType::ConcatenateLayer: + return detail::create_concatenate_layer<NEConcatenateLayer, NETargetInfo>(*polymorphic_downcast<ConcatenateLayerNode *>(node)); case NodeType::DepthwiseConvolutionLayer: return detail::create_depthwise_convolution_layer<NEDepthwiseConvolutionLayerFunctions, NETargetInfo>(*polymorphic_downcast<DepthwiseConvolutionLayerNode *>(node)); case NodeType::EltwiseLayer: |