aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatteo Martincigh <matteo.martincigh@arm.com>2018-11-20 09:34:27 +0000
committerMatteo Martincigh <matteo.martincigh@arm.com>2018-11-20 09:35:53 +0000
commite950db6368788595cc6152e3554bb593acc2a6a1 (patch)
treee7b80013cee2f56116c055320571e4c597e0af2b
parentdea72860f9b41242d9c903d3e576a1358e459d49 (diff)
downloadarmnn-e950db6368788595cc6152e3554bb593acc2a6a1.tar.gz
IVGCVSW-2043 Merger using ACL for innermost concat axis
* Fixed unsigned to signed conversion error that was breaking master Change-Id: I08d79d9bf131eb46ea0495371160698ab59c1721
-rw-r--r--src/armnn/layers/MergerLayer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/armnn/layers/MergerLayer.cpp b/src/armnn/layers/MergerLayer.cpp
index 545c7e0e0e..85dc0e7609 100644
--- a/src/armnn/layers/MergerLayer.cpp
+++ b/src/armnn/layers/MergerLayer.cpp
@@ -41,7 +41,7 @@ void MergerLayer::CreateTensorHandles(Graph& graph, const IWorkloadFactory& fact
//are made subtensors of the output of the merger layer.
m_OutputHandlers[0].CreateTensorHandles(factory);
- signed long innerAxis = m_Param.GetNumDimensions() - m_Param.GetConcatAxis();
+ unsigned int innerAxis = m_Param.GetNumDimensions() - m_Param.GetConcatAxis();
if (factory.SupportsSubTensors() && innerAxis != 1)
{