diff options
author | Rob Hughes <robert.hughes@arm.com> | 2021-07-14 09:48:54 +0100 |
---|---|---|
committer | Rob Hughes <robert.hughes@arm.com> | 2021-07-21 14:09:51 +0000 |
commit | 9542f90d82a42096166d72109683abc165072297 (patch) | |
tree | 1f519b437ef83eed67419f52e1326f6d909e2467 | |
parent | 9021125ff83a035dae05e5c7c0e6b1455b71af1a (diff) | |
download | armnn-9542f90d82a42096166d72109683abc165072297.tar.gz |
NNXSW-3081 Move Filesystem.hpp and Threads.hpp to public include
!android-nn-driver:5966
Change-Id: Ice0b4d2872bb0e09bfc0763034a206c3a8f24af4
Signed-off-by: Rob Hughes <robert.hughes@arm.com>
28 files changed, 27 insertions, 27 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 2e3af391af..e0b03c0049 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -59,12 +59,13 @@ set(armnnUtils_sources) list(APPEND armnnUtils_sources include/armnnUtils/DataLayoutIndexed.hpp include/armnnUtils/Permute.hpp + include/armnnUtils/Filesystem.hpp include/armnnUtils/FloatingPointComparison.hpp include/armnnUtils/FloatingPointConverter.hpp include/armnnUtils/TensorUtils.hpp + include/armnnUtils/Threads.hpp include/armnnUtils/Transpose.hpp src/armnnUtils/BFloat16.hpp - src/armnnUtils/Filesystem.hpp src/armnnUtils/Filesystem.cpp src/armnnUtils/GraphTopologicalSort.hpp src/armnnUtils/Half.hpp @@ -91,7 +92,6 @@ list(APPEND armnnUtils_sources src/armnnUtils/QuantizeHelper.hpp src/armnnUtils/TensorIOUtils.hpp src/armnnUtils/TensorUtils.cpp - src/armnnUtils/Threads.hpp src/armnnUtils/Threads.cpp src/armnnUtils/Transpose.cpp ) diff --git a/src/armnnUtils/Filesystem.hpp b/include/armnnUtils/Filesystem.hpp index ba0d97a272..ba0d97a272 100644 --- a/src/armnnUtils/Filesystem.hpp +++ b/include/armnnUtils/Filesystem.hpp diff --git a/src/armnnUtils/Threads.hpp b/include/armnnUtils/Threads.hpp index 4cecfd5079..4cecfd5079 100644 --- a/src/armnnUtils/Threads.hpp +++ b/include/armnnUtils/Threads.hpp diff --git a/profiling/server/src/timelineDecoder/tests/TimelineTests.cpp b/profiling/server/src/timelineDecoder/tests/TimelineTests.cpp index 4fcd7a0a9c..f09848f52c 100644 --- a/profiling/server/src/timelineDecoder/tests/TimelineTests.cpp +++ b/profiling/server/src/timelineDecoder/tests/TimelineTests.cpp @@ -10,7 +10,7 @@ #include <server/include/timelineDecoder/TimelineDecoder.hpp> #include <BufferManager.hpp> -#include <Threads.hpp> +#include <armnnUtils/Threads.hpp> #include <ProfilingService.hpp> #include <PacketBuffer.hpp> #include <TimelinePacketWriterFactory.hpp> diff --git a/src/armnnTfLiteParser/TfLiteParser.cpp b/src/armnnTfLiteParser/TfLiteParser.cpp index 410f452ff1..fbbc5acb3c 100644 --- a/src/armnnTfLiteParser/TfLiteParser.cpp +++ b/src/armnnTfLiteParser/TfLiteParser.cpp @@ -20,7 +20,7 @@ // armnnUtils: #include <armnnUtils/Permute.hpp> -#include <Filesystem.hpp> +#include <armnnUtils/Filesystem.hpp> #include <ParserHelper.hpp> #include <VerificationHelpers.hpp> diff --git a/src/armnnTfLiteParser/test/LoadModel.cpp b/src/armnnTfLiteParser/test/LoadModel.cpp index e09de68c72..9e7677df7a 100644 --- a/src/armnnTfLiteParser/test/LoadModel.cpp +++ b/src/armnnTfLiteParser/test/LoadModel.cpp @@ -6,7 +6,7 @@ #include "ParserFlatbuffersFixture.hpp" #include "../TfLiteParser.hpp" -#include <Filesystem.hpp> +#include <armnnUtils/Filesystem.hpp> using armnnTfLiteParser::TfLiteParserImpl; using ModelPtr = TfLiteParserImpl::ModelPtr; diff --git a/src/armnnUtils/Filesystem.cpp b/src/armnnUtils/Filesystem.cpp index 59d05239ae..1f636d895f 100644 --- a/src/armnnUtils/Filesystem.cpp +++ b/src/armnnUtils/Filesystem.cpp @@ -3,7 +3,7 @@ // SPDX-License-Identifier: MIT // -#include "Filesystem.hpp" +#include <armnnUtils/Filesystem.hpp> namespace armnnUtils { diff --git a/src/armnnUtils/Threads.cpp b/src/armnnUtils/Threads.cpp index e5cf27622c..4cdea6654a 100644 --- a/src/armnnUtils/Threads.cpp +++ b/src/armnnUtils/Threads.cpp @@ -3,7 +3,7 @@ // SPDX-License-Identifier: MIT // -#include "Threads.hpp" +#include <armnnUtils/Threads.hpp> #if defined(__linux__) #include <unistd.h> diff --git a/src/backends/backendsCommon/DynamicBackendUtils.cpp b/src/backends/backendsCommon/DynamicBackendUtils.cpp index 8850c0f19f..3d042dc74b 100644 --- a/src/backends/backendsCommon/DynamicBackendUtils.cpp +++ b/src/backends/backendsCommon/DynamicBackendUtils.cpp @@ -6,7 +6,7 @@ #include <armnn/Logging.hpp> #include <backendsCommon/DynamicBackendUtils.hpp> #include "armnn/utility/StringUtils.hpp" -#include <Filesystem.hpp> +#include <armnnUtils/Filesystem.hpp> #include <regex> diff --git a/src/backends/backendsCommon/test/DynamicBackendTests.hpp b/src/backends/backendsCommon/test/DynamicBackendTests.hpp index 53ff5caa3f..cfcdf8e59c 100644 --- a/src/backends/backendsCommon/test/DynamicBackendTests.hpp +++ b/src/backends/backendsCommon/test/DynamicBackendTests.hpp @@ -11,7 +11,7 @@ #include <armnn/utility/PolymorphicDowncast.hpp> #include <backendsCommon/DynamicBackendUtils.hpp> #include <backendsCommon/TensorHandle.hpp> -#include <Filesystem.hpp> +#include <armnnUtils/Filesystem.hpp> #include <reference/workloads/RefConvolution2dWorkload.hpp> #include <Runtime.hpp> diff --git a/src/backends/cl/ClWorkloadFactory.cpp b/src/backends/cl/ClWorkloadFactory.cpp index 6ca8c1b274..4568177c02 100644 --- a/src/backends/cl/ClWorkloadFactory.cpp +++ b/src/backends/cl/ClWorkloadFactory.cpp @@ -29,7 +29,7 @@ #include <arm_compute/runtime/CL/CLBufferAllocator.h> #include <arm_compute/runtime/CL/CLScheduler.h> -#include <Filesystem.hpp> +#include <armnnUtils/Filesystem.hpp> #include <fstream> namespace armnn diff --git a/src/backends/cl/test/ClContextSerializerTests.cpp b/src/backends/cl/test/ClContextSerializerTests.cpp index 1135e115e1..495aa69bff 100644 --- a/src/backends/cl/test/ClContextSerializerTests.cpp +++ b/src/backends/cl/test/ClContextSerializerTests.cpp @@ -3,7 +3,7 @@ // SPDX-License-Identifier: MIT // -#include <Filesystem.hpp> +#include <armnnUtils/Filesystem.hpp> #include <cl/test/ClContextControlFixture.hpp> diff --git a/src/backends/cl/test/ClOptimizedNetworkTests.cpp b/src/backends/cl/test/ClOptimizedNetworkTests.cpp index d91e9b4f8d..4c2a474526 100644 --- a/src/backends/cl/test/ClOptimizedNetworkTests.cpp +++ b/src/backends/cl/test/ClOptimizedNetworkTests.cpp @@ -12,7 +12,7 @@ #include <cl/ClWorkloadFactory.hpp> #include <cl/ClBackendContext.hpp> -#include <Filesystem.hpp> +#include <armnnUtils/Filesystem.hpp> #include <doctest/doctest.h> diff --git a/src/profiling/TimelineUtilityMethods.cpp b/src/profiling/TimelineUtilityMethods.cpp index 0a24775268..7f8c25d066 100644 --- a/src/profiling/TimelineUtilityMethods.cpp +++ b/src/profiling/TimelineUtilityMethods.cpp @@ -7,7 +7,7 @@ #include <common/include/LabelsAndEventClasses.hpp> -#include <Threads.hpp> +#include <armnnUtils/Threads.hpp> namespace armnn { diff --git a/src/profiling/test/FileOnlyProfilingDecoratorTests.cpp b/src/profiling/test/FileOnlyProfilingDecoratorTests.cpp index 8085fd9d01..0d6f8422fc 100644 --- a/src/profiling/test/FileOnlyProfilingDecoratorTests.cpp +++ b/src/profiling/test/FileOnlyProfilingDecoratorTests.cpp @@ -3,7 +3,7 @@ // SPDX-License-Identifier: MIT // -#include <Filesystem.hpp> +#include <armnnUtils/Filesystem.hpp> #include <ProfilingService.hpp> #include "ProfilingTestUtils.hpp" #include "PrintPacketHeaderHandler.hpp" diff --git a/src/profiling/test/ProfilingConnectionDumpToFileDecoratorTests.cpp b/src/profiling/test/ProfilingConnectionDumpToFileDecoratorTests.cpp index c2fcf1c228..2da3f2d729 100644 --- a/src/profiling/test/ProfilingConnectionDumpToFileDecoratorTests.cpp +++ b/src/profiling/test/ProfilingConnectionDumpToFileDecoratorTests.cpp @@ -4,7 +4,7 @@ // #include "../ProfilingConnectionDumpToFileDecorator.hpp" -#include <Filesystem.hpp> +#include <armnnUtils/Filesystem.hpp> #include <Runtime.hpp> #include <armnn/utility/IgnoreUnused.hpp> #include <armnn/utility/NumericCast.hpp> diff --git a/src/profiling/test/ProfilingTestUtils.cpp b/src/profiling/test/ProfilingTestUtils.cpp index 0ca58c99ff..79b8ea41da 100644 --- a/src/profiling/test/ProfilingTestUtils.cpp +++ b/src/profiling/test/ProfilingTestUtils.cpp @@ -12,7 +12,7 @@ #include <Processes.hpp> #include <ProfilingService.hpp> -#include <Threads.hpp> +#include <armnnUtils/Threads.hpp> #include <common/include/LabelsAndEventClasses.hpp> diff --git a/src/profiling/test/SendTimelinePacketTests.cpp b/src/profiling/test/SendTimelinePacketTests.cpp index e475f320e2..02c92af465 100644 --- a/src/profiling/test/SendTimelinePacketTests.cpp +++ b/src/profiling/test/SendTimelinePacketTests.cpp @@ -9,7 +9,7 @@ #include <ProfilingService.hpp> #include <ProfilingUtils.hpp> #include <SendTimelinePacket.hpp> -#include <Threads.hpp> +#include <armnnUtils/Threads.hpp> #include <TimelinePacketWriterFactory.hpp> #include <common/include/SwTrace.hpp> diff --git a/src/profiling/test/TimelinePacketTests.cpp b/src/profiling/test/TimelinePacketTests.cpp index 37a6f45ab6..379988a9dc 100644 --- a/src/profiling/test/TimelinePacketTests.cpp +++ b/src/profiling/test/TimelinePacketTests.cpp @@ -3,7 +3,7 @@ // SPDX-License-Identifier: MIT // -#include <Threads.hpp> +#include <armnnUtils/Threads.hpp> #include <ProfilingUtils.hpp> #include <armnn/utility/NumericCast.hpp> diff --git a/src/timelineDecoder/JSONTimelineDecoder.hpp b/src/timelineDecoder/JSONTimelineDecoder.hpp index 7fed9a1a86..f3f78e85ba 100644 --- a/src/timelineDecoder/JSONTimelineDecoder.hpp +++ b/src/timelineDecoder/JSONTimelineDecoder.hpp @@ -7,7 +7,7 @@ #include <server/include/timelineDecoder/ITimelineDecoder.hpp> -#include <Filesystem.hpp> +#include <armnnUtils/Filesystem.hpp> #include <map> #include <vector> diff --git a/src/timelineDecoder/tests/JSONTimelineDecoderTests.cpp b/src/timelineDecoder/tests/JSONTimelineDecoderTests.cpp index 65dbdcd8bb..2c4da54207 100644 --- a/src/timelineDecoder/tests/JSONTimelineDecoderTests.cpp +++ b/src/timelineDecoder/tests/JSONTimelineDecoderTests.cpp @@ -6,7 +6,7 @@ #include <JSONTimelineDecoder.hpp> #include <server/include/timelineDecoder/TimelineCaptureCommandHandler.hpp> #include <server/include/timelineDecoder/TimelineDecoder.hpp> -#include <Filesystem.hpp> +#include <armnnUtils/Filesystem.hpp> #include <doctest/doctest.h> diff --git a/tests/ExecuteNetwork/ExecuteNetwork.cpp b/tests/ExecuteNetwork/ExecuteNetwork.cpp index 48577c9990..bce83583cc 100644 --- a/tests/ExecuteNetwork/ExecuteNetwork.cpp +++ b/tests/ExecuteNetwork/ExecuteNetwork.cpp @@ -9,7 +9,7 @@ #include <AsyncExecutionCallback.hpp> #include <armnn/Logging.hpp> -#include <Filesystem.hpp> +#include <armnnUtils/Filesystem.hpp> #include <InferenceTest.hpp> #if defined(ARMNN_SERIALIZER) diff --git a/tests/ImageCSVFileGenerator/ImageCSVFileGenerator.cpp b/tests/ImageCSVFileGenerator/ImageCSVFileGenerator.cpp index 0138c1cfdf..a949da33a8 100644 --- a/tests/ImageCSVFileGenerator/ImageCSVFileGenerator.cpp +++ b/tests/ImageCSVFileGenerator/ImageCSVFileGenerator.cpp @@ -3,7 +3,7 @@ // SPDX-License-Identifier: MIT // -#include <Filesystem.hpp> +#include <armnnUtils/Filesystem.hpp> #include <cxxopts/cxxopts.hpp> #include <algorithm> diff --git a/tests/ImageTensorGenerator/ImageTensorGenerator.cpp b/tests/ImageTensorGenerator/ImageTensorGenerator.cpp index 5417eb4055..a2110f9cf3 100644 --- a/tests/ImageTensorGenerator/ImageTensorGenerator.cpp +++ b/tests/ImageTensorGenerator/ImageTensorGenerator.cpp @@ -7,7 +7,7 @@ #include "../InferenceTestImage.hpp" #include <armnn/Logging.hpp> #include <armnn/TypesUtils.hpp> -#include <Filesystem.hpp> +#include <armnnUtils/Filesystem.hpp> #include <mapbox/variant.hpp> #include <cxxopts/cxxopts.hpp> diff --git a/tests/InferenceModel.hpp b/tests/InferenceModel.hpp index 3eb1e6a9e7..9eb3eab3d5 100644 --- a/tests/InferenceModel.hpp +++ b/tests/InferenceModel.hpp @@ -24,7 +24,7 @@ #include <armnnOnnxParser/IOnnxParser.hpp> #endif -#include <Filesystem.hpp> +#include <armnnUtils/Filesystem.hpp> #include <HeapProfiling.hpp> #include <TensorIOUtils.hpp> diff --git a/tests/InferenceTest.cpp b/tests/InferenceTest.cpp index ebbf5066e4..5f2cf91a45 100644 --- a/tests/InferenceTest.cpp +++ b/tests/InferenceTest.cpp @@ -5,7 +5,7 @@ #include "InferenceTest.hpp" #include <armnn/utility/Assert.hpp> -#include <Filesystem.hpp> +#include <armnnUtils/Filesystem.hpp> #include "../src/armnn/Profiling.hpp" #include <cxxopts/cxxopts.hpp> diff --git a/tests/ModelAccuracyTool-Armnn/ModelAccuracyTool-Armnn.cpp b/tests/ModelAccuracyTool-Armnn/ModelAccuracyTool-Armnn.cpp index 672f744ee5..10d6e6a0f8 100644 --- a/tests/ModelAccuracyTool-Armnn/ModelAccuracyTool-Armnn.cpp +++ b/tests/ModelAccuracyTool-Armnn/ModelAccuracyTool-Armnn.cpp @@ -7,7 +7,7 @@ #include "../InferenceTest.hpp" #include "ModelAccuracyChecker.hpp" #include "armnnDeserializer/IDeserializer.hpp" -#include <Filesystem.hpp> +#include <armnnUtils/Filesystem.hpp> #include <cxxopts/cxxopts.hpp> #include <map> diff --git a/tests/NetworkExecutionUtils/NetworkExecutionUtils.cpp b/tests/NetworkExecutionUtils/NetworkExecutionUtils.cpp index e5da1491b6..23b892ffb4 100644 --- a/tests/NetworkExecutionUtils/NetworkExecutionUtils.cpp +++ b/tests/NetworkExecutionUtils/NetworkExecutionUtils.cpp @@ -5,7 +5,7 @@ #include "NetworkExecutionUtils.hpp" -#include <Filesystem.hpp> +#include <armnnUtils/Filesystem.hpp> #include <InferenceTest.hpp> #include <ResolveType.hpp> |