diff options
Diffstat (limited to 'src/armnn')
| -rw-r--r-- | src/armnn/Network.cpp | 25 | ||||
| -rw-r--r-- | src/armnn/layers/Convolution2dLayer.hpp | 1 | ||||
| -rw-r--r-- | src/armnn/test/GraphTests.cpp | 14 |
3 files changed, 7 insertions, 33 deletions
diff --git a/src/armnn/Network.cpp b/src/armnn/Network.cpp index c4869fae04..3508ee882e 100644 --- a/src/armnn/Network.cpp +++ b/src/armnn/Network.cpp @@ -88,19 +88,6 @@ IConnectableLayer* INetwork::AddConvolution2dLayer(const Convolution2dDescriptor return pNetworkImpl->AddConvolution2dLayer(convolution2dDescriptor, name); } -ARMNN_NO_DEPRECATE_WARN_BEGIN -IConnectableLayer* INetwork::AddConvolution2dLayer(const Convolution2dDescriptor& convolution2dDescriptor, - const ConstTensor& weights, - const Optional<ConstTensor>& biases, - const char* name) -{ - return pNetworkImpl->AddConvolution2dLayer(convolution2dDescriptor, - weights, - armnn::Optional<ConstTensor>(biases), - name); -} -ARMNN_NO_DEPRECATE_WARN_END - IConnectableLayer* INetwork::AddConvolution3dLayer(const Convolution3dDescriptor& convolution3dDescriptor, const char* name) { @@ -123,18 +110,6 @@ IConnectableLayer* INetwork::AddDepthwiseConvolution2dLayer( } -ARMNN_NO_DEPRECATE_WARN_BEGIN -IConnectableLayer* INetwork::AddDepthwiseConvolution2dLayer( - const DepthwiseConvolution2dDescriptor& convolution2dDescriptor, - const ConstTensor& weights, - const Optional<ConstTensor>& biases, - const char* name) -{ - return pNetworkImpl->AddDepthwiseConvolution2dLayer(convolution2dDescriptor, weights, biases, name); -} -ARMNN_NO_DEPRECATE_WARN_END - - IConnectableLayer* INetwork::AddDequantizeLayer(const char* name) { return pNetworkImpl->AddDequantizeLayer(name); diff --git a/src/armnn/layers/Convolution2dLayer.hpp b/src/armnn/layers/Convolution2dLayer.hpp index 57999709cd..185a67252d 100644 --- a/src/armnn/layers/Convolution2dLayer.hpp +++ b/src/armnn/layers/Convolution2dLayer.hpp @@ -44,7 +44,6 @@ public: /// @return A vector to the inferred output shape. std::vector<TensorShape> InferOutputShapes(const std::vector<TensorShape>& inputShapes) const override; - void ExecuteStrategy(IStrategy& strategy) const override; void SerializeLayerParameters(ParameterStringifyFunction& fn) const override; diff --git a/src/armnn/test/GraphTests.cpp b/src/armnn/test/GraphTests.cpp index 95421c5683..eea7ae824a 100644 --- a/src/armnn/test/GraphTests.cpp +++ b/src/armnn/test/GraphTests.cpp @@ -632,13 +632,13 @@ TEST_CASE("IConnectableLayerConstantTensorsByRef") TensorInfo weightsInfo = constInfo; ConstTensor weights(weightsInfo, weightData); DepthwiseConvolution2dDescriptor desc; - ARMNN_NO_DEPRECATE_WARN_BEGIN - // GetConstantTensorsByRef() returns {m_Weights, m_Bias} so we need to use the old AddDepthwiseConvolution2dLayer() - const auto depthwiseLayer = net->AddDepthwiseConvolution2dLayer(desc, weights, EmptyOptional(), "Depthwise"); - ARMNN_NO_DEPRECATE_WARN_END - const void* resultData = depthwiseLayer->GetConstantTensorsByRef()[0].get()->GetConstTensor<void>(); - auto resultValue = reinterpret_cast<const uint8_t*>(resultData); - CHECK(resultValue[0] == 3); + + const auto weightsLayer = net->AddConstantLayer(weights); + + const void* resultDataWeights = weightsLayer->GetConstantTensorsByRef()[0].get()->GetConstTensor<void>(); + auto resultValueWeights = reinterpret_cast<const uint8_t*>(resultDataWeights); + CHECK(resultValueWeights[0] == 3); + } } |