diff --git a/4cf40d7.diff b/4cf40d7.diff new file mode 100644 index 0000000..dfb1f0d --- /dev/null +++ b/4cf40d7.diff @@ -0,0 +1,30 @@ +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"); diff --git a/armnn-fix-gcc13-2.patch b/armnn-fix-gcc13-2.patch new file mode 100644 index 0000000..7817a2e --- /dev/null +++ b/armnn-fix-gcc13-2.patch @@ -0,0 +1,10 @@ +--- ./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 + { diff --git a/armnn.changes b/armnn.changes index ff35eec..d23c60d 100644 --- a/armnn.changes +++ b/armnn.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Apr 20 12:48:18 UTC 2023 - Guillaume GARDET + +- Add additionnal gcc13 fixes: + * 4cf40d7.diff + * armnn-fix-gcc13-2.patch + ------------------------------------------------------------------- Wed Apr 5 06:06:27 UTC 2023 - Guillaume GARDET diff --git a/armnn.spec b/armnn.spec index 2c427a9..48c733e 100644 --- a/armnn.spec +++ b/armnn.spec @@ -81,6 +81,9 @@ Source0: https://github.com/ARM-software/armnn/archive/v%{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 @@ -375,6 +378,8 @@ 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