pool/armnn
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1080887 from home:Guillaume_G:branches:science:machinelearning

Browse Source 
- Add additionnal gcc13 fixes:
  * 4cf40d7.diff
  * armnn-fix-gcc13-2.patch

OBS-URL: https://build.opensuse.org/request/show/1080887
OBS-URL: https://build.opensuse.org/package/show/science:machinelearning/armnn?expand=0&rev=72
This commit is contained in:
Guillaume GARDET 2023-04-20 13:15:14 +00:00 committed by Git OBS Bridge
parent 0b06e7426e
commit fd0141bad3
4 changed files with 52 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
4cf40d7.diff Normal file
View File

@ -0,0 +1,30 @@
From 4cf40d70f8e9da3184bb4c9b604db6a3b23d6533 Mon Sep 17 00:00:00 2001
From: Teresa Charlin <teresa.charlinreyes@arm.com>
Date: Thu, 20 Apr 2023 11:55:48 +0100
Subject: [PATCH] GitHub #723 Fix Maybe uninitialized variable
Signed-off-by: Teresa Charlin <teresa.charlinreyes@arm.com>
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");

10
armnn-fix-gcc13-2.patch Normal file
View File

@ -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 <mutex>
#include <vector>
#include <set>
+#include <string>
namespace arm
{

7
armnn.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Apr 20 12:48:18 UTC 2023 - Guillaume GARDET <guillaume.gardet@opensuse.org>
- Add additionnal gcc13 fixes:
* 4cf40d7.diff
* armnn-fix-gcc13-2.patch
-------------------------------------------------------------------
Wed Apr 5 06:06:27 UTC 2023 - Guillaume GARDET <guillaume.gardet@opensuse.org>

5
armnn.spec
View File

@ -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