diff options
Diffstat (limited to 'src/armnn')
-rw-r--r-- | src/armnn/LayerSupport.cpp | 16 | ||||
-rw-r--r-- | src/armnn/Network.cpp | 10 | ||||
-rw-r--r-- | src/armnn/Network.hpp | 6 | ||||
-rw-r--r-- | src/armnn/QuantizerVisitor.cpp | 2 | ||||
-rw-r--r-- | src/armnn/test/NetworkTests.cpp | 2 | ||||
-rw-r--r-- | src/armnn/test/QuantizerTest.cpp | 2 | ||||
-rw-r--r-- | src/armnn/test/TestNameAndDescriptorLayerVisitor.cpp | 4 |
7 files changed, 39 insertions, 3 deletions
diff --git a/src/armnn/LayerSupport.cpp b/src/armnn/LayerSupport.cpp index 831a846092..47a0d3ec6b 100644 --- a/src/armnn/LayerSupport.cpp +++ b/src/armnn/LayerSupport.cpp @@ -130,6 +130,18 @@ bool IsBatchToSpaceNdSupported(const BackendId& backend, descriptor); } +bool IsConcatSupported(const BackendId& backend, + std::vector<const TensorInfo*> inputs, + const TensorInfo& output, + const OriginsDescriptor& descriptor, + char* reasonIfUnsupported, + size_t reasonIfUnsupportedMaxLength) +{ + ARMNN_NO_DEPRECATE_WARN_BEGIN + return IsMergerSupported(backend, inputs, output, descriptor, reasonIfUnsupported, reasonIfUnsupportedMaxLength); + ARMNN_NO_DEPRECATE_WARN_END +} + bool IsConstantSupported(const BackendId& backend, const TensorInfo& output, char* reasonIfUnsupported, @@ -386,6 +398,7 @@ bool IsMergeSupported(const BackendId& backend, FORWARD_LAYER_SUPPORT_FUNC(backend, IsMergeSupported, input0, input1, output); } +ARMNN_DEPRECATED_MSG("Use IsConcatSupported instead") bool IsMergerSupported(const BackendId& backend, std::vector<const TensorInfo*> inputs, const TensorInfo& output, @@ -394,7 +407,10 @@ bool IsMergerSupported(const BackendId& backend, size_t reasonIfUnsupportedMaxLength) { BOOST_ASSERT(inputs.size() > 0); + + ARMNN_NO_DEPRECATE_WARN_BEGIN FORWARD_LAYER_SUPPORT_FUNC(backend, IsMergerSupported, inputs, output, descriptor); + ARMNN_NO_DEPRECATE_WARN_END } bool IsMinimumSupported(const BackendId& backend, diff --git a/src/armnn/Network.cpp b/src/armnn/Network.cpp index c3f29d4f3b..087ec0f8e9 100644 --- a/src/armnn/Network.cpp +++ b/src/armnn/Network.cpp @@ -602,6 +602,14 @@ IConnectableLayer* Network::AddFullyConnectedLayer(const FullyConnectedDescripto return AddFullyConnectedLayerImpl(fullyConnectedDescriptor, weights, optionalBiases, name); } +IConnectableLayer* Network::AddConcatLayer(const OriginsDescriptor& mergerDescriptor, + const char* name) +{ + ARMNN_NO_DEPRECATE_WARN_BEGIN + return AddMergerLayer(mergerDescriptor, name); + ARMNN_NO_DEPRECATE_WARN_END +} + IConnectableLayer* Network::AddConvolution2dLayerImpl(const Convolution2dDescriptor& convolution2dDescriptor, const ConstTensor& weights, const Optional<ConstTensor>& biases, @@ -762,7 +770,7 @@ IConnectableLayer* Network::AddMinimumLayer(const char* name) } IConnectableLayer* Network::AddMergerLayer(const OriginsDescriptor& mergerDescriptor, - const char* name) + const char* name) { return m_Graph->AddLayer<MergerLayer>(mergerDescriptor, name); } diff --git a/src/armnn/Network.hpp b/src/armnn/Network.hpp index 660ca87d13..a569a7c847 100644 --- a/src/armnn/Network.hpp +++ b/src/armnn/Network.hpp @@ -37,6 +37,9 @@ public: IConnectableLayer* AddBatchToSpaceNdLayer(const BatchToSpaceNdDescriptor& batchToSpaceNdDescriptor, const char* name = nullptr) override; + IConnectableLayer* AddConcatLayer(const OriginsDescriptor& mergerDescriptor, + const char* name = nullptr) override; + IConnectableLayer* AddConvolution2dLayer(const Convolution2dDescriptor& convolution2dDescriptor, const ConstTensor& weights, const Optional<ConstTensor>& biases, @@ -115,8 +118,9 @@ public: IConnectableLayer* AddSplitterLayer(const ViewsDescriptor& splitterDescriptor, const char* name = nullptr) override; + ARMNN_DEPRECATED_MSG("Use AddConcatLayer instead") IConnectableLayer* AddMergerLayer(const OriginsDescriptor& mergerDescriptor, - const char* name = nullptr) override; + const char* name = nullptr) override; IConnectableLayer* AddAdditionLayer(const char* name = nullptr) override; diff --git a/src/armnn/QuantizerVisitor.cpp b/src/armnn/QuantizerVisitor.cpp index c1e7c2c205..38e33cf2a3 100644 --- a/src/armnn/QuantizerVisitor.cpp +++ b/src/armnn/QuantizerVisitor.cpp @@ -267,7 +267,7 @@ void QuantizerVisitor::VisitMergerLayer(const IConnectableLayer* layer, const OriginsDescriptor& mergerDescriptor, const char* name) { - IConnectableLayer* newLayer = m_QuantizedNetwork->AddMergerLayer(mergerDescriptor, name); + IConnectableLayer* newLayer = m_QuantizedNetwork->AddConcatLayer(mergerDescriptor, name); RecordLayer(layer, newLayer); SetQuantizedInputConnections(layer, newLayer); } diff --git a/src/armnn/test/NetworkTests.cpp b/src/armnn/test/NetworkTests.cpp index dd8eb7773f..155304be36 100644 --- a/src/armnn/test/NetworkTests.cpp +++ b/src/armnn/test/NetworkTests.cpp @@ -254,7 +254,9 @@ BOOST_AUTO_TEST_CASE(NetworkModification_SplitterMerger) // Adds a merger layer. armnn::OriginsDescriptor mergerDesc(2, 4); + ARMNN_NO_DEPRECATE_WARN_BEGIN armnn::IConnectableLayer* mergerLayer = net.AddMergerLayer(mergerDesc, "merger layer"); + ARMNN_NO_DEPRECATE_WARN_END BOOST_TEST(mergerLayer); softmaxLayer1->GetOutputSlot(0).Connect(mergerLayer->GetInputSlot(0)); diff --git a/src/armnn/test/QuantizerTest.cpp b/src/armnn/test/QuantizerTest.cpp index 2103de062c..4f22317651 100644 --- a/src/armnn/test/QuantizerTest.cpp +++ b/src/armnn/test/QuantizerTest.cpp @@ -1283,7 +1283,9 @@ BOOST_AUTO_TEST_CASE(QuantizeMerger) IConnectableLayer* input2 = network->AddInputLayer(2); OriginsDescriptor descriptor(3, 1); + ARMNN_NO_DEPRECATE_WARN_BEGIN IConnectableLayer* merger = network->AddMergerLayer(descriptor); + ARMNN_NO_DEPRECATE_WARN_END IConnectableLayer* output0 = network->AddOutputLayer(3); diff --git a/src/armnn/test/TestNameAndDescriptorLayerVisitor.cpp b/src/armnn/test/TestNameAndDescriptorLayerVisitor.cpp index dbadb75a09..f94906d10d 100644 --- a/src/armnn/test/TestNameAndDescriptorLayerVisitor.cpp +++ b/src/armnn/test/TestNameAndDescriptorLayerVisitor.cpp @@ -239,7 +239,9 @@ BOOST_AUTO_TEST_CASE(CheckMergerLayerVisitorNameAndDescriptor) TestMergerLayerVisitor visitor(descriptor, layerName); Network net; + ARMNN_NO_DEPRECATE_WARN_BEGIN IConnectableLayer *const layer = net.AddMergerLayer(descriptor, layerName); + ARMNN_NO_DEPRECATE_WARN_END layer->Accept(visitor); } @@ -251,7 +253,9 @@ BOOST_AUTO_TEST_CASE(CheckMergerLayerVisitorNameNullAndDescriptor) TestMergerLayerVisitor visitor(descriptor); Network net; + ARMNN_NO_DEPRECATE_WARN_BEGIN IConnectableLayer *const layer = net.AddMergerLayer(descriptor); + ARMNN_NO_DEPRECATE_WARN_END layer->Accept(visitor); } |