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

21 files changed, 80 insertions, 29 deletions

diff --git a/delegate/classic/src/armnn_delegate.cpp b/delegate/classic/src/armnn_delegate.cpp
index c3815b6c59..76d718bd96 100644
--- a/delegate/classic/src/armnn_delegate.cpp
+++ b/delegate/classic/src/armnn_delegate.cpp
@@ -48,7 +48,6 @@
 
 #include <armnnUtils/Filesystem.hpp>
 #include <armnn/utility/Timer.hpp>
-#include <flatbuffers/flatbuffers.h>
 #include <tensorflow/lite/context_util.h>
 #include <tensorflow/lite/schema/schema_generated.h>
 
diff --git a/include/armnn/IRuntime.hpp b/include/armnn/IRuntime.hpp
index a97e44782f..d07bab558d 100644
--- a/include/armnn/IRuntime.hpp
+++ b/include/armnn/IRuntime.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
 //
 #pragma once
@@ -258,6 +258,7 @@ public:
     /// Evaluates a network using input in inputTensors and outputs filled into outputTensors.
     /// This function performs a thread safe execution of the network. Returns once execution is complete.
     /// Will block until this and any other thread using the same workingMem object completes.
+    ARMNN_DEPRECATED_MSG_REMOVAL_DATE("The Async interface will be removed from Arm NN in 24.08", "24.08")
     Status Execute(IWorkingMemHandle& workingMemHandle,
                    const InputTensors& inputTensors,
                    const OutputTensors& outputTensors,
diff --git a/include/armnnOnnxParser/IOnnxParser.hpp b/include/armnnOnnxParser/IOnnxParser.hpp
index 89c22c03de..c0e2d745de 100644
--- a/include/armnnOnnxParser/IOnnxParser.hpp
+++ b/include/armnnOnnxParser/IOnnxParser.hpp
@@ -1,5 +1,5 @@
 //
-// Copyright © 2017,2022 Arm Ltd. All rights reserved.
+// Copyright © 2017,2022,2024 Arm Ltd. All rights reserved.
 // SPDX-License-Identifier: MIT
 //
 #pragma once
@@ -23,11 +23,14 @@ using IOnnxParserPtr = std::unique_ptr<IOnnxParser, void(*)(IOnnxParser* parser)
 class IOnnxParser
 {
 public:
+    ARMNN_DEPRECATED_MSG_REMOVAL_DATE("The ONNX Parser will be removed from Arm NN in 24.08", "24.08")
     static IOnnxParser* CreateRaw();
+    ARMNN_DEPRECATED_MSG_REMOVAL_DATE("The ONNX Parser will be removed from Arm NN in 24.08", "24.08")
     static IOnnxParserPtr Create();
     static void Destroy(IOnnxParser* parser);
 
     /// Create the network from a protobuf binary vector
+    ARMNN_DEPRECATED_MSG_REMOVAL_DATE("The ONNX Parser will be removed from Arm NN in 24.08", "24.08")
     armnn::INetworkPtr CreateNetworkFromBinary(const std::vector<uint8_t>& binaryContent);
 
     /// Create the network from a protobuf binary vector, with inputShapes specified
@@ -35,24 +38,30 @@ public:
                                                const std::map<std::string, armnn::TensorShape>& inputShapes);
 
     /// Create the network from a protobuf binary file on disk
+    ARMNN_DEPRECATED_MSG_REMOVAL_DATE("The ONNX Parser will be removed from Arm NN in 24.08", "24.08")
     armnn::INetworkPtr CreateNetworkFromBinaryFile(const char* graphFile);
 
     /// Create the network from a protobuf text file on disk
+    ARMNN_DEPRECATED_MSG_REMOVAL_DATE("The ONNX Parser will be removed from Arm NN in 24.08", "24.08")
     armnn::INetworkPtr CreateNetworkFromTextFile(const char* graphFile);
 
     /// Create the network directly from protobuf text in a string. Useful for debugging/testing
+    ARMNN_DEPRECATED_MSG_REMOVAL_DATE("The ONNX Parser will be removed from Arm NN in 24.08", "24.08")
     armnn::INetworkPtr CreateNetworkFromString(const std::string& protoText);
 
     /// Create the network from a protobuf binary file on disk, with inputShapes specified
+    ARMNN_DEPRECATED_MSG_REMOVAL_DATE("The ONNX Parser will be removed from Arm NN in 24.08", "24.08")
     armnn::INetworkPtr CreateNetworkFromBinaryFile(const char* graphFile,
                                                    const std::map<std::string, armnn::TensorShape>& inputShapes);
 
     /// Create the network from a protobuf text file on disk, with inputShapes specified
+    ARMNN_DEPRECATED_MSG_REMOVAL_DATE("The ONNX Parser will be removed from Arm NN in 24.08", "24.08")
     armnn::INetworkPtr CreateNetworkFromTextFile(const char* graphFile,
                                                  const std::map<std::string, armnn::TensorShape>& inputShapes);
 
      /// Create the network directly from protobuf text in a string, with inputShapes specified.
      /// Useful for debugging/testing
+    ARMNN_DEPRECATED_MSG_REMOVAL_DATE("The ONNX Parser will be removed from Arm NN in 24.08", "24.08")
     armnn::INetworkPtr CreateNetworkFromString(const std::string& protoText,
                                                const std::map<std::string, armnn::TensorShape>& inputShapes);
 
diff --git a/shim/sl/canonical/ArmnnDevice.hpp b/shim/sl/canonical/ArmnnDevice.hpp
index 93109696f7..dbc966683c 100644
--- a/shim/sl/canonical/ArmnnDevice.hpp
+++ b/shim/sl/canonical/ArmnnDevice.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
 //
 
@@ -17,6 +17,7 @@ class ArmnnDevice
 friend class ArmnnDriver;
 
 public:
+    ARMNN_DEPRECATED_MSG_REMOVAL_DATE("The Shim and support library will be removed from Arm NN in 24.08", "24.08")
     ArmnnDevice(DriverOptions options);
     ~ArmnnDevice() {}
 protected:
diff --git a/shim/sl/canonical/ArmnnDriver.hpp b/shim/sl/canonical/ArmnnDriver.hpp
index 6cb06604d2..d6b7d849b3 100644
--- a/shim/sl/canonical/ArmnnDriver.hpp
+++ b/shim/sl/canonical/ArmnnDriver.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
 //
 
@@ -33,6 +33,7 @@ class ArmnnDriver : public IDevice
 private:
     std::unique_ptr<ArmnnDevice> m_Device;
 public:
+    ARMNN_DEPRECATED_MSG_REMOVAL_DATE("The Shim and support library will be removed from Arm NN in 24.08", "24.08")
     ArmnnDriver(DriverOptions options)
     {
         try
@@ -212,7 +213,7 @@ public:
         if (hasDeadlinePassed(deadline)) {
             return NN_ERROR(ErrorStatus::MISSED_DEADLINE_PERSISTENT);
         }
-
+ARMNN_NO_DEPRECATE_WARN_BEGIN
         return ArmnnDriverImpl::PrepareArmnnModel(m_Device->m_Runtime,
             m_Device->m_ClTunedParameters,
             m_Device->m_Options,
@@ -222,6 +223,7 @@ public:
             token,
             model.relaxComputationFloat32toFloat16 && m_Device->m_Options.GetFp16Enabled(),
             priority);
+ARMNN_NO_DEPRECATE_WARN_END
     }
 
     GeneralResult<SharedPreparedModel> prepareModelFromCache(OptionalTimePoint deadline,
@@ -239,6 +241,7 @@ public:
             return NN_ERROR(ErrorStatus::MISSED_DEADLINE_PERSISTENT);
         }
 
+ARMNN_NO_DEPRECATE_WARN_BEGIN
         return ArmnnDriverImpl::PrepareArmnnModelFromCache(
                      m_Device->m_Runtime,
                      m_Device->m_ClTunedParameters,
@@ -247,6 +250,7 @@ public:
                      dataCache,
                      token,
                      m_Device->m_Options.GetFp16Enabled());
+ARMNN_NO_DEPRECATE_WARN_END
     }
 
     GeneralResult<SharedBuffer> allocate(const BufferDesc&,
diff --git a/shim/sl/canonical/ArmnnDriverImpl.hpp b/shim/sl/canonical/ArmnnDriverImpl.hpp
index 6af0ab285d..47106fdeee 100644
--- a/shim/sl/canonical/ArmnnDriverImpl.hpp
+++ b/shim/sl/canonical/ArmnnDriverImpl.hpp
@@ -1,5 +1,5 @@
 //
-// Copyright © 2022 Arm Ltd and Contributors. All rights reserved.
+// Copyright © 2022, 2024 Arm Ltd and Contributors. All rights reserved.
 // SPDX-License-Identifier: MIT
 //
 
@@ -23,6 +23,7 @@ namespace armnn_driver
 class ArmnnDriverImpl
 {
 public:
+    ARMNN_DEPRECATED_MSG_REMOVAL_DATE("The Shim and support library will be removed from Arm NN in 24.08", "24.08")
     static GeneralResult<SharedPreparedModel> PrepareArmnnModel(
         const armnn::IRuntimePtr& runtime,
         const armnn::IGpuAccTunedParametersPtr& clTunedParameters,
@@ -34,6 +35,7 @@ public:
         bool float32ToFloat16 = false,
         Priority priority = Priority::MEDIUM);
 
+    ARMNN_DEPRECATED_MSG_REMOVAL_DATE("The Shim and support library will be removed from Arm NN in 24.08", "24.08")
     static GeneralResult<SharedPreparedModel> PrepareArmnnModelFromCache(
         const armnn::IRuntimePtr& runtime,
         const armnn::IGpuAccTunedParametersPtr& clTunedParameters,
diff --git a/shim/sl/canonical/ArmnnPreparedModel.hpp b/shim/sl/canonical/ArmnnPreparedModel.hpp
index c487858c01..295acf1cfe 100644
--- a/shim/sl/canonical/ArmnnPreparedModel.hpp
+++ b/shim/sl/canonical/ArmnnPreparedModel.hpp
@@ -1,5 +1,5 @@
 //
-// Copyright © 2022 Arm Ltd and Contributors. All rights reserved.
+// Copyright © 2022, 2024 Arm Ltd and Contributors. All rights reserved.
 // SPDX-License-Identifier: MIT
 //
 
@@ -39,6 +39,7 @@ class ArmnnPreparedModel final : public IPreparedModel,
                                  public std::enable_shared_from_this<ArmnnPreparedModel>
 {
 public:
+    ARMNN_DEPRECATED_MSG_REMOVAL_DATE("The Shim and support library will be removed from Arm NN in 24.08", "24.08")
     ArmnnPreparedModel(armnn::NetworkId networkId,
                        armnn::IRuntime* runtime,
                        const Model& model,
@@ -46,6 +47,7 @@ public:
                        const bool gpuProfilingEnabled,
                        Priority priority = Priority::MEDIUM);
 
+    ARMNN_DEPRECATED_MSG_REMOVAL_DATE("The Shim and support library will be removed from Arm NN in 24.08", "24.08")
     ArmnnPreparedModel(armnn::NetworkId networkId,
                        armnn::IRuntime* runtime,
                        const std::string& requestInputsAndOutputsDumpDir,
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
diff --git a/tests/ExecuteNetwork/ArmNNExecutor.cpp b/tests/ExecuteNetwork/ArmNNExecutor.cpp
index 23f5f8ee25..2004bb1ec0 100644
--- a/tests/ExecuteNetwork/ArmNNExecutor.cpp
+++ b/tests/ExecuteNetwork/ArmNNExecutor.cpp
@@ -936,6 +936,7 @@ armnn::BindingPointInfo ArmNNExecutor::TfliteParser::GetOutputBindingPointInfo(s
 
 
 #if defined(ARMNN_ONNX_PARSER)
+ARMNN_NO_DEPRECATE_WARN_BEGIN
 ArmNNExecutor::OnnxParser::OnnxParser() : m_Parser(armnnOnnxParser::IOnnxParser::Create()){}
 
 armnn::INetworkPtr ArmNNExecutor::OnnxParser::CreateNetwork(const ExecuteNetworkParams& params)
@@ -979,4 +980,5 @@ armnn::BindingPointInfo ArmNNExecutor::OnnxParser::GetOutputBindingPointInfo(siz
 {
     return m_Parser->GetNetworkOutputBindingInfo(outputName);
 }
+ARMNN_NO_DEPRECATE_WARN_END
 #endif
diff --git a/tests/ExecuteNetwork/ExecuteNetworkProgramOptions.cpp b/tests/ExecuteNetwork/ExecuteNetworkProgramOptions.cpp
index 2eb68713c6..87b38c5f78 100644
--- a/tests/ExecuteNetwork/ExecuteNetworkProgramOptions.cpp
+++ b/tests/ExecuteNetwork/ExecuteNetworkProgramOptions.cpp
@@ -216,7 +216,8 @@ ProgramOptions::ProgramOptions() : m_CxxOptions{"ExecuteNetwork",
 
                 ("m,model-path",
                  "Path to model file, e.g. .armnn, .tflite, .onnx. "
-                 "DEPRECATED: .pb and .prototxt model files no longer load and are deprecated.",
+                 "DEPRECATED: .pb and .prototxt model files no longer loaded and are deprecated."
+                 "DEPRECATED: .onnx model files will no longer loaded from 24.08 onwards.",
                  cxxopts::value<std::string>(m_ExNetParams.m_ModelPath));
 
         m_CxxOptions.add_options("b) Ordering")
@@ -237,7 +238,8 @@ ProgramOptions::ProgramOptions() : m_CxxOptions{"ExecuteNetwork",
                  cxxopts::value<std::string>(m_RuntimeOptions.m_DynamicBackendsPath))
 
                 ("P, thread-pool-size",
-                 "Run the network using the Arm NN thread pool with the number of threads provided. ",
+                 "Run the network using the Arm NN thread pool with the number of threads provided. "
+                 "DECRECATED: The asynchronous execution interface will be removed in 24.08",
                  cxxopts::value<size_t>(m_ExNetParams.m_ThreadPoolSize)->default_value("0"))
 
                 ("d,input-tensor-data",
diff --git a/tests/InferenceModel.hpp b/tests/InferenceModel.hpp
index c053a4429a..a1b55c0996 100644
--- a/tests/InferenceModel.hpp
+++ b/tests/InferenceModel.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
 //
 
@@ -276,6 +276,7 @@ public:
 #endif
 
 #if defined(ARMNN_ONNX_PARSER)
+ARMNN_NO_DEPRECATE_WARN_BEGIN
 template <>
 struct CreateNetworkImpl<armnnOnnxParser::IOnnxParser>
 {
@@ -343,6 +344,7 @@ public:
         return network;
     }
 };
+ARMNN_NO_DEPRECATE_WARN_END
 #endif
 
 
@@ -660,11 +662,11 @@ public:
 
         // Start timer to record inference time in EnqueueWorkload (in milliseconds)
         const auto start_time = armnn::GetTimeNow();
-
+ARMNN_NO_DEPRECATE_WARN_BEGIN
         armnn::Status ret = m_Runtime->Execute(workingMemHandleRef,
                                                MakeInputTensors(inputContainers),
                                                MakeOutputTensors(outputContainers));
-
+ARMNN_NO_DEPRECATE_WARN_END
         const auto duration = armnn::GetTimeDuration(start_time);
 
         // if profiling is enabled print out the results