rpm/armnn
SHA256
1
0
Fork 0
forked from pool/armnn
Code Pull Requests Activity

Accepting request 1092624 from science:machinelearning

Browse Source 
- 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/1092624
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/armnn?expand=0&rev=5
This commit is contained in:
Dominique Leuenberger 2023-06-13 14:09:19 +00:00 committed by Git OBS Bridge
commit aac765d7dd
7 changed files with 15 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
4cf40d7.diff
View File

@ -1,30 +0,0 @@
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");

3
armnn-23.02.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:49ab1825e5e9772648a723323a8ffb5bfc2390d5fb8f7bae01df59396d894215
size 28414369

3
armnn-23.05.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a780e00a17da5054065c37e230cecbb15080277222b6a3e2ea31308682590ddd
size 28484575

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

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

98
armnn-fix-gcc13.patch
View File

@ -1,98 +0,0 @@
From 4746ab11be5a8558a54c21142800abaa30efc3a6 Mon Sep 17 00:00:00 2001
From: Pablo Marquez Tello <pablo.tello@arm.com>
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 <pablo.tello@arm.com>
---
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<const Function(typename std::iterator_traits<Iterator>::reference)>::type
>
-class TransformIterator : public std::iterator<Category, T, Distance, Pointer, Reference>
+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<Function, Iterator>(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 <cstdint>
#include <map>
#include <string>
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 <cstdint>
#include <string>
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 <iostream>
#include <sstream>
-
+#include <cstdint>
#include <armnn/Exceptions.hpp>
namespace armnnUtils

10
armnn.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Mon Jun 12 12:28:32 UTC 2023 - Guillaume GARDET <guillaume.gardet@opensuse.org>
- 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 <guillaume.gardet@opensuse.org>

12
armnn.spec
View File

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