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

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

Browse Source 
- Update armnn-fix-gcc13.patch with upstream patch

OBS-URL: https://build.opensuse.org/request/show/1077421
OBS-URL: https://build.opensuse.org/package/show/science:machinelearning/armnn?expand=0&rev=71
This commit is contained in:
Guillaume GARDET 2023-04-05 06:30:22 +00:00 committed by Git OBS Bridge
parent 7e7e73f680
commit 0b06e7426e
2 changed files with 91 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

124
armnn-fix-gcc13.patch
View File

@ -1,50 +1,98 @@
--- armnn-23.02/src/armnnUtils/VerificationHelpers.hpp.orig 2023-03-21 11:42:43.586421589 +0100 From 4746ab11be5a8558a54c21142800abaa30efc3a6 Mon Sep 17 00:00:00 2001
+++ armnn-23.02/src/armnnUtils/VerificationHelpers.hpp 2023-03-21 11:42:58.738601283 +0100 From: Pablo Marquez Tello <pablo.tello@arm.com>
@@ -7,6 +7,7 @@ Date: Fri, 31 Mar 2023 15:57:43 +0100
#include <sstream> Subject: [PATCH] Fix gcc 13 compiler errors
#include <armnn/Exceptions.hpp> * Resolves MLCE-1040
+#include <cstdint>
Change-Id: I32878ed70af356832403e83dcb63b0b89a8a84e3
namespace armnnUtils 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
{ {
--- armnn-23.02/profiling/client/include/CounterIdMap.hpp.orig 2023-03-21 12:03:05.672831589 +0100 -
+++ armnn-23.02/profiling/client/include/CounterIdMap.hpp 2023-03-21 12:03:18.292980107 +0100 public:
@@ -6,6 +6,7 @@ + using iterator_category = Category;
+ using value_type = T;
+ using difference_type = Distance;
+ using pointer = Pointer;
+ using reference = Reference;
+
#include <map> TransformIterator() = default;
#include <string> TransformIterator(TransformIterator const& transformIterator) = default;
+#include <cstdint> @@ -83,4 +88,4 @@
return TransformIterator<Function, Iterator>(i, f);
}
namespace arm -}
{ \ No newline at end of file
--- armnn-23.02/profiling/common/include/Counter.hpp.orig 2023-03-21 13:14:21.926470002 +0100 +}
+++ armnn-23.02/profiling/common/include/Counter.hpp 2023-03-21 13:14:32.046586851 +0100 diff --git a/profiling/client/include/CounterIdMap.hpp b/profiling/client/include/CounterIdMap.hpp
@@ -6,6 +6,7 @@ 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 #pragma once
#include <string>
+#include <cstdint> +#include <cstdint>
#include <map>
#include <string>
namespace arm diff --git a/profiling/common/include/Counter.hpp b/profiling/common/include/Counter.hpp
{ index ff96d25..4ddc89b 100644
--- armnn-23.02/profiling/client/src/Holder.cpp.orig 2023-03-21 13:28:41.724376732 +0100 --- a/profiling/common/include/Counter.hpp
+++ armnn-23.02/profiling/client/src/Holder.cpp 2023-03-21 13:28:55.772538587 +0100 +++ b/profiling/common/include/Counter.hpp
@@ -4,6 +4,7 @@ @@ -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
// //
#include <client/include/Holder.hpp> #pragma once
+#include <string>
+#include <cstdint>
#include <string>
namespace arm namespace arm
{ diff --git a/src/armnnUtils/VerificationHelpers.hpp b/src/armnnUtils/VerificationHelpers.hpp
--- armnn-23.02/profiling/client/include/Holder.hpp.orig 2023-03-21 14:36:13.377591628 +0100 index be09ba9..508cdc0 100644
+++ armnn-23.02/profiling/client/include/Holder.hpp 2023-03-21 14:36:31.325798921 +0100 --- a/src/armnnUtils/VerificationHelpers.hpp
@@ -8,6 +8,7 @@ +++ b/src/armnnUtils/VerificationHelpers.hpp
#include <mutex> @@ -1,11 +1,11 @@
#include <vector> //
#include <set> -// Copyright © 2017 Arm Ltd. All rights reserved.
+#include <string> +// Copyright © 2017,2023 Arm Ltd and Contributors. All rights reserved.
// SPDX-License-Identifier: MIT
//
namespace arm #include <iostream>
{ #include <sstream>
-
+#include <cstdint>
#include <armnn/Exceptions.hpp>
namespace armnnUtils

5
armnn.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Apr 5 06:06:27 UTC 2023 - Guillaume GARDET <guillaume.gardet@opensuse.org>
- Update armnn-fix-gcc13.patch with upstream patch
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Mar 21 10:45:26 UTC 2023 - Guillaume GARDET <guillaume.gardet@opensuse.org> Tue Mar 21 10:45:26 UTC 2023 - Guillaume GARDET <guillaume.gardet@opensuse.org>