aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorColm Donelan <colm.donelan@arm.com>2024-05-10 16:49:39 +0100
committerTeresaARM <teresa.charlinreyes@arm.com>2024-05-13 17:32:13 +0000
commit46dee40e2f3c73cdbbcd55954edf64b7d6dc9444 (patch)
tree22b4b30d0db7a3fbc74fb0ab77b7d77b14ca1cbe /src
parent520c93fd339e1960bfdb522ca6cc4e34f3f5f383 (diff)
downloadarmnn-46dee40e2f3c73cdbbcd55954edf64b7d6dc9444.tar.gz
Add deprecation notices for items to be removed in 24.08.
* Onnx parser. * Async execution interface. * Shim and support library. * Arm NN converter * GpuFsa backend. Signed-off-by: Colm Donelan <colm.donelan@arm.com> Change-Id: Ia9adae4da6d9bd2b92a4f4492a022e8337f57f14
Diffstat (limited to 'src')
-rw-r--r--src/armnn/Threadpool.cpp5
-rw-r--r--src/armnn/test/RuntimeTests.cpp6
-rw-r--r--src/armnnConverter/ArmnnConverter.cpp4
-rw-r--r--src/armnnOnnxParser/OnnxParser.cpp4
-rw-r--r--src/armnnOnnxParser/test/Constructor.cpp4
-rw-r--r--src/armnnOnnxParser/test/CreateNetwork.cpp4
-rw-r--r--src/armnnUtils/ParserPrototxtFixture.hpp10
-rw-r--r--src/backends/backendsCommon/test/StridedSliceAsyncEndToEndTest.hpp6
-rw-r--r--src/backends/gpuFsa/GpuFsaBackend.hpp5
-rw-r--r--src/backends/gpuFsa/GpuFsaRegistryInitializer.cpp6
-rw-r--r--src/backends/gpuFsa/test/GpuFsaWorkloadFactoryHelper.hpp5
11 files changed, 43 insertions, 16 deletions
diff --git a/src/armnn/Threadpool.cpp b/src/armnn/Threadpool.cpp
index df4ff84fb5..9cd8be9dfb 100644
--- a/src/armnn/Threadpool.cpp
+++ b/src/armnn/Threadpool.cpp
@@ -1,5 +1,5 @@
//
-// Copyright © 2021 Arm Ltd and Contributors. All rights reserved.
+// Copyright © 2021, 2024 Arm Ltd and Contributors. All rights reserved.
// SPDX-License-Identifier: MIT
//
#if !defined(ARMNN_DISABLE_THREADS)
@@ -188,11 +188,12 @@ void Threadpool::ProcessExecPriorities(uint32_t index)
try // executing the inference
{
IWorkingMemHandle& memHandle = *(m_WorkingMemHandleMap.at(networkId))[index];
-
+ARMNN_NO_DEPRECATE_WARN_BEGIN
// Execute and populate the time at end of inference in the callback
m_RuntimePtr->Execute(memHandle, inputTensors, outputTensors) == Status::Success ?
cb->Notify(Status::Success, std::make_pair(startTime, armnn::GetTimeNow())) :
cb->Notify(Status::Failure, std::make_pair(startTime, armnn::GetTimeNow()));
+ARMNN_NO_DEPRECATE_WARN_END
}
catch (const RuntimeException&)
{
diff --git a/src/armnn/test/RuntimeTests.cpp b/src/armnn/test/RuntimeTests.cpp
index 6d5e2ae2b5..4bb2f44357 100644
--- a/src/armnn/test/RuntimeTests.cpp
+++ b/src/armnn/test/RuntimeTests.cpp
@@ -116,7 +116,9 @@ TEST_CASE("RuntimePreImportInputs")
auto memHandle = runtime->CreateWorkingMemHandle(networkId);
+ARMNN_NO_DEPRECATE_WARN_BEGIN
runtime->Execute(*memHandle.get(), {{1, inputTensor2}}, {{2, outputTensor}}, {0 /* pre-imported id */});
+ARMNN_NO_DEPRECATE_WARN_END
for (auto val: output) {
CHECK(val == 30);
}
@@ -125,12 +127,16 @@ TEST_CASE("RuntimePreImportInputs")
CHECK(importedInputVec2.size() == 1);
CHECK(importedInputVec2[0] == 1);
+ARMNN_NO_DEPRECATE_WARN_BEGIN
runtime->Execute(*memHandle.get(), {{0, inputTensor1}}, {{2, outputTensor}}, {1 /* pre-imported id */});
+ARMNN_NO_DEPRECATE_WARN_END
for (auto val: output) {
CHECK(val == 30);
}
+ARMNN_NO_DEPRECATE_WARN_BEGIN
runtime->Execute(*memHandle.get(), {}, {{2, outputTensor}}, {0, 1});
+ARMNN_NO_DEPRECATE_WARN_BEGIN
for (auto val: output) {
CHECK(val == 30);
}
diff --git a/src/armnnConverter/ArmnnConverter.cpp b/src/armnnConverter/ArmnnConverter.cpp
index 0129204251..f3beb81d8b 100644
--- a/src/armnnConverter/ArmnnConverter.cpp
+++ b/src/armnnConverter/ArmnnConverter.cpp
@@ -1,5 +1,5 @@
//
-// Copyright © 2017, 2023 Arm Ltd and Contributors. All rights reserved.
+// Copyright © 2017, 2023-2024 Arm Ltd and Contributors. All rights reserved.
// SPDX-License-Identifier: MIT
//
#include <armnn/Logging.hpp>
@@ -292,6 +292,7 @@ private:
#endif
#if defined(ARMNN_ONNX_PARSER)
+ARMNN_NO_DEPRECATE_WARN_BEGIN
bool CreateNetwork (ParserType<armnnOnnxParser::IOnnxParser>)
{
// Create a network from a file on disk
@@ -318,6 +319,7 @@ private:
return m_NetworkPtr.get() != nullptr;
}
+ARMNN_NO_DEPRECATE_WARN_END
#endif
};
diff --git a/src/armnnOnnxParser/OnnxParser.cpp b/src/armnnOnnxParser/OnnxParser.cpp
index 5ec99ede74..b757c843fe 100644
--- a/src/armnnOnnxParser/OnnxParser.cpp
+++ b/src/armnnOnnxParser/OnnxParser.cpp
@@ -1,5 +1,5 @@
//
-// Copyright © 2017,2022-2023 Arm Ltd and Contributors. All rights reserved.
+// Copyright © 2017,2022-2024 Arm Ltd and Contributors. All rights reserved.
// SPDX-License-Identifier: MIT
//
#include "OnnxParser.hpp"
@@ -37,7 +37,9 @@ IOnnxParser* IOnnxParser::CreateRaw()
IOnnxParserPtr IOnnxParser::Create()
{
+ARMNN_NO_DEPRECATE_WARN_BEGIN
return IOnnxParserPtr(CreateRaw(), &IOnnxParser::Destroy);
+ARMNN_NO_DEPRECATE_WARN_END
}
void IOnnxParser::Destroy(IOnnxParser* parser)
diff --git a/src/armnnOnnxParser/test/Constructor.cpp b/src/armnnOnnxParser/test/Constructor.cpp
index 0fc3a1ecba..c6fff210ad 100644
--- a/src/armnnOnnxParser/test/Constructor.cpp
+++ b/src/armnnOnnxParser/test/Constructor.cpp
@@ -1,5 +1,5 @@
//
-// Copyright © 2017 Arm Ltd. All rights reserved.
+// Copyright © 2017, 2024 Arm Ltd. All rights reserved.
// SPDX-License-Identifier: MIT
//
@@ -7,6 +7,7 @@
#include <doctest/doctest.h>
+ARMNN_NO_DEPRECATE_WARN_BEGIN
TEST_SUITE("OnnxParser_Constructor")
{
TEST_CASE("Create")
@@ -15,3 +16,4 @@ TEST_CASE("Create")
}
}
+ARMNN_NO_DEPRECATE_WARN_END \ No newline at end of file
diff --git a/src/armnnOnnxParser/test/CreateNetwork.cpp b/src/armnnOnnxParser/test/CreateNetwork.cpp
index eeeaca85dc..84589eb1e7 100644
--- a/src/armnnOnnxParser/test/CreateNetwork.cpp
+++ b/src/armnnOnnxParser/test/CreateNetwork.cpp
@@ -1,5 +1,5 @@
//
-// Copyright © 2017 Arm Ltd. All rights reserved.
+// Copyright © 2017, 2024 Arm Ltd. All rights reserved.
// SPDX-License-Identifier: MIT
//
@@ -7,6 +7,7 @@
#include <doctest/doctest.h>
#include "google/protobuf/stubs/logging.h"
+ARMNN_NO_DEPRECATE_WARN_BEGIN
TEST_SUITE("OnnxParser_CreateNetwork")
{
@@ -62,3 +63,4 @@ TEST_CASE("CreateNetworkWithInvalidString")
}
}
+ARMNN_NO_DEPRECATE_WARN_END
diff --git a/src/armnnUtils/ParserPrototxtFixture.hpp b/src/armnnUtils/ParserPrototxtFixture.hpp
index a12a66ea25..9226031c5a 100644
--- a/src/armnnUtils/ParserPrototxtFixture.hpp
+++ b/src/armnnUtils/ParserPrototxtFixture.hpp
@@ -1,5 +1,5 @@
//
-// Copyright © 2017-2023 Arm Ltd and Contributors. All rights reserved.
+// Copyright © 2017-2024 Arm Ltd and Contributors. All rights reserved.
// SPDX-License-Identifier: MIT
//
@@ -23,12 +23,14 @@ namespace armnnUtils
template<typename TParser>
struct ParserPrototxtFixture
{
+ARMNN_NO_DEPRECATE_WARN_BEGIN
ParserPrototxtFixture()
: m_Parser(TParser::Create())
, m_Runtime(armnn::IRuntime::Create(armnn::IRuntime::CreationOptions()))
, m_NetworkIdentifier(-1)
{
}
+ARMNN_NO_DEPRECATE_WARN_END
/// Parses and loads the network defined by the m_Prototext string.
/// @{
@@ -140,7 +142,7 @@ template<typename TParser>
void ParserPrototxtFixture<TParser>::Setup(const std::map<std::string, armnn::TensorShape>& inputShapes)
{
std::string errorMessage;
-
+ARMNN_NO_DEPRECATE_WARN_BEGIN
armnn::INetworkPtr network =
m_Parser->CreateNetworkFromString(m_Prototext.c_str(), inputShapes);
auto optimized = Optimize(*network, { armnn::Compute::CpuRef }, m_Runtime->GetDeviceSpec());
@@ -151,13 +153,14 @@ void ParserPrototxtFixture<TParser>::Setup(const std::map<std::string, armnn::Te
errorMessage,
CHECK_LOCATION().AsString()));
}
+ARMNN_NO_DEPRECATE_WARN_END
}
template<typename TParser>
void ParserPrototxtFixture<TParser>::Setup()
{
std::string errorMessage;
-
+ARMNN_NO_DEPRECATE_WARN_BEGIN
armnn::INetworkPtr network =
m_Parser->CreateNetworkFromString(m_Prototext.c_str());
auto optimized = Optimize(*network, { armnn::Compute::CpuRef }, m_Runtime->GetDeviceSpec());
@@ -168,6 +171,7 @@ void ParserPrototxtFixture<TParser>::Setup()
errorMessage,
CHECK_LOCATION().AsString()));
}
+ARMNN_NO_DEPRECATE_WARN_END
}
template<typename TParser>
diff --git a/src/backends/backendsCommon/test/StridedSliceAsyncEndToEndTest.hpp b/src/backends/backendsCommon/test/StridedSliceAsyncEndToEndTest.hpp
index 84bf34dc60..00be81dd3e 100644
--- a/src/backends/backendsCommon/test/StridedSliceAsyncEndToEndTest.hpp
+++ b/src/backends/backendsCommon/test/StridedSliceAsyncEndToEndTest.hpp
@@ -90,11 +90,12 @@ void AsyncThreadedEndToEndTestImpl(INetworkPtr network,
InputTensors& inputTensors = inputTensorsVec[i];
OutputTensors& outputTensors = outputTensorsVec[i];
IWorkingMemHandle& workingMemHandle = *workingMemHandles[i].get();
-
threads.emplace_back([&]()
{
+ARMNN_NO_DEPRECATE_WARN_BEGIN
// Run the async network
runtime->Execute(workingMemHandle, inputTensors, outputTensors);
+ARMNN_NO_DEPRECATE_WARN_END
});
}
@@ -184,9 +185,10 @@ void AsyncEndToEndTestImpl(INetworkPtr network,
// Create WorkingMemHandle for this async network
std::unique_ptr<IWorkingMemHandle> workingMemHandle = runtime->CreateWorkingMemHandle(networkId);
IWorkingMemHandle& workingMemHandleRef = *workingMemHandle.get();
-
+ARMNN_NO_DEPRECATE_WARN_BEGIN
// Run the async network
runtime->Execute(workingMemHandleRef, inputTensors, outputTensorsVec[0]);
+ARMNN_NO_DEPRECATE_WARN_END
}
else
{
diff --git a/src/backends/gpuFsa/GpuFsaBackend.hpp b/src/backends/gpuFsa/GpuFsaBackend.hpp
index f5a866b186..92a1c15d25 100644
--- a/src/backends/gpuFsa/GpuFsaBackend.hpp
+++ b/src/backends/gpuFsa/GpuFsaBackend.hpp
@@ -50,11 +50,13 @@ const BackendCapabilities gpuFsaCapabilities("GpuFsa",
{"MultiAxisPacking", false},
{"SingleAxisPacking", false}
});
-
+ARMNN_NO_DEPRECATE_WARN_BEGIN
class GpuFsaBackend : public IBackendInternal
{
public:
+ ARMNN_DEPRECATED_MSG_REMOVAL_DATE("The GpuFsa backend will be removed from Arm NN in 24.08", "24.08")
GpuFsaBackend() : m_CustomAllocator(nullptr) {};
+ ARMNN_DEPRECATED_MSG_REMOVAL_DATE("The GpuFsa backend will be removed from Arm NN in 24.08", "24.08")
GpuFsaBackend(std::shared_ptr<ICustomAllocator> allocator)
{
UseCustomMemoryAllocator(allocator, armnn::EmptyOptional());
@@ -301,5 +303,6 @@ public:
std::shared_ptr<GpuFsaBackendCustomAllocatorWrapper> m_CustomAllocator;
bool m_UsingCustomAllocator = false;
};
+ARMNN_NO_DEPRECATE_WARN_END
} // namespace armnn
diff --git a/src/backends/gpuFsa/GpuFsaRegistryInitializer.cpp b/src/backends/gpuFsa/GpuFsaRegistryInitializer.cpp
index 9efb300576..ea0bbc299a 100644
--- a/src/backends/gpuFsa/GpuFsaRegistryInitializer.cpp
+++ b/src/backends/gpuFsa/GpuFsaRegistryInitializer.cpp
@@ -1,5 +1,5 @@
//
-// Copyright © 2022-2023 Arm Ltd and Contributors. All rights reserved.
+// Copyright © 2022-2024 Arm Ltd and Contributors. All rights reserved.
// SPDX-License-Identifier: MIT
//
@@ -15,7 +15,9 @@ static BackendRegistry::StaticRegistryInitializer g_RegisterHelper
GpuFsaBackend::GetIdStatic(),
[]()
{
- return IBackendInternalUniquePtr(new GpuFsaBackend);
+ARMNN_NO_DEPRECATE_WARN_BEGIN
+ return IBackendInternalUniquePtr(new GpuFsaBackend);
+ARMNN_NO_DEPRECATE_WARN_END
}
};
} // Anonymous namespace \ No newline at end of file
diff --git a/src/backends/gpuFsa/test/GpuFsaWorkloadFactoryHelper.hpp b/src/backends/gpuFsa/test/GpuFsaWorkloadFactoryHelper.hpp
index c1d75d625b..e2cb4b925e 100644
--- a/src/backends/gpuFsa/test/GpuFsaWorkloadFactoryHelper.hpp
+++ b/src/backends/gpuFsa/test/GpuFsaWorkloadFactoryHelper.hpp
@@ -1,5 +1,5 @@
//
-// Copyright © 2022-2023 Arm Ltd and Contributors. All rights reserved.
+// Copyright © 2022-2024 Arm Ltd and Contributors. All rights reserved.
// SPDX-License-Identifier: MIT
//
@@ -13,9 +13,9 @@
#include <gpuFsa/GpuFsaWorkloadFactory.hpp>
#include "gpuFsa/GpuFsaTensorHandleFactory.hpp"
+ARMNN_NO_DEPRECATE_WARN_BEGIN
namespace
{
-
template<>
struct WorkloadFactoryHelper<armnn::GpuFsaWorkloadFactory>
{
@@ -43,3 +43,4 @@ struct WorkloadFactoryHelper<armnn::GpuFsaWorkloadFactory>
using GpuFsaWorkloadFactoryHelper = WorkloadFactoryHelper<armnn::GpuFsaWorkloadFactory>;
} // anonymous namespace
+ARMNN_NO_DEPRECATE_WARN_END \ No newline at end of file