diff options
Diffstat (limited to 'src/armnn/layers')
-rw-r--r-- | src/armnn/layers/ArgMinMaxLayer.cpp | 9 | ||||
-rw-r--r-- | src/armnn/layers/BatchToSpaceNdLayer.cpp | 6 | ||||
-rw-r--r-- | src/armnn/layers/Convolution2dLayer.cpp | 7 | ||||
-rw-r--r-- | src/armnn/layers/DepthToSpaceLayer.cpp | 5 | ||||
-rw-r--r-- | src/armnn/layers/DepthwiseConvolution2dLayer.cpp | 6 | ||||
-rw-r--r-- | src/armnn/layers/PermuteLayer.cpp | 6 | ||||
-rw-r--r-- | src/armnn/layers/Pooling2dLayer.cpp | 5 | ||||
-rw-r--r-- | src/armnn/layers/ResizeLayer.cpp | 6 | ||||
-rw-r--r-- | src/armnn/layers/SpaceToBatchNdLayer.cpp | 5 | ||||
-rw-r--r-- | src/armnn/layers/SpaceToDepthLayer.cpp | 5 | ||||
-rw-r--r-- | src/armnn/layers/TransposeConvolution2dLayer.cpp | 6 |
11 files changed, 36 insertions, 30 deletions
diff --git a/src/armnn/layers/ArgMinMaxLayer.cpp b/src/armnn/layers/ArgMinMaxLayer.cpp index bfd71d519b..35bf272e41 100644 --- a/src/armnn/layers/ArgMinMaxLayer.cpp +++ b/src/armnn/layers/ArgMinMaxLayer.cpp @@ -2,13 +2,14 @@ // Copyright © 2017 Arm Ltd. All rights reserved. // SPDX-License-Identifier: MIT // -#include "ArgMinMaxLayer.hpp" +#include "ArgMinMaxLayer.hpp" #include "LayerCloneBase.hpp" -#include <TensorUtils.hpp> - #include <armnn/TypesUtils.hpp> + +#include <armnnUtils/TensorUtils.hpp> + #include <backendsCommon/WorkloadData.hpp> #include <backendsCommon/WorkloadFactory.hpp> @@ -88,4 +89,4 @@ void ArgMinMaxLayer::Accept(ILayerVisitor& visitor) const visitor.VisitArgMinMaxLayer(this, GetParameters(), GetName()); } -} // namespace armnn
\ No newline at end of file +} // namespace armnn diff --git a/src/armnn/layers/BatchToSpaceNdLayer.cpp b/src/armnn/layers/BatchToSpaceNdLayer.cpp index a168fe8bbd..335811186c 100644 --- a/src/armnn/layers/BatchToSpaceNdLayer.cpp +++ b/src/armnn/layers/BatchToSpaceNdLayer.cpp @@ -2,20 +2,20 @@ // Copyright © 2017 Arm Ltd. All rights reserved. // SPDX-License-Identifier: MIT // -#include "BatchToSpaceNdLayer.hpp" +#include "BatchToSpaceNdLayer.hpp" #include "LayerCloneBase.hpp" #include "LayerWithParameters.hpp" #include "BatchToSpaceNdLayer.hpp" #include <armnn/TypesUtils.hpp> +#include <armnnUtils/DataLayoutIndexed.hpp> + #include <backendsCommon/CpuTensorHandle.hpp> #include <backendsCommon/WorkloadData.hpp> #include <backendsCommon/WorkloadFactory.hpp> -#include <DataLayoutIndexed.hpp> - #include <numeric> using namespace armnnUtils; diff --git a/src/armnn/layers/Convolution2dLayer.cpp b/src/armnn/layers/Convolution2dLayer.cpp index 4300d55e1e..b205315b07 100644 --- a/src/armnn/layers/Convolution2dLayer.cpp +++ b/src/armnn/layers/Convolution2dLayer.cpp @@ -2,15 +2,18 @@ // Copyright © 2017 Arm Ltd. All rights reserved. // SPDX-License-Identifier: MIT // -#include "Convolution2dLayer.hpp" +#include "Convolution2dLayer.hpp" #include "LayerCloneBase.hpp" #include <armnn/TypesUtils.hpp> + +#include <armnnUtils/DataLayoutIndexed.hpp> + #include <backendsCommon/CpuTensorHandle.hpp> #include <backendsCommon/WorkloadFactory.hpp> + #include <string> -#include <DataLayoutIndexed.hpp> using namespace armnnUtils; diff --git a/src/armnn/layers/DepthToSpaceLayer.cpp b/src/armnn/layers/DepthToSpaceLayer.cpp index de01ca9868..80992fa20f 100644 --- a/src/armnn/layers/DepthToSpaceLayer.cpp +++ b/src/armnn/layers/DepthToSpaceLayer.cpp @@ -4,16 +4,15 @@ // #include "DepthToSpaceLayer.hpp" - #include "LayerCloneBase.hpp" #include <armnn/TypesUtils.hpp> +#include <armnnUtils/DataLayoutIndexed.hpp> + #include <backendsCommon/WorkloadData.hpp> #include <backendsCommon/WorkloadFactory.hpp> -#include <DataLayoutIndexed.hpp> - #include <numeric> namespace armnn diff --git a/src/armnn/layers/DepthwiseConvolution2dLayer.cpp b/src/armnn/layers/DepthwiseConvolution2dLayer.cpp index a50a0f6310..306bce57fc 100644 --- a/src/armnn/layers/DepthwiseConvolution2dLayer.cpp +++ b/src/armnn/layers/DepthwiseConvolution2dLayer.cpp @@ -2,16 +2,18 @@ // Copyright © 2017 Arm Ltd. All rights reserved. // SPDX-License-Identifier: MIT // -#include "DepthwiseConvolution2dLayer.hpp" +#include "DepthwiseConvolution2dLayer.hpp" #include "LayerCloneBase.hpp" #include <armnn/TypesUtils.hpp> +#include <armnnUtils/DataLayoutIndexed.hpp> + #include <backendsCommon/CpuTensorHandle.hpp> #include <backendsCommon/WorkloadFactory.hpp> + #include <string> -#include <DataLayoutIndexed.hpp> using namespace armnnUtils; diff --git a/src/armnn/layers/PermuteLayer.cpp b/src/armnn/layers/PermuteLayer.cpp index e6a7a38685..459a755117 100644 --- a/src/armnn/layers/PermuteLayer.cpp +++ b/src/armnn/layers/PermuteLayer.cpp @@ -2,16 +2,18 @@ // Copyright © 2017 Arm Ltd. All rights reserved. // SPDX-License-Identifier: MIT // + #include "PermuteLayer.hpp" #include "LayerCloneBase.hpp" #include <armnn/TypesUtils.hpp> + +#include <armnnUtils/Permute.hpp> + #include <backendsCommon/WorkloadData.hpp> #include <backendsCommon/WorkloadFactory.hpp> -#include <Permute.hpp> - namespace armnn { diff --git a/src/armnn/layers/Pooling2dLayer.cpp b/src/armnn/layers/Pooling2dLayer.cpp index 7c5be01c35..8f5ccb9215 100644 --- a/src/armnn/layers/Pooling2dLayer.cpp +++ b/src/armnn/layers/Pooling2dLayer.cpp @@ -2,17 +2,18 @@ // Copyright © 2017 Arm Ltd. All rights reserved. // SPDX-License-Identifier: MIT // + #include "Pooling2dLayer.hpp" #include "LayerCloneBase.hpp" #include <armnn/TypesUtils.hpp> +#include <armnnUtils/DataLayoutIndexed.hpp> + #include <backendsCommon/WorkloadData.hpp> #include <backendsCommon/WorkloadFactory.hpp> -#include <DataLayoutIndexed.hpp> - using namespace armnnUtils; namespace armnn diff --git a/src/armnn/layers/ResizeLayer.cpp b/src/armnn/layers/ResizeLayer.cpp index 44b4d9df5f..50d5f243ff 100644 --- a/src/armnn/layers/ResizeLayer.cpp +++ b/src/armnn/layers/ResizeLayer.cpp @@ -2,17 +2,17 @@ // Copyright © 2017 Arm Ltd. All rights reserved. // SPDX-License-Identifier: MIT // -#include "ResizeLayer.hpp" +#include "ResizeLayer.hpp" #include "LayerCloneBase.hpp" #include <armnn/TypesUtils.hpp> +#include <armnnUtils/DataLayoutIndexed.hpp> + #include <backendsCommon/WorkloadData.hpp> #include <backendsCommon/WorkloadFactory.hpp> -#include <DataLayoutIndexed.hpp> - using namespace armnnUtils; namespace armnn diff --git a/src/armnn/layers/SpaceToBatchNdLayer.cpp b/src/armnn/layers/SpaceToBatchNdLayer.cpp index 6d5827e771..5002160ff7 100644 --- a/src/armnn/layers/SpaceToBatchNdLayer.cpp +++ b/src/armnn/layers/SpaceToBatchNdLayer.cpp @@ -4,16 +4,15 @@ // #include "SpaceToBatchNdLayer.hpp" - #include "LayerCloneBase.hpp" #include <armnn/TypesUtils.hpp> +#include <armnnUtils/DataLayoutIndexed.hpp> + #include <backendsCommon/WorkloadData.hpp> #include <backendsCommon/WorkloadFactory.hpp> -#include <DataLayoutIndexed.hpp> - #include <numeric> using namespace armnnUtils; diff --git a/src/armnn/layers/SpaceToDepthLayer.cpp b/src/armnn/layers/SpaceToDepthLayer.cpp index 8a9f1c296c..befb940b4a 100644 --- a/src/armnn/layers/SpaceToDepthLayer.cpp +++ b/src/armnn/layers/SpaceToDepthLayer.cpp @@ -4,16 +4,15 @@ // #include "SpaceToDepthLayer.hpp" - #include "LayerCloneBase.hpp" #include <armnn/TypesUtils.hpp> +#include <armnnUtils/DataLayoutIndexed.hpp> + #include <backendsCommon/WorkloadData.hpp> #include <backendsCommon/WorkloadFactory.hpp> -#include <DataLayoutIndexed.hpp> - #include <numeric> using namespace armnnUtils; diff --git a/src/armnn/layers/TransposeConvolution2dLayer.cpp b/src/armnn/layers/TransposeConvolution2dLayer.cpp index 7bd2f3b9d8..1110e04991 100644 --- a/src/armnn/layers/TransposeConvolution2dLayer.cpp +++ b/src/armnn/layers/TransposeConvolution2dLayer.cpp @@ -2,17 +2,17 @@ // Copyright © 2017 Arm Ltd. All rights reserved. // SPDX-License-Identifier: MIT // -#include "TransposeConvolution2dLayer.hpp" +#include "TransposeConvolution2dLayer.hpp" #include "LayerCloneBase.hpp" #include <armnn/TypesUtils.hpp> +#include <armnnUtils/DataLayoutIndexed.hpp> + #include <backendsCommon/CpuTensorHandle.hpp> #include <backendsCommon/WorkloadFactory.hpp> -#include <DataLayoutIndexed.hpp> - using namespace armnnUtils; namespace armnn |