From 30eba04c05836fe631f9a7b90b5fb270fd64dbfcf234ec3628020442878e8460 Mon Sep 17 00:00:00 2001 From: Guillaume GARDET Date: Mon, 12 Jun 2023 15:26:46 +0000 Subject: [PATCH 1/4] Accepting request 1092615 from home:Guillaume_G:branches:science:machinelearning - Update to 23.05: * Changelog: https://github.com/ARM-software/armnn/releases/tag/v23.05 - Drop upstream patches: * armnn-fix-gcc13.patch * armnn-fix-gcc13-2.patch * 4cf40d7.diff OBS-URL: https://build.opensuse.org/request/show/1092615 OBS-URL: https://build.opensuse.org/package/show/science:machinelearning/armnn?expand=0&rev=74 --- armnn-23.02.tar.gz | 3 --- armnn-23.05.tar.gz | 3 +++ armnn.changes | 10 ++++++++++ armnn.spec | 12 ++---------- 4 files changed, 15 insertions(+), 13 deletions(-) delete mode 100644 armnn-23.02.tar.gz create mode 100644 armnn-23.05.tar.gz diff --git a/armnn-23.02.tar.gz b/armnn-23.02.tar.gz deleted file mode 100644 index cf93519..0000000 --- a/armnn-23.02.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:49ab1825e5e9772648a723323a8ffb5bfc2390d5fb8f7bae01df59396d894215 -size 28414369 diff --git a/armnn-23.05.tar.gz b/armnn-23.05.tar.gz new file mode 100644 index 0000000..f2fb3b4 --- /dev/null +++ b/armnn-23.05.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a780e00a17da5054065c37e230cecbb15080277222b6a3e2ea31308682590ddd +size 28484575 diff --git a/armnn.changes b/armnn.changes index d23c60d..c8158cc 100644 --- a/armnn.changes +++ b/armnn.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon Jun 12 12:28:32 UTC 2023 - Guillaume GARDET + +- Update to 23.05: + * Changelog: https://github.com/ARM-software/armnn/releases/tag/v23.05 +- Drop upstream patches: + * armnn-fix-gcc13.patch + * armnn-fix-gcc13-2.patch + * 4cf40d7.diff + ------------------------------------------------------------------- Thu Apr 20 12:48:18 UTC 2023 - Guillaume GARDET diff --git a/armnn.spec b/armnn.spec index 48c733e..40f612b 100644 --- a/armnn.spec +++ b/armnn.spec @@ -65,7 +65,7 @@ %bcond_with armnn_onnx %endif %define version_major 23 -%define version_minor 02 +%define version_minor 05 %define version_lib 32 %define version_lib_testutils 2 %define version_lib_tfliteparser 24 @@ -79,11 +79,6 @@ Group: Development/Libraries/Other URL: https://developer.arm.com/products/processors/machine-learning/arm-nn Source0: https://github.com/ARM-software/armnn/archive/v%{version}.tar.gz#/armnn-%{version}.tar.gz Source1: armnn-rpmlintrc -# PATCH-FIX-UPSTREAM - https://github.com/ARM-software/armnn/issues/723 -Patch1: armnn-fix-gcc13.patch -Patch2: armnn-fix-gcc13-2.patch -# PATCH-FIX-UPSTREAM - https://review.mlplatform.org/c/ml/armnn/+/9460 -Patch3: 4cf40d7.diff # PATCHES to add downstream ArmnnExamples binary - https://layers.openembedded.org/layerindex/recipe/87610/ Patch200: 0003-add-more-test-command-line-arguments.patch Patch201: 0005-add-armnn-mobilenet-test-example.patch @@ -377,9 +372,6 @@ This package contains the libarmnnOnnxParser library from armnn. %prep %setup -q -n armnn-%{version} -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 %if %{with armnn_extra_tests} %patch200 -p1 %patch201 -p1 @@ -400,7 +392,7 @@ protoc $PROTO --proto_path=. --proto_path=%{_includedir} --proto_path=$(dirname %cmake \ -DCMAKE_SKIP_RPATH=True \ -DSHARED_BOOST=1 \ - -DCMAKE_CXX_FLAGS:STRING="%{optflags} -pthread " \ + -DCMAKE_CXX_FLAGS:STRING="%{optflags} -pthread -Wno-error=unused-result" \ -DBOOST_LIBRARYDIR=%{_libdir} \ %if %{with armnn_onnx} -DBUILD_ONNX_PARSER=ON \ From 39ebb1448c85e2f4048c7bc84208852254efac746d2287a35ac5f61003d30e33 Mon Sep 17 00:00:00 2001 From: Guillaume GARDET Date: Mon, 12 Jun 2023 15:41:45 +0000 Subject: [PATCH 2/4] OBS-URL: https://build.opensuse.org/package/show/science:machinelearning/armnn?expand=0&rev=75 --- 4cf40d7.diff | 30 ------------------------------ 1 file changed, 30 deletions(-) delete mode 100644 4cf40d7.diff diff --git a/4cf40d7.diff b/4cf40d7.diff deleted file mode 100644 index dfb1f0d..0000000 --- a/4cf40d7.diff +++ /dev/null @@ -1,30 +0,0 @@ -From 4cf40d70f8e9da3184bb4c9b604db6a3b23d6533 Mon Sep 17 00:00:00 2001 -From: Teresa Charlin -Date: Thu, 20 Apr 2023 11:55:48 +0100 -Subject: [PATCH] GitHub #723 Fix Maybe uninitialized variable - - -Signed-off-by: Teresa Charlin -Change-Id: I70d3673bbb2dc113ac5eb6d63029a4a4a684e831 ---- - -diff --git a/include/armnn/backends/Workload.hpp b/include/armnn/backends/Workload.hpp -index be6fbd9..9f7aad0 100644 ---- a/include/armnn/backends/Workload.hpp -+++ b/include/armnn/backends/Workload.hpp -@@ -1,5 +1,5 @@ - // --// Copyright © 2022 Arm Ltd and Contributors. All rights reserved. -+// Copyright © 2022-2023 Arm Ltd and Contributors. All rights reserved. - // SPDX-License-Identifier: MIT - // - #pragma once -@@ -124,6 +124,8 @@ - - if (!info.m_InputTensorInfos.empty()) - { -+ expectedInputType = info.m_InputTensorInfos.front().GetDataType(); -+ - if (expectedOutputType != expectedInputType) - { - ARMNN_ASSERT_MSG(false, "Trying to create workload with incorrect type"); From 1a3c1990bd8ea7091a1f1d442c0761fe3495cc3f0836d1b9a7bd59c324ed5ea9 Mon Sep 17 00:00:00 2001 From: Guillaume GARDET Date: Mon, 12 Jun 2023 15:41:50 +0000 Subject: [PATCH 3/4] OBS-URL: https://build.opensuse.org/package/show/science:machinelearning/armnn?expand=0&rev=76 --- armnn-fix-gcc13-2.patch | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 armnn-fix-gcc13-2.patch diff --git a/armnn-fix-gcc13-2.patch b/armnn-fix-gcc13-2.patch deleted file mode 100644 index 7817a2e..0000000 --- a/armnn-fix-gcc13-2.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- ./profiling/client/include/Holder.hpp.orig 2023-03-21 14:36:13.377591628 +0100 -+++ ./profiling/client/include/Holder.hpp 2023-03-21 14:36:31.325798921 +0100 -@@ -8,6 +8,7 @@ - #include - #include - #include -+#include - - namespace arm - { From a118d831ed64e9d0c0f65c2e4732a5554a5c64beed5dc1e48786166719fd327c Mon Sep 17 00:00:00 2001 From: Guillaume GARDET Date: Mon, 12 Jun 2023 15:41:55 +0000 Subject: [PATCH 4/4] OBS-URL: https://build.opensuse.org/package/show/science:machinelearning/armnn?expand=0&rev=77 --- armnn-fix-gcc13.patch | 98 ------------------------------------------- 1 file changed, 98 deletions(-) delete mode 100644 armnn-fix-gcc13.patch diff --git a/armnn-fix-gcc13.patch b/armnn-fix-gcc13.patch deleted file mode 100644 index 0359647..0000000 --- a/armnn-fix-gcc13.patch +++ /dev/null @@ -1,98 +0,0 @@ -From 4746ab11be5a8558a54c21142800abaa30efc3a6 Mon Sep 17 00:00:00 2001 -From: Pablo Marquez Tello -Date: Fri, 31 Mar 2023 15:57:43 +0100 -Subject: [PATCH] Fix gcc 13 compiler errors - -* Resolves MLCE-1040 - -Change-Id: I32878ed70af356832403e83dcb63b0b89a8a84e3 -Signed-off-by: Pablo Marquez Tello ---- - -diff --git a/include/armnn/utility/TransformIterator.hpp b/include/armnn/utility/TransformIterator.hpp -index f65ac79..b038447 100644 ---- a/include/armnn/utility/TransformIterator.hpp -+++ b/include/armnn/utility/TransformIterator.hpp -@@ -1,5 +1,5 @@ - // --// Copyright © 2020 Arm Ltd and Contributors. All rights reserved. -+// Copyright © 2020,2023 Arm Ltd and Contributors. All rights reserved. - // SPDX-License-Identifier: MIT - // - #pragma once -@@ -18,10 +18,15 @@ - typename Reference = - typename std::result_of::reference)>::type - > --class TransformIterator : public std::iterator -+class TransformIterator - { -- - public: -+ using iterator_category = Category; -+ using value_type = T; -+ using difference_type = Distance; -+ using pointer = Pointer; -+ using reference = Reference; -+ - - TransformIterator() = default; - TransformIterator(TransformIterator const& transformIterator) = default; -@@ -83,4 +88,4 @@ - return TransformIterator(i, f); - } - --} -\ No newline at end of file -+} -diff --git a/profiling/client/include/CounterIdMap.hpp b/profiling/client/include/CounterIdMap.hpp -index cce7184..45cad7b 100644 ---- a/profiling/client/include/CounterIdMap.hpp -+++ b/profiling/client/include/CounterIdMap.hpp -@@ -1,9 +1,10 @@ - // --// Copyright © 2020 Arm Ltd. All rights reserved. -+// Copyright © 2020,2023 Arm Ltd and Contributors. All rights reserved. - // SPDX-License-Identifier: MIT - // - #pragma once - -+#include - #include - #include - -diff --git a/profiling/common/include/Counter.hpp b/profiling/common/include/Counter.hpp -index ff96d25..4ddc89b 100644 ---- a/profiling/common/include/Counter.hpp -+++ b/profiling/common/include/Counter.hpp -@@ -1,10 +1,11 @@ - // --// Copyright © 2022 Arm Ltd. All rights reserved. -+// Copyright © 2022,2023 Arm Ltd and Contributors. All rights reserved. - // SPDX-License-Identifier: MIT - // - - #pragma once - -+#include - #include - - namespace arm -diff --git a/src/armnnUtils/VerificationHelpers.hpp b/src/armnnUtils/VerificationHelpers.hpp -index be09ba9..508cdc0 100644 ---- a/src/armnnUtils/VerificationHelpers.hpp -+++ b/src/armnnUtils/VerificationHelpers.hpp -@@ -1,11 +1,11 @@ - // --// Copyright © 2017 Arm Ltd. All rights reserved. -+// Copyright © 2017,2023 Arm Ltd and Contributors. All rights reserved. - // SPDX-License-Identifier: MIT - // - - #include - #include -- -+#include - #include - - namespace armnnUtils