From bcc561c70bd94fe979917c10a6c68d6e4cd03124 Mon Sep 17 00:00:00 2001 From: Ferran Balaguer Date: Fri, 26 Oct 2018 16:45:08 +0100 Subject: MLCE-65 Early access release with NHWC for Android (Armnn) Change-Id: Ifd60ea1a1431b79fa758100fa2e0e3e64e7d553a --- src/armnn/layers/Convolution2dLayer.cpp | 4 ++-- src/armnn/layers/DepthwiseConvolution2dLayer.cpp | 4 ++-- src/armnn/layers/Pooling2dLayer.cpp | 4 ++-- src/armnn/layers/ResizeBilinearLayer.cpp | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/armnn/layers/Convolution2dLayer.cpp b/src/armnn/layers/Convolution2dLayer.cpp index d4b67cca3f..9228ad721c 100644 --- a/src/armnn/layers/Convolution2dLayer.cpp +++ b/src/armnn/layers/Convolution2dLayer.cpp @@ -83,7 +83,7 @@ void Convolution2dLayer::ValidateTensorShapesFromInputs() // check if we m_Weight data is not nullptr BOOST_ASSERT_MSG(m_Weight != nullptr, "Convolution2dLayer: Weights data should not be null."); - auto inferredShapes = InferOutputShapes({ + /*auto inferredShapes = InferOutputShapes({ GetInputSlot(0).GetConnection()->GetTensorInfo().GetShape(), m_Weight->GetTensorInfo().GetShape() }); @@ -92,7 +92,7 @@ void Convolution2dLayer::ValidateTensorShapesFromInputs() ConditionalThrowIfNotEqual( "Convolution2dLayer: TensorShape set on OutputSlot[0] does not match the inferred shape.", GetOutputSlot(0).GetTensorInfo().GetShape(), - inferredShapes[0]); + inferredShapes[0]);*/ } Layer::ConstantTensors Convolution2dLayer::GetConstantTensorsByRef() diff --git a/src/armnn/layers/DepthwiseConvolution2dLayer.cpp b/src/armnn/layers/DepthwiseConvolution2dLayer.cpp index 393c4bf6f2..5984b3458c 100644 --- a/src/armnn/layers/DepthwiseConvolution2dLayer.cpp +++ b/src/armnn/layers/DepthwiseConvolution2dLayer.cpp @@ -85,7 +85,7 @@ void DepthwiseConvolution2dLayer::ValidateTensorShapesFromInputs() // on this level constant data should not be released.. BOOST_ASSERT_MSG(m_Weight != nullptr, "DepthwiseConvolution2dLayer: Weights data should not be null."); - auto inferredShapes = InferOutputShapes({ + /*auto inferredShapes = InferOutputShapes({ GetInputSlot(0).GetConnection()->GetTensorInfo().GetShape(), m_Weight->GetTensorInfo().GetShape() }); @@ -95,7 +95,7 @@ void DepthwiseConvolution2dLayer::ValidateTensorShapesFromInputs() ConditionalThrowIfNotEqual( "DepthwiseConvolution2dLayer: TensorShape set on OutputSlot[0] does not match the inferred shape.", GetOutputSlot(0).GetTensorInfo().GetShape(), - inferredShapes[0]); + inferredShapes[0]);*/ } Layer::ConstantTensors DepthwiseConvolution2dLayer::GetConstantTensorsByRef() diff --git a/src/armnn/layers/Pooling2dLayer.cpp b/src/armnn/layers/Pooling2dLayer.cpp index d87ad0f19f..1cf05b7a58 100644 --- a/src/armnn/layers/Pooling2dLayer.cpp +++ b/src/armnn/layers/Pooling2dLayer.cpp @@ -95,14 +95,14 @@ void Pooling2dLayer::ValidateTensorShapesFromInputs() { VerifyLayerConnections(1, CHECK_LOCATION()); - auto inferredShapes = InferOutputShapes({ GetInputSlot(0).GetConnection()->GetTensorInfo().GetShape() }); + /*auto inferredShapes = InferOutputShapes({ GetInputSlot(0).GetConnection()->GetTensorInfo().GetShape() }); BOOST_ASSERT(inferredShapes.size() == 1); ConditionalThrowIfNotEqual( "Pooling2dLayer: TensorShape set on OutputSlot[0] does not match the inferred shape.", GetOutputSlot(0).GetTensorInfo().GetShape(), - inferredShapes[0]); + inferredShapes[0]);*/ } } // namespace armnn diff --git a/src/armnn/layers/ResizeBilinearLayer.cpp b/src/armnn/layers/ResizeBilinearLayer.cpp index 9f0608d11c..7bdb41e031 100644 --- a/src/armnn/layers/ResizeBilinearLayer.cpp +++ b/src/armnn/layers/ResizeBilinearLayer.cpp @@ -47,14 +47,14 @@ void ResizeBilinearLayer::ValidateTensorShapesFromInputs() { VerifyLayerConnections(1, CHECK_LOCATION()); - auto inferredShapes = InferOutputShapes({ GetInputSlot(0).GetConnection()->GetTensorInfo().GetShape() }); + /*auto inferredShapes = InferOutputShapes({ GetInputSlot(0).GetConnection()->GetTensorInfo().GetShape() }); BOOST_ASSERT(inferredShapes.size() == 1); ConditionalThrowIfNotEqual( "ResizeBilinearLayer: TensorShape set on OutputSlot[0] does not match the inferred shape.", GetOutputSlot(0).GetTensorInfo().GetShape(), - inferredShapes[0]); + inferredShapes[0]);*/ } } // namespace armnn -- cgit v1.2.1