diff options
| author | Matthew Sloyan <matthew.sloyan@arm.com> | 2021-05-07 14:18:01 +0000 |
|---|---|---|
| committer | Matthew Sloyan <matthew.sloyan@arm.com> | 2021-05-07 17:01:11 +0000 |
| commit | ae12306486efc55293a40048618abe5e8b19151b (patch) | |
| tree | c2aaadcbe987885a3ed5629f36759b1ff9c62c86 /src/backends/cl/ClBackend.cpp | |
| parent | 67ac7fac3453fbeaa146a5b52f688a5b804296c2 (diff) | |
| download | armnn-ae12306486efc55293a40048618abe5e8b19151b.tar.gz | |
Revert "MLCE-418 Reduce layer does not support multiple axes"
This reverts commit d905decd256558bbee165e636ce4242ac3b9c917.
Reason for revert: LargeGraph_TENSOR_FLOAT32/FLOAT16 CTS tests failures
Change-Id: Ie69826549e73775825f45134375b5b2c41aebd01
Diffstat (limited to 'src/backends/cl/ClBackend.cpp')
| -rw-r--r-- | src/backends/cl/ClBackend.cpp | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/src/backends/cl/ClBackend.cpp b/src/backends/cl/ClBackend.cpp index 92a06aa8e1..f97cb4bba8 100644 --- a/src/backends/cl/ClBackend.cpp +++ b/src/backends/cl/ClBackend.cpp @@ -29,7 +29,6 @@ #include "workloads/ClDivisionWorkload.hpp" #include "workloads/ClFullyConnectedWorkload.hpp" #include "workloads/ClMultiplicationWorkload.hpp" -#include "workloads/ClReduceWorkload.hpp" #include "workloads/ClSubtractionWorkload.hpp" #include <Optimizer.hpp> @@ -189,8 +188,7 @@ OptimizationViews ClBackend::OptimizeSubgraphView(const SubgraphView& subgraph, if ((base.GetType() == LayerType::DepthwiseConvolution2d || base.GetType() == LayerType::Convolution2d || base.GetType() == LayerType::BatchNormalization || base.GetType() == LayerType::FullyConnected || base.GetType() == LayerType::Addition || base.GetType() == LayerType::Multiplication - || base.GetType() == LayerType::Subtraction || base.GetType() == LayerType::Division - || base.GetType() == LayerType::Reduce) + || base.GetType() == LayerType::Subtraction || base.GetType() == LayerType::Division) && (base.GetAdditionalInformation<ActivationDescriptor>() == nullptr)) { for (auto output = base.BeginOutputSlots(); output != base.EndOutputSlots(); ++output) @@ -414,26 +412,6 @@ OptimizationViews ClBackend::OptimizeSubgraphView(const SubgraphView& subgraph, } } } - - // Separate check for Reduce as we aren't fusing with activation layer - if (base.GetType() == LayerType::Reduce) - { - ReduceLayer* baseLayer = PolymorphicDowncast<ReduceLayer*>(&base); - - // Get params from base layer - ReduceDescriptor reduceDescriptor = baseLayer->GetParameters(); - - arm_compute::Status status = ClReduceWorkloadValidate( - baseLayer->GetInputSlot(0).GetConnectedOutputSlot()->GetTensorInfo(), - baseLayer->GetOutputSlot(0).GetTensorInfo(), - reduceDescriptor); - - if (status) - { - ChainReduceLayers<ReduceLayer>(optimizationViews, baseLayer, reduceDescriptor); - untouched.erase(baseLayer->GetGuid()); - } - } } } } |