From f6e11448681a4891300d8d164e2f669a7e4a5519 Mon Sep 17 00:00:00 2001
From: Guillaume_G <>
Date: Apr 08 2021 19:42:00 +0000
Subject: Update armnn to version 21.02 / rev 15 via SR 883852
https://build.opensuse.org/request/show/883852
by user Guillaume_G + RBrownSUSE
---
diff --git a/.files b/.files
index 7450620..134beb0 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index ea8ffc3..7195f7e 100644
--- a/.rev
+++ b/.rev
@@ -119,4 +119,12 @@
872350
+
+ 71ca322eb1207b6d11bc266aedadea4f
+ 21.02
+
+ RBrownSUSE
+
+ 883852
+
diff --git a/armnn-20.11.tar.gz b/armnn-20.11.tar.gz
deleted file mode 120000
index f0745f1..0000000
--- a/armnn-20.11.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafybeiack67hda3urbm7uiotax67na67uldvkfozzglsfnpki3ovlfkcrq
\ No newline at end of file
diff --git a/armnn-21.02.tar.gz b/armnn-21.02.tar.gz
new file mode 120000
index 0000000..8c85fc8
--- /dev/null
+++ b/armnn-21.02.tar.gz
@@ -0,0 +1 @@
+/ipfs/bafybeihut45txoaorgaeoexz47gkhi755tcfm4ltoovjhnq4aipy5yqs74
\ No newline at end of file
diff --git a/armnn.changes b/armnn.changes
index b5a4a96..259c599 100644
--- a/armnn.changes
+++ b/armnn.changes
@@ -1,4 +1,12 @@
-------------------------------------------------------------------
+Mon Mar 29 12:17:08 UTC 2021 - Guillaume GARDET
+
+- Update to 21.02:
+ * Changelog: https://github.com/ARM-software/armnn/releases/tag/v21.02
+- Drop upstream patch:
+ * c5c40fe.diff
+
+-------------------------------------------------------------------
Mon Feb 15 09:48:06 UTC 2021 - Guillaume GARDET
- Fix instalaltion of cmake files with an upstream patch:
diff --git a/armnn.spec b/armnn.spec
index ba39abf..8de3e3f 100644
--- a/armnn.spec
+++ b/armnn.spec
@@ -74,9 +74,9 @@
%else
%bcond_with armnn_onnx
%endif
-%define version_major 20
-%define version_minor 11
-%define version_lib 23
+%define version_major 21
+%define version_minor 02
+%define version_lib 24
# Do not package ArmnnConverter and ArmnnQuantizer, by default
%bcond_with armnn_tools
# Enable CAFFE
@@ -92,8 +92,6 @@ 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/499
Patch1: 96beb97.diff
-# PATCH-FIX-UPSTREAM - https://github.com/ARM-software/armnn/issues/481
-Patch2: c5c40fe.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
@@ -429,7 +427,6 @@ This package contains the libarmnnOnnxParser library from armnn.
%prep
%setup -q -n armnn-%{version}
%patch1 -p1
-%patch2 -p1
%if %{with armnn_extra_tests}
%patch200 -p1
%patch201 -p1
@@ -575,7 +572,7 @@ cp $CP_ARGS ./build/ArmnnConverter %{buildroot}%{_bindir}
cp $CP_ARGS ./build/ArmnnQuantizer %{buildroot}%{_bindir}
%endif
%endif
-# Dropped static libs
+# Drop static libs - https://github.com/ARM-software/armnn/issues/514
rm -f %{buildroot}%{_libdir}/*.a
# openCL UnitTests are failing in OBS due to the lack of openCL device
@@ -596,6 +593,9 @@ LD_LIBRARY_PATH="$(pwd)/build/" \
%post -n libarmnnBasePipeServer%{version_lib}%{?package_suffix} -p /sbin/ldconfig
%postun -n libarmnnBasePipeServer%{version_lib}%{?package_suffix} -p /sbin/ldconfig
+%post -n libtimelineDecoderJson%{version_lib}%{?package_suffix} -p /sbin/ldconfig
+%postun -n libtimelineDecoderJson%{version_lib}%{?package_suffix} -p /sbin/ldconfig
+
%post -n libtimelineDecoder%{version_lib}%{?package_suffix} -p /sbin/ldconfig
%postun -n libtimelineDecoder%{version_lib}%{?package_suffix} -p /sbin/ldconfig
@@ -707,13 +707,13 @@ LD_LIBRARY_PATH="$(pwd)/build/" \
%dir %{_includedir}/armnnUtils
%{_includedir}/armnnUtils/*.hpp
%dir %{_includedir}/armnnCaffeParser/
-%{_includedir}/armnnCaffeParser/ICaffeParser.hpp
+%{_includedir}/armnnCaffeParser/*.hpp
%dir %{_includedir}/armnnOnnxParser/
-%{_includedir}/armnnOnnxParser/IOnnxParser.hpp
+%{_includedir}/armnnOnnxParser/*.hpp
%dir %{_includedir}/armnnTfLiteParser/
-%{_includedir}/armnnTfLiteParser/ITfLiteParser.hpp
+%{_includedir}/armnnTfLiteParser/*.hpp
%dir %{_includedir}/armnnTfParser/
-%{_includedir}/armnnTfParser/ITfParser.hpp
+%{_includedir}/armnnTfParser/*.hpp
%dir %{_includedir}/armnnDeserializer/
%{_includedir}/armnnDeserializer/IDeserializer.hpp
%dir %{_includedir}/armnnQuantizer
diff --git a/c5c40fe.diff b/c5c40fe.diff
deleted file mode 100644
index 8b7067f..0000000
--- a/c5c40fe.diff
+++ /dev/null
@@ -1,40 +0,0 @@
-From c5c40fef3d4b3de5d1aa26c1c4dc72dcd74a8bc6 Mon Sep 17 00:00:00 2001
-From: Keith Mok
-Date: Fri, 08 Jan 2021 15:25:14 -0800
-Subject: [PATCH] ArmnnConfig.cmake install to correct directory
-
-Signed-off-by: Keith Mok
-Change-Id: I9b1037275379bdbf452589357576cfa763b7c128
----
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 789e2d9..a2b6e90 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1160,7 +1160,7 @@
- EXPORT armnn-targets
- FILE ArmnnTargets.cmake
- NAMESPACE Armnn::
-- DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
- )
-
- ####################################################
-@@ -1173,7 +1173,7 @@
- configure_package_config_file(
- ${CMAKE_CURRENT_LIST_DIR}/cmake/ArmnnConfig.cmake.in
- ${CMAKE_CURRENT_BINARY_DIR}/ArmnnConfig.cmake
-- INSTALL_DESTINATION ${INSTALL_CONFIGDIR}
-+ INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
- )
-
- ####################################################
-@@ -1181,7 +1181,7 @@
- install(
- FILES
- ${CMAKE_CURRENT_BINARY_DIR}/ArmnnConfig.cmake
-- DESTINATION ${INSTALL_CONFIGDIR}
-+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
- )
-
- ####################################################