From e950db6368788595cc6152e3554bb593acc2a6a1 Mon Sep 17 00:00:00 2001 From: Matteo Martincigh Date: Tue, 20 Nov 2018 09:34:27 +0000 Subject: IVGCVSW-2043 Merger using ACL for innermost concat axis * Fixed unsigned to signed conversion error that was breaking master Change-Id: I08d79d9bf131eb46ea0495371160698ab59c1721 --- src/armnn/layers/MergerLayer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) { -- cgit v1.2.1