From e819e85eca3420facc82b2b5f1a89eb8581bfecc Mon Sep 17 00:00:00 2001
From: Guillaume_G <>
Date: Jul 17 2021 21:47:06 +0000
Subject: Update armnn to version 21.05 / rev 17 via SR 906631
https://build.opensuse.org/request/show/906631
by user Guillaume_G + dimstar_suse
- Add '-Wno-error=stringop-overread' to workaround build error
with GCC11 with openCL enabled
- Add '-Wno-error=uninitialized -Wno-error=array-bounds' to
workaround build issues with GCC11 - https://github.com/ARM-software/armnn/issues/548
- Fix libarmnnOnnxParser version
---
diff --git a/.files b/.files
index d4808d5..065335f 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index ff2f953..99f2a86 100644
--- a/.rev
+++ b/.rev
@@ -135,4 +135,17 @@
<comment></comment>
<requestid>894803</requestid>
</revision>
+ <revision rev="17" vrev="2">
+ <srcmd5>da5b6aa1cbe2469adc983eee477f14bd</srcmd5>
+ <version>21.05</version>
+ <time>1626557796</time>
+ <user>dimstar_suse</user>
+ <comment>- Add '-Wno-error=stringop-overread' to workaround build error
+ with GCC11 with openCL enabled
+- Add '-Wno-error=uninitialized -Wno-error=array-bounds' to
+ workaround build issues with GCC11 - https://github.com/ARM-software/armnn/issues/548
+- Fix libarmnnOnnxParser version
+</comment>
+ <requestid>906631</requestid>
+ </revision>
</revisionlist>
diff --git a/armnn.changes b/armnn.changes
index 8ce2bf7..f5a2810 100644
--- a/armnn.changes
+++ b/armnn.changes
@@ -1,4 +1,21 @@
-------------------------------------------------------------------
+Fri Jul 16 08:23:43 UTC 2021 - Guillaume GARDET <guillaume.gardet@opensuse.org>
+
+- Add '-Wno-error=stringop-overread' to workaround build error
+ with GCC11 with openCL enabled
+
+-------------------------------------------------------------------
+Tue Jul 13 08:07:14 UTC 2021 - Guillaume GARDET <guillaume.gardet@opensuse.org>
+
+- Add '-Wno-error=uninitialized -Wno-error=array-bounds' to
+ workaround build issues with GCC11 - https://github.com/ARM-software/armnn/issues/548
+
+-------------------------------------------------------------------
+Tue May 25 06:49:01 UTC 2021 - Guillaume GARDET <guillaume.gardet@opensuse.org>
+
+- Fix libarmnnOnnxParser version
+
+-------------------------------------------------------------------
Fri May 21 06:55:48 UTC 2021 - Guillaume GARDET <guillaume.gardet@opensuse.org>
- Update to 21.05:
diff --git a/armnn.spec b/armnn.spec
index c9776a6..8f45af8 100644
--- a/armnn.spec
+++ b/armnn.spec
@@ -67,6 +67,7 @@
%define version_minor 05
%define version_lib 25
%define version_lib_tfliteparser 24
+%define version_lib_onnxparser 24
# Do not package ArmnnConverter, by default
%bcond_with armnn_tools
Name: armnn%{?package_suffix}
@@ -148,7 +149,7 @@ Requires: libarmnnSerializer%{version_lib}%{?package_suffix} = %{version}
Requires: libarmnnTfLiteParser%{version_lib_tfliteparser}%{?package_suffix} = %{version}
%endif
%if %{with armnn_onnx}
-Requires: libarmnnOnnxParser%{version_lib}%{?package_suffix} = %{version}
+Requires: libarmnnOnnxParser%{version_lib_onnxparser}%{?package_suffix} = %{version}
%endif
# Make sure we do not install both openCL and non-openCL (CPU only) versions.
%if "%{target}" == "opencl"
@@ -184,7 +185,7 @@ Requires: libarmnnSerializer%{version_lib}%{?package_suffix} = %{version}
Requires: libarmnnTfLiteParser%{version_lib_tfliteparser}%{?package_suffix} = %{version}
%endif
%if %{with armnn_onnx}
-Requires: libarmnnOnnxParser%{version_lib}%{?package_suffix} = %{version}
+Requires: libarmnnOnnxParser%{version_lib_onnxparser}%{?package_suffix} = %{version}
%endif
%description devel
@@ -330,16 +331,16 @@ This package contains the libarmnnTfLiteParser library from armnn.
%endif
%if %{with armnn_onnx}
-%package -n libarmnnOnnxParser%{version_lib}%{?package_suffix}
+%package -n libarmnnOnnxParser%{version_lib_onnxparser}%{?package_suffix}
Summary: libarmnnOnnxParser from armnn
Group: Development/Libraries/C and C++
%if "%{target}" == "opencl"
-Conflicts: libarmnnOnnxParser%{version_lib}
+Conflicts: libarmnnOnnxParser%{version_lib_onnxparser}
%else
-Conflicts: libarmnnOnnxParser%{version_lib}-opencl
+Conflicts: libarmnnOnnxParser%{version_lib_onnxparser}-opencl
%endif
-%description -n libarmnnOnnxParser%{version_lib}%{?package_suffix}
+%description -n libarmnnOnnxParser%{version_lib_onnxparser}%{?package_suffix}
Arm NN is an inference engine for CPUs, GPUs and NPUs.
It bridges the gap between existing NN frameworks and the underlying IP.
It enables efficient translation of existing neural network frameworks,
@@ -376,7 +377,7 @@ PROTO=$(find %{_libdir} -name onnx.proto)
protoc $PROTO --proto_path=. --proto_path=%{_includedir} --proto_path=$(dirname $(find %{_libdir} -name onnx)) --cpp_out=./onnx_deps
%endif
%if 0%{?suse_version} > 1500
-export CXX_ADDITIONAL_FLAGS="$CXX_ADDITIONAL_FLAGS -Wno-error=deprecated-copy -Wno-error=deprecated-declarations"
+export CXX_ADDITIONAL_FLAGS="$CXX_ADDITIONAL_FLAGS -Wno-error=stringop-overread -Wno-error=uninitialized -Wno-error=array-bounds -Wno-error=deprecated-copy -Wno-error=deprecated-declarations"
%endif
%cmake \
-DCMAKE_SKIP_RPATH=True \
@@ -505,8 +506,8 @@ LD_LIBRARY_PATH="$(pwd)/build/" \
%endif
%if %{with armnn_onnx}
-%post -n libarmnnOnnxParser%{version_lib}%{?package_suffix} -p /sbin/ldconfig
-%postun -n libarmnnOnnxParser%{version_lib}%{?package_suffix} -p /sbin/ldconfig
+%post -n libarmnnOnnxParser%{version_lib_onnxparser}%{?package_suffix} -p /sbin/ldconfig
+%postun -n libarmnnOnnxParser%{version_lib_onnxparser}%{?package_suffix} -p /sbin/ldconfig
%endif
%files
@@ -555,7 +556,7 @@ LD_LIBRARY_PATH="$(pwd)/build/" \
%endif
%if %{with armnn_onnx}
-%files -n libarmnnOnnxParser%{version_lib}%{?package_suffix}
+%files -n libarmnnOnnxParser%{version_lib_onnxparser}%{?package_suffix}
%{_libdir}/libarmnnOnnxParser.so.*
%endif