diff options
| author | Matteo Martincigh <matteo.martincigh@arm.com> | 2019-01-11 13:25:59 +0000 |
|---|---|---|
| committer | Matteo Martincigh <matteo.martincigh@arm.com> | 2019-01-15 08:59:50 +0000 |
| commit | 4912402497a51c6afe0898b3900f87feefa006a6 (patch) | |
| tree | 4e9b5161781d2b0be041aec17227193da5977443 /src/armnn/layers/MergerLayer.cpp | |
| parent | d0a1608e2c41639d8f3e3f9305d79c5f92c9cff8 (diff) | |
| download | armnn-4912402497a51c6afe0898b3900f87feefa006a6.tar.gz | |
IVGCVSW-2454 Merge together the pluggable backends work (was in a
separate branch) and master
* Brings in all the changes done for the pluggable backends
* Added sub-graph support and tests
* Added precompiled layer support and tests
* Moved BackendSettings to a separate file
* Removed the backend-specific code
* Ported DebugLayer and associated functionality
* Included fixes to make those changes work with master
Change-Id: Id7028fa7917527b844628d5aff5732e3d94c0488
Diffstat (limited to 'src/armnn/layers/MergerLayer.cpp')
| -rw-r--r-- | src/armnn/layers/MergerLayer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/armnn/layers/MergerLayer.cpp b/src/armnn/layers/MergerLayer.cpp index 85dc0e7609..b4b5d3c2ef 100644 --- a/src/armnn/layers/MergerLayer.cpp +++ b/src/armnn/layers/MergerLayer.cpp @@ -180,7 +180,7 @@ void MergerLayer::ValidateTensorShapesFromInputs() VerifyLayerConnections(m_Param.GetNumViews(), CHECK_LOCATION()); std::vector<TensorShape> inputShapes; - for (uint i = 0; i < GetNumInputSlots(); ++i) + for (unsigned int i = 0; i < GetNumInputSlots(); ++i) { inputShapes.push_back(GetInputSlot(i).GetConnection()->GetTensorInfo().GetShape()); } |