From 7d1b1ca5b25a3aaeecebc537e8cbed2ee1ed3337 Mon Sep 17 00:00:00 2001 From: Ryan OShea Date: Tue, 1 Aug 2023 17:15:24 +0100 Subject: IVGCVSW-7952 Output deprecation message when building pyarmnn * Adds warning message when enabling pyarmnn through CMake * Adds print out when building pyarmnn through setup.py * Remove deprecated functions from batch matmul descripter Signed-off-by: Ryan OShea Change-Id: I210ddbd0dd2f3b0d260a644bc62b8754375fbebe --- python/pyarmnn/CMakeLists.txt | 3 +++ python/pyarmnn/setup.py | 3 ++- python/pyarmnn/src/pyarmnn/__init__.py | 4 +++- python/pyarmnn/src/pyarmnn/swig/modules/armnn_descriptors.i | 10 ---------- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/python/pyarmnn/CMakeLists.txt b/python/pyarmnn/CMakeLists.txt index e2375c468d..0a4cf1b09e 100644 --- a/python/pyarmnn/CMakeLists.txt +++ b/python/pyarmnn/CMakeLists.txt @@ -1,5 +1,6 @@ # # Copyright 2020 NXP +# Copyright © 2023 Arm Ltd. All rights reserved. # SPDX-License-Identifier: MIT # set(SETUP_PY_IN "${CMAKE_CURRENT_SOURCE_DIR}/setup.py") @@ -8,6 +9,8 @@ set(SWIG_GENERATE_IN "${CMAKE_CURRENT_SOURCE_DIR}/swig_generate.py") set(SWIG_GENERATE "${CMAKE_CURRENT_BINARY_DIR}/swig_generate.py") set(OUT_WRAP "${CMAKE_CURRENT_BINARY_DIR}/pyarmnn.wrap.timestamp") +message(WARNING "PyArmNN is deprecated. To use ArmNN on python, please use the tflite delegate. Expected to be removed in release 24.05.") + configure_file(${SETUP_PY_IN} ${SETUP_PY} COPYONLY) configure_file(${SWIG_GENERATE_IN} ${SWIG_GENERATE} COPYONLY) diff --git a/python/pyarmnn/setup.py b/python/pyarmnn/setup.py index 44e810d422..6304ba5d54 100755 --- a/python/pyarmnn/setup.py +++ b/python/pyarmnn/setup.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright © 2020 Arm Ltd. All rights reserved. +# Copyright © 2020, 2023 Arm Ltd. All rights reserved. # Copyright © 2020 NXP and Contributors. All rights reserved. # SPDX-License-Identifier: MIT """Python bindings for Arm NN @@ -265,6 +265,7 @@ class LazyArmnnFinderExtension(Extension): if __name__ == '__main__': + print("WARNING: PyArmNN is deprecated. To use ArmNN on python, please use the tflite delegate. Expected to be removed in release 24.05.") # mandatory extensions pyarmnn_module = LazyArmnnFinderExtension('pyarmnn._generated._pyarmnn', sources=['src/pyarmnn/_generated/armnn_wrap.cpp'], diff --git a/python/pyarmnn/src/pyarmnn/__init__.py b/python/pyarmnn/src/pyarmnn/__init__.py index 4e8401cdd4..b57723ba6d 100644 --- a/python/pyarmnn/src/pyarmnn/__init__.py +++ b/python/pyarmnn/src/pyarmnn/__init__.py @@ -1,4 +1,4 @@ -# Copyright © 2020 Arm Ltd. All rights reserved. +# Copyright © 2020,2023 Arm Ltd. All rights reserved. # SPDX-License-Identifier: MIT import inspect import sys @@ -6,6 +6,8 @@ import logging from ._generated.pyarmnn_version import GetVersion, GetMajorVersion, GetMinorVersion +print("WARNING: PyArmNN is deprecated. To use ArmNN on python, please use the tflite delegate. Expected to be removed in release 24.05.") + # Parsers try: diff --git a/python/pyarmnn/src/pyarmnn/swig/modules/armnn_descriptors.i b/python/pyarmnn/src/pyarmnn/swig/modules/armnn_descriptors.i index e755ef5982..1b4703c7bb 100644 --- a/python/pyarmnn/src/pyarmnn/swig/modules/armnn_descriptors.i +++ b/python/pyarmnn/src/pyarmnn/swig/modules/armnn_descriptors.i @@ -134,16 +134,6 @@ struct BatchMatMulDescriptor DataLayout m_DataLayoutX; DataLayout m_DataLayoutY; - static std::pair, std::pair> GetAxesToMul( - const BatchMatMulDescriptor& desc, - const armnn::TensorShape& tensorXShape, - const armnn::TensorShape& tensorYShape); - - static std::pair, std::vector> GetAxesNotMul( - const BatchMatMulDescriptor& desc, - const armnn::TensorShape& inputXShape, - const armnn::TensorShape& inputYShape); - %feature("docstring", " Static helper to get the two axes (for each input) for multiplication -- cgit v1.2.1