diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/armnn/BackendHelper.hpp | 15 | ||||
-rw-r--r-- | include/armnn/BackendRegistry.hpp | 12 | ||||
-rw-r--r-- | include/armnn/Descriptors.hpp | 14 | ||||
-rw-r--r-- | include/armnn/Logging.hpp | 9 | ||||
-rw-r--r-- | include/armnn/Tensor.hpp | 6 | ||||
-rw-r--r-- | include/armnn/Threadpool.hpp | 15 | ||||
-rw-r--r-- | include/armnn/TypesUtils.hpp | 6 | ||||
-rw-r--r-- | include/armnn/Utils.hpp | 6 | ||||
-rw-r--r-- | include/armnn/backends/DynamicBackend.hpp | 6 | ||||
-rw-r--r-- | include/armnn/backends/ITensorHandleFactory.hpp | 10 | ||||
-rw-r--r-- | include/armnn/backends/OptimizationViews.hpp | 5 | ||||
-rw-r--r-- | include/armnn/backends/SubgraphView.hpp | 14 | ||||
-rw-r--r-- | include/armnnTestUtils/MockBackend.hpp | 37 | ||||
-rw-r--r-- | include/armnnTestUtils/MockTensorHandle.hpp | 6 | ||||
-rw-r--r-- | include/armnnTestUtils/TensorCopyUtils.hpp | 9 | ||||
-rw-r--r-- | include/armnnUtils/Filesystem.hpp | 4 | ||||
-rw-r--r-- | include/armnnUtils/Permute.hpp | 4 | ||||
-rw-r--r-- | include/armnnUtils/TensorUtils.hpp | 11 | ||||
-rw-r--r-- | include/armnnUtils/Transpose.hpp | 3 |
19 files changed, 144 insertions, 48 deletions
diff --git a/include/armnn/BackendHelper.hpp b/include/armnn/BackendHelper.hpp index 2f8eabde6b..cf60b01ddd 100644 --- a/include/armnn/BackendHelper.hpp +++ b/include/armnn/BackendHelper.hpp @@ -1,5 +1,5 @@ // -// Copyright © 2017 Arm Ltd. All rights reserved. +// Copyright © 2017,2022 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // @@ -7,11 +7,20 @@ #include <armnn/BackendId.hpp> #include <armnn/BackendOptions.hpp> -#include <armnn/backends/ILayerSupport.hpp> -#include <armnn/Types.hpp> +#include <armnn/Descriptors.hpp> +#include <armnn/Optional.hpp> +#include <functional> +#include <memory> +#include <string> +#include <utility> +#include <vector> namespace armnn { +class ILayerSupport; +class TensorInfo; +struct LstmInputParamsInfo; +struct QuantizedLstmInputParamsInfo; // This handle calls its own IsXXXLayerSupported() functions which then call the polymorphic // ILayerSupport::IsXXXLayerSupported() at the framework level so there is no risk of VTable misalignment. diff --git a/include/armnn/BackendRegistry.hpp b/include/armnn/BackendRegistry.hpp index 40a117ea48..ea23091ad3 100644 --- a/include/armnn/BackendRegistry.hpp +++ b/include/armnn/BackendRegistry.hpp @@ -1,19 +1,16 @@ // -// Copyright © 2017 Arm Ltd. All rights reserved. +// Copyright © 2017,2022 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // #pragma once -#include <armnn/Types.hpp> #include <armnn/BackendId.hpp> #include <armnn/Optional.hpp> -#include <armnn/backends/ICustomAllocator.hpp> -#include <armnn/backends/IMemoryOptimizerStrategy.hpp> - -#include <algorithm> #include <memory> #include <unordered_map> #include <functional> +#include <stddef.h> +#include <string> namespace arm { @@ -29,6 +26,9 @@ namespace armnn { class IBackendInternal; +class ICustomAllocator; +class IMemoryOptimizerStrategy; + using IBackendInternalUniquePtr = std::unique_ptr<IBackendInternal>; using MemoryOptimizerStrategiesMapRef = std::unordered_map<BackendId, std::shared_ptr<IMemoryOptimizerStrategy>>; diff --git a/include/armnn/Descriptors.hpp b/include/armnn/Descriptors.hpp index 1cc403cf99..7c6942ce58 100644 --- a/include/armnn/Descriptors.hpp +++ b/include/armnn/Descriptors.hpp @@ -5,15 +5,15 @@ #pragma once #include "Deprecated.hpp" -#include "DescriptorsFwd.hpp" - -#include <cstdint> -#include <initializer_list> -#include <iostream> -#include <sstream> - +#include "DescriptorsFwd.hpp" // Required for class equivalence declarations. #include "Tensor.hpp" #include "Types.hpp" +#include <armnn/Exceptions.hpp> + +#include <cstdint> +#include <iterator> +#include <utility> +#include <vector> namespace armnn { diff --git a/include/armnn/Logging.hpp b/include/armnn/Logging.hpp index 6336e96d8c..ca52b5c98f 100644 --- a/include/armnn/Logging.hpp +++ b/include/armnn/Logging.hpp @@ -1,13 +1,20 @@ // -// Copyright © 2019 Arm Ltd and Contributors. All rights reserved. +// Copyright © 2019,2022 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // #pragma once #include <armnn/Utils.hpp> +#include <ctype.h> #include <iostream> #include <algorithm> +#include <memory> +#include <string> +#include <utility> +#include <vector> + +#include <armnn/Exceptions.hpp> namespace armnn { diff --git a/include/armnn/Tensor.hpp b/include/armnn/Tensor.hpp index 8dbc9127b2..46859c4887 100644 --- a/include/armnn/Tensor.hpp +++ b/include/armnn/Tensor.hpp @@ -1,18 +1,18 @@ // -// Copyright © 2017 Arm Ltd. All rights reserved. +// Copyright © 2017,2022 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // #pragma once -#include "TensorFwd.hpp" - #include "Exceptions.hpp" #include "Optional.hpp" #include "Types.hpp" +#include <stdint.h> #include <array> #include <initializer_list> #include <vector> +#include <utility> namespace armnn { diff --git a/include/armnn/Threadpool.hpp b/include/armnn/Threadpool.hpp index 672f8b8de6..98a907dd15 100644 --- a/include/armnn/Threadpool.hpp +++ b/include/armnn/Threadpool.hpp @@ -1,27 +1,32 @@ // -// Copyright © 2021 Arm Ltd and Contributors. All rights reserved. +// Copyright © 2021-2022 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // #if !defined(ARMNN_DISABLE_THREADS) #pragma once +#include "IRuntime.hpp" #include <armnn/Tensor.hpp> #include <armnn/Types.hpp> - -#include "INetwork.hpp" -#include "IRuntime.hpp" - +#include <stdint.h> #include <thread> #include <mutex> #include <condition_variable> #include <unordered_map> #include <queue> +#include <iosfwd> +#include <memory> +#include <tuple> +#include <vector> namespace armnn { namespace experimental { +class IAsyncExecutionCallback; +class IWorkingMemHandle; + class Threadpool { public: diff --git a/include/armnn/TypesUtils.hpp b/include/armnn/TypesUtils.hpp index ca7e7c58ac..4dd5360591 100644 --- a/include/armnn/TypesUtils.hpp +++ b/include/armnn/TypesUtils.hpp @@ -1,15 +1,19 @@ // -// Copyright © 2017 Arm Ltd. All rights reserved. +// Copyright © 2017,2022 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // #pragma once +#include <armnn/BackendId.hpp> +#include <armnn/Exceptions.hpp> #include <armnn/Tensor.hpp> #include <armnn/Types.hpp> +#include <stdint.h> #include <cmath> #include <ostream> #include <set> +#include <type_traits> namespace armnn { diff --git a/include/armnn/Utils.hpp b/include/armnn/Utils.hpp index 7d442ba4b5..7c1f096823 100644 --- a/include/armnn/Utils.hpp +++ b/include/armnn/Utils.hpp @@ -1,12 +1,10 @@ // -// Copyright © 2017 Arm Ltd. All rights reserved. +// Copyright © 2017,2022 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // #pragma once -#include <armnn/TypesUtils.hpp> - -#include <iostream> +#include <string> namespace armnn { diff --git a/include/armnn/backends/DynamicBackend.hpp b/include/armnn/backends/DynamicBackend.hpp index f888b1e27e..fd121bfaab 100644 --- a/include/armnn/backends/DynamicBackend.hpp +++ b/include/armnn/backends/DynamicBackend.hpp @@ -1,16 +1,18 @@ // -// Copyright © 2017 Arm Ltd. All rights reserved. +// Copyright © 2017,2022 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // #pragma once #include "IBackendInternal.hpp" - #include <armnn/BackendRegistry.hpp> +#include <armnn/BackendId.hpp> +#include <stdint.h> #include <functional> #include <memory> +#include <string> namespace armnn { diff --git a/include/armnn/backends/ITensorHandleFactory.hpp b/include/armnn/backends/ITensorHandleFactory.hpp index 501d97b852..b10ff66783 100644 --- a/include/armnn/backends/ITensorHandleFactory.hpp +++ b/include/armnn/backends/ITensorHandleFactory.hpp @@ -1,19 +1,23 @@ // -// Copyright © 2017 Arm Ltd. All rights reserved. +// Copyright © 2017,2022 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // #pragma once #include "ITensorHandle.hpp" - -#include <armnn/IRuntime.hpp> #include <armnn/MemorySources.hpp> +#include <armnn/Tensor.hpp> #include <armnn/Types.hpp> #include <armnn/utility/IgnoreUnused.hpp> +#include <memory> +#include <string> +#include <vector> + namespace armnn { +class IConnectableLayer; /// Capability class to calculate in the GetCapabilities function /// so that only the capability in the scope can be choose to calculate diff --git a/include/armnn/backends/OptimizationViews.hpp b/include/armnn/backends/OptimizationViews.hpp index 110c5f7492..0357adaa27 100644 --- a/include/armnn/backends/OptimizationViews.hpp +++ b/include/armnn/backends/OptimizationViews.hpp @@ -5,7 +5,12 @@ #pragma once +#include <armnn/BackendOptions.hpp> +#include <armnn/Deprecated.hpp> +#include <armnn/INetwork.hpp> #include <armnn/backends/SubgraphView.hpp> +#include <vector> +#include "Graph.hpp" namespace armnn { diff --git a/include/armnn/backends/SubgraphView.hpp b/include/armnn/backends/SubgraphView.hpp index 63a9f57cc7..777311747a 100644 --- a/include/armnn/backends/SubgraphView.hpp +++ b/include/armnn/backends/SubgraphView.hpp @@ -1,18 +1,26 @@ // -// Copyright © 2017 Arm Ltd. All rights reserved. +// Copyright © 2017,2022 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // #pragma once -#include <Layer.hpp> -#include <Graph.hpp> +#include <armnn/Deprecated.hpp> #include <vector> #include <list> +#include <iterator> +#include <memory> namespace armnn { +class Graph; +class IConnectableLayer; +class IInputSlot; +class IOutputSlot; +class InputSlot; +class Layer; +class OutputSlot; /// /// The SubgraphView class represents a subgraph of a Graph. diff --git a/include/armnnTestUtils/MockBackend.hpp b/include/armnnTestUtils/MockBackend.hpp index 398ba91e0e..e5378bf74a 100644 --- a/include/armnnTestUtils/MockBackend.hpp +++ b/include/armnnTestUtils/MockBackend.hpp @@ -4,15 +4,48 @@ // #pragma once -#include <atomic> - +#include <armnn/Deprecated.hpp> +#include <armnn/Descriptors.hpp> +#include <armnn/Exceptions.hpp> +#include <armnn/IRuntime.hpp> +#include <armnn/Optional.hpp> +#include <armnn/Tensor.hpp> +#include <armnn/Types.hpp> #include <armnn/backends/IBackendInternal.hpp> #include <armnn/backends/MemCopyWorkload.hpp> +#include <armnn/backends/ITensorHandle.hpp> +#include <armnn/backends/IWorkload.hpp> +#include <armnn/backends/OptimizationViews.hpp> +#include <armnn/backends/SubgraphView.hpp> +#include <armnn/backends/WorkloadData.hpp> +#include <armnn/backends/WorkloadFactory.hpp> +#include <armnn/backends/WorkloadInfo.hpp> +#include <armnn/utility/IgnoreUnused.hpp> +#include <armnn/utility/PolymorphicDowncast.hpp> #include <armnnTestUtils/MockTensorHandle.hpp> #include <backendsCommon/LayerSupportBase.hpp> +#include <client/include/CounterValue.hpp> +#include <client/include/ISendTimelinePacket.hpp> +#include <client/include/Timestamp.hpp> +#include <client/include/backends/IBackendProfiling.hpp> +#include <client/include/backends/IBackendProfilingContext.hpp> +#include <common/include/Optional.hpp> + +#include <atomic> +#include <cstdint> +#include <memory> +#include <string> +#include <utility> +#include <vector> + namespace armnn { +class BackendId; +class ICustomAllocator; +class MockMemoryManager; +struct LstmInputParamsInfo; +struct QuantizedLstmInputParamsInfo; // A bare bones Mock backend to enable unit testing of simple tensor manipulation features. class MockBackend : public IBackendInternal diff --git a/include/armnnTestUtils/MockTensorHandle.hpp b/include/armnnTestUtils/MockTensorHandle.hpp index 9a7518b21a..bc2f7d7e3b 100644 --- a/include/armnnTestUtils/MockTensorHandle.hpp +++ b/include/armnnTestUtils/MockTensorHandle.hpp @@ -5,7 +5,13 @@ #pragma once #include "MockMemoryManager.hpp" + #include <armnn/backends/TensorHandle.hpp> +#include <armnn/MemorySources.hpp> +#include <armnn/Tensor.hpp> +#include <armnn/Types.hpp> +#include <armnn/backends/ITensorHandle.hpp> +#include <memory> namespace armnn { diff --git a/include/armnnTestUtils/TensorCopyUtils.hpp b/include/armnnTestUtils/TensorCopyUtils.hpp index ae6072e46e..cc73e9c61f 100644 --- a/include/armnnTestUtils/TensorCopyUtils.hpp +++ b/include/armnnTestUtils/TensorCopyUtils.hpp @@ -1,12 +1,13 @@ // -// Copyright © 2017 Arm Ltd and Contributors. All rights reserved. +// Copyright © 2017,2022 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // #pragma once -#include <armnn/Tensor.hpp> - -#include <armnn/backends/ITensorHandle.hpp> +namespace armnn +{ +class ITensorHandle; +} // namespace armnn void CopyDataToITensorHandle(armnn::ITensorHandle* tensorHandle, const void* memory); diff --git a/include/armnnUtils/Filesystem.hpp b/include/armnnUtils/Filesystem.hpp index 00da50f4f8..0b97af4323 100644 --- a/include/armnnUtils/Filesystem.hpp +++ b/include/armnnUtils/Filesystem.hpp @@ -1,5 +1,5 @@ // -// Copyright © 2020 Arm Ltd and Contributors. All rights reserved. +// Copyright © 2020,2022 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // @@ -12,6 +12,8 @@ #include <common/include/WindowsWrapper.hpp> #endif #include <ghc/filesystem.hpp> +#include <string> + namespace fs = ghc::filesystem; namespace armnnUtils diff --git a/include/armnnUtils/Permute.hpp b/include/armnnUtils/Permute.hpp index 1e4166d938..9381467f0f 100644 --- a/include/armnnUtils/Permute.hpp +++ b/include/armnnUtils/Permute.hpp @@ -1,5 +1,5 @@ // -// Copyright © 2019 Arm Ltd. All rights reserved. +// Copyright © 2019,2022 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // @@ -8,6 +8,8 @@ #include <armnn/TensorFwd.hpp> #include <armnn/Types.hpp> +#include <stddef.h> + namespace armnnUtils { diff --git a/include/armnnUtils/TensorUtils.hpp b/include/armnnUtils/TensorUtils.hpp index fc2f51061c..f7f20bd065 100644 --- a/include/armnnUtils/TensorUtils.hpp +++ b/include/armnnUtils/TensorUtils.hpp @@ -1,11 +1,20 @@ // -// Copyright © 2019 Arm Ltd. All rights reserved. +// Copyright © 2019,2022 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // #pragma once #include <armnn/TypesUtils.hpp> +#include <armnn/Tensor.hpp> +#include <armnn/Types.hpp> +#include <utility> +#include <vector> + +namespace armnn +{ +class ITensorHandle; +} // namespace armnn namespace armnnUtils { diff --git a/include/armnnUtils/Transpose.hpp b/include/armnnUtils/Transpose.hpp index 39ea5c5560..b0c1f08a98 100644 --- a/include/armnnUtils/Transpose.hpp +++ b/include/armnnUtils/Transpose.hpp @@ -1,5 +1,5 @@ // -// Copyright © 2020 Arm Ltd. All rights reserved. +// Copyright © 2020,2022 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // @@ -7,6 +7,7 @@ #include <armnn/TensorFwd.hpp> #include <armnn/Types.hpp> +#include <stddef.h> namespace armnnUtils { |