From 7fd488c5e5bdf6db569ad6b902b98623870e9275 Mon Sep 17 00:00:00 2001
From: Bernhard M. Wiedemann <bwiedemann+opensusegit@suse.de>
Date: Jun 12 2020 20:31:20 +0000
Subject: update 2020-06-12 20:31
---
diff --git a/0003-add-more-test-command-line-arguments.patch b/0003-add-more-test-command-line-arguments.patch
index 04eb049..b9069c8 100644
--- a/0003-add-more-test-command-line-arguments.patch
+++ b/0003-add-more-test-command-line-arguments.patch
@@ -3,6 +3,8 @@ From: Qin Su <qsu@ti.com>
Date: Fri, 22 Feb 2019 14:10:07 -0500
Subject: [PATCH] add more test command line arguments
+Updated by Guillaume_G to apply properly (s/BOOST_ASSERT/ARMNN_ASSERT/)
+
Upstream-Status: Inappropriate [TI only test code]
Signed-off-by: Qin Su <qsu@ti.com>
---
@@ -14,9 +16,9 @@ index 538720b..6fd21b8 100644
--- a/tests/InferenceTest.inl
+++ b/tests/InferenceTest.inl
@@ -326,6 +326,55 @@ int ClassifierInferenceTestMain(int argc,
- BOOST_ASSERT(modelFilename);
- BOOST_ASSERT(inputBindingName);
- BOOST_ASSERT(outputBindingName);
+ ARMNN_ASSERT(modelFilename);
+ ARMNN_ASSERT(inputBindingName);
+ ARMNN_ASSERT(outputBindingName);
+ int count;
+ const char *p_input;
+ char inmodelname[500];
diff --git a/armnn-20.02.tar.gz b/armnn-20.02.tar.gz
deleted file mode 120000
index c008188..0000000
--- a/armnn-20.02.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafybeiclzlwggo4r7ha2swexxfvbi2q47p2q33j52mdr5r3pk5ofm43qwm
\ No newline at end of file
diff --git a/armnn-20.05.tar.gz b/armnn-20.05.tar.gz
new file mode 120000
index 0000000..7ff4219
--- /dev/null
+++ b/armnn-20.05.tar.gz
@@ -0,0 +1 @@
+/ipfs/bafybeibamwz5f6jt7yukux2ovoynyuhslfxbrohbjhflbemyuozo4phtxm
\ No newline at end of file
diff --git a/armnn-enable-use-of-arm-compute-shared-library.patch b/armnn-enable-use-of-arm-compute-shared-library.patch
deleted file mode 100644
index 3f87aa1..0000000
--- a/armnn-enable-use-of-arm-compute-shared-library.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 6445cfff7519effd1df04eac88ae17d6e4e6693b Mon Sep 17 00:00:00 2001
-From: Matthew Bentham <Matthew.Bentham@arm.com>
-Date: Tue, 10 Mar 2020 11:13:17 +0000
-Subject: [PATCH] Github #326 Allow linking against shared Compute Library
-
-As a last resort, check for shared Compute Library in standard paths.
-This will work for Linux distribution builds where no static Compute
-Library has been installed.
-
-Change-Id: I1ea11d184ef9dcf4480ae0687a4ba81b402c5b2d
-Signed-off-by: Matthew Bentham <Matthew.Bentham@arm.com>
----
- cmake/GlobalConfig.cmake | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/cmake/GlobalConfig.cmake b/cmake/GlobalConfig.cmake
-index f4e4ad54..0df7cd40 100644
---- a/cmake/GlobalConfig.cmake
-+++ b/cmake/GlobalConfig.cmake
-@@ -254,6 +254,14 @@ if(ARMCOMPUTENEON OR ARMCOMPUTECL)
- find_library(ARMCOMPUTE_CORE_LIBRARY_DEBUG NAMES arm_compute_core-static)
- find_library(ARMCOMPUTE_CORE_LIBRARY_RELEASE NAMES arm_compute_core-static)
-
-+ # In case it wasn't there, try the dynamic libraries
-+ # This case will get used in a linux setup where the Compute Library
-+ # has been installed in a standard system library path as a dynamic library
-+ find_library(ARMCOMPUTE_LIBRARY_DEBUG NAMES arm_compute)
-+ find_library(ARMCOMPUTE_LIBRARY_RELEASE NAMES arm_compute)
-+ find_library(ARMCOMPUTE_CORE_LIBRARY_DEBUG NAMES arm_compute_core)
-+ find_library(ARMCOMPUTE_CORE_LIBRARY_RELEASE NAMES arm_compute_core)
-+
- set(ARMCOMPUTE_LIBRARIES
- debug ${ARMCOMPUTE_LIBRARY_DEBUG} ${ARMCOMPUTE_CORE_LIBRARY_DEBUG}
- optimized ${ARMCOMPUTE_LIBRARY_RELEASE} ${ARMCOMPUTE_CORE_LIBRARY_RELEASE} )
diff --git a/armnn-fix-catch.patch b/armnn-fix-catch.patch
new file mode 100644
index 0000000..9ad1536
--- /dev/null
+++ b/armnn-fix-catch.patch
@@ -0,0 +1,18 @@
+--- armnn-20.05.orig/tests/TfLiteYoloV3Big-Armnn/TfLiteYoloV3Big-Armnn.cpp 2020-06-08 08:53:31.543112449 +0200
++++ armnn-20.05/tests/TfLiteYoloV3Big-Armnn/TfLiteYoloV3Big-Armnn.cpp 2020-06-08 08:54:20.503535598 +0200
+@@ -34,7 +34,7 @@ static const int GENERAL_ERROR = -100;
+ auto r_local = v; \
+ if (r_local != 0) { return r_local;} \
+ } \
+- catch(armnn::Exception e) \
++ catch(armnn::Exception &e) \
+ { \
+ ARMNN_LOG(error) << "Oops: " << e.what(); \
+ return GENERAL_ERROR; \
+@@ -332,4 +332,4 @@ int main(int argc, char* argv[])
+
+ ARMNN_LOG(info) << "Run completed";
+ return 0;
+-}
+\ Pas de fin de ligne à la fin du fichier
++}
diff --git a/armnn.changes b/armnn.changes
index cce9e3a..73927ca 100644
--- a/armnn.changes
+++ b/armnn.changes
@@ -1,4 +1,18 @@
-------------------------------------------------------------------
+Thu Jun 4 09:51:23 UTC 2020 - Guillaume GARDET <guillaume.gardet@opensuse.org>
+
+- Unify Leap/SLE options
+- Update to 20.05:
+ * Changelog: https://github.com/ARM-software/armnn/releases/tag/v20.05
+- Drop upstream patch:
+ * armnn-enable-use-of-arm-compute-shared-library.patch
+- Refresh patch:
+ * 0003-add-more-test-command-line-arguments.patch
+- Add new patch to fix build with gcc10:
+ * armnn-fix-catch.patch
+- Package new libtimelineDecode and libarmnnBasePipeServer
+
+-------------------------------------------------------------------
Thu May 28 15:10:11 UTC 2020 - Guillaume GARDET <guillaume.gardet@opensuse.org>
- Apply boost link fixes only for armnn_extra_tests
diff --git a/armnn.spec b/armnn.spec
index bd43a3d..0e1ef51 100644
--- a/armnn.spec
+++ b/armnn.spec
@@ -41,14 +41,14 @@
%else
%bcond_with armnn_tests
%endif
-# Extra tests require opencv(3)-devel, but it is broken for Leap 15.x - boo#1154091
-%if 0%{?suse_version} > 1500
+# Extra tests require opencv(3)-devel, but it is broken for Leap 15.1 - boo#1154091
+%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150200
%bcond_without armnn_extra_tests
%else
%bcond_with armnn_extra_tests
%endif
-# flatbuffers-devel is available on Leap 15.2+
-%if 0%{?suse_version} > 1500 || ( 0%{?sle_version} >= 150200 && 0%{?is_opensuse} )
+# flatbuffers-devel is available on Leap 15.2+/SLE15SP2+
+%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150200
%bcond_without armnn_flatbuffers
%else
%bcond_with armnn_flatbuffers
@@ -63,14 +63,15 @@
%else # suse_version
%bcond_with armnn_tf
%endif # suse_version
-# ONNX is available on Leap 15.2+
-%if 0%{?suse_version} > 1500 || ( 0%{?sle_version} >= 150200 && 0%{?is_opensuse} )
+# ONNX is available on Leap 15.2+/SLE15SP2+
+%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150200
%bcond_without armnn_onnx
%else
%bcond_with armnn_onnx
%endif
%define version_major 20
-%define version_minor 02
+%define version_minor 05
+%define version_lib 21
# Do not package ArmnnConverter and ArmnnQuantizer, by default
%bcond_with armnn_tools
# Enable CAFFE
@@ -84,8 +85,8 @@ 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/commit/6445cfff7519effd1df04eac88ae17d6e4e6693b
-Patch1: armnn-enable-use-of-arm-compute-shared-library.patch
+# PATCH-FIX-UPSTREAM - https://github.com/ARM-software/armnn/issues/398
+Patch01: armnn-fix-catch.patch
# 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
@@ -101,7 +102,7 @@ BuildRequires: python-rpm-macros
BuildRequires: valgrind-devel
BuildRequires: vim
# Make armnn-opencl pulls lib*-opencl, and armnn pulls non opencl libs
-Requires: libarmnn%{version_major}%{?package_suffix} = %{version}
+Requires: libarmnn%{version_lib}%{?package_suffix} = %{version}
ExcludeArch: %ix86
%if 0%{?suse_version} < 1330
BuildRequires: boost-devel >= 1.59
@@ -156,17 +157,17 @@ BuildRequires: tensorflow-devel
Recommends: Mesa-libOpenCL
%endif
%if %{with armnn_flatbuffers}
-Requires: libarmnnSerializer%{version_major}%{?package_suffix} = %{version}
-Requires: libarmnnTfLiteParser%{version_major}%{?package_suffix} = %{version}
+Requires: libarmnnSerializer%{version_lib}%{?package_suffix} = %{version}
+Requires: libarmnnTfLiteParser%{version_lib}%{?package_suffix} = %{version}
%endif
%if %{with armnn_caffe}
-Requires: libarmnnCaffeParser%{version_major}%{?package_suffix} = %{version}
+Requires: libarmnnCaffeParser%{version_lib}%{?package_suffix} = %{version}
%endif
%if %{with armnn_onnx}
-Requires: libarmnnOnnxParser%{version_major}%{?package_suffix} = %{version}
+Requires: libarmnnOnnxParser%{version_lib}%{?package_suffix} = %{version}
%endif
%if %{with armnn_tf}
-Requires: libarmnnTfParser%{version_major}%{?package_suffix} = %{version}
+Requires: libarmnnTfParser%{version_lib}%{?package_suffix} = %{version}
%endif
# Make sure we do not install both openCL and non-openCL (CPU only) versions.
%if "%{target}" == "opencl"
@@ -187,7 +188,9 @@ Summary: Development headers and libraries for armnn
# Make sure we do not install both openCL and non-openCL (CPU only) versions.
Group: Development/Libraries/C and C++
Requires: %{name} = %{version}
-Requires: libarmnn%{version_major}%{?package_suffix} = %{version}
+Requires: libarmnn%{version_lib}%{?package_suffix} = %{version}
+Requires: libarmnnBasePipeServer%{version_lib}%{?package_suffix} = %{version}
+Requires: libtimelineDecoder%{version_lib}%{?package_suffix} = %{version}
# Make sure we do not install both openCL and non-openCL (CPU only) versions.
%if "%{target}" == "opencl"
Conflicts: armnn-devel
@@ -195,17 +198,17 @@ Conflicts: armnn-devel
Conflicts: armnn-opencl-devel
%endif
%if %{with armnn_flatbuffers}
-Requires: libarmnnSerializer%{version_major}%{?package_suffix} = %{version}
-Requires: libarmnnTfLiteParser%{version_major}%{?package_suffix} = %{version}
+Requires: libarmnnSerializer%{version_lib}%{?package_suffix} = %{version}
+Requires: libarmnnTfLiteParser%{version_lib}%{?package_suffix} = %{version}
%endif
%if %{with armnn_caffe}
-Requires: libarmnnCaffeParser%{version_major}%{?package_suffix} = %{version}
+Requires: libarmnnCaffeParser%{version_lib}%{?package_suffix} = %{version}
%endif
%if %{with armnn_onnx}
-Requires: libarmnnOnnxParser%{version_major}%{?package_suffix} = %{version}
+Requires: libarmnnOnnxParser%{version_lib}%{?package_suffix} = %{version}
%endif
%if %{with armnn_tf}
-Requires: libarmnnTfParser%{version_major}%{?package_suffix} = %{version}
+Requires: libarmnnTfParser%{version_lib}%{?package_suffix} = %{version}
%endif
%description devel
@@ -240,16 +243,16 @@ modification – across Arm Cortex CPUs and Arm Mali GPUs.
This package contains additionnal downstream tests for armnn.
%endif
-%package -n libarmnn%{version_major}%{?package_suffix}
+%package -n libarmnn%{version_lib}%{?package_suffix}
Summary: libarmnn from armnn
Group: Development/Libraries/C and C++
%if "%{target}" == "opencl"
-Conflicts: libarmnn%{version_major}
+Conflicts: libarmnn%{version_lib}
%else
-Conflicts: libarmnn%{version_major}-opencl
+Conflicts: libarmnn%{version_lib}-opencl
%endif
-%description -n libarmnn%{version_major}%{?package_suffix}
+%description -n libarmnn%{version_lib}%{?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,
@@ -258,17 +261,53 @@ modification – across Arm Cortex CPUs and Arm Mali GPUs.
This package contains the libarmnn library from armnn.
+%package -n libarmnnBasePipeServer%{version_lib}%{?package_suffix}
+Summary: libarmnn from armnn
+Group: Development/Libraries/C and C++
+%if "%{target}" == "opencl"
+Conflicts: libarmnnBasePipeServer%{version_lib}
+%else
+Conflicts: libarmnnBasePipeServer%{version_lib}-opencl
+%endif
+
+%description -n libarmnnBasePipeServer%{version_lib}%{?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,
+such as TensorFlow and Caffe, allowing them to run efficiently – without
+modification – across Arm Cortex CPUs and Arm Mali GPUs.
+
+This package contains the libarmnnBasePipeServer library from armnn.
+
+%package -n libtimelineDecoder%{version_lib}%{?package_suffix}
+Summary: libarmnn from armnn
+Group: Development/Libraries/C and C++
+%if "%{target}" == "opencl"
+Conflicts: libtimelineDecoder%{version_lib}
+%else
+Conflicts: libtimelineDecoder%{version_lib}-opencl
+%endif
+
+%description -n libtimelineDecoder%{version_lib}%{?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,
+such as TensorFlow and Caffe, allowing them to run efficiently – without
+modification – across Arm Cortex CPUs and Arm Mali GPUs.
+
+This package contains the libtimelineDecoder library from armnn.
+
%if %{with armnn_flatbuffers}
-%package -n libarmnnSerializer%{version_major}%{?package_suffix}
+%package -n libarmnnSerializer%{version_lib}%{?package_suffix}
Summary: libarmnnSerializer from armnn
Group: Development/Libraries/C and C++
%if "%{target}" == "opencl"
-Conflicts: libarmnnSerializer%{version_major}
+Conflicts: libarmnnSerializer%{version_lib}
%else
-Conflicts: libarmnnSerializer%{version_major}-opencl
+Conflicts: libarmnnSerializer%{version_lib}-opencl
%endif
-%description -n libarmnnSerializer%{version_major}%{?package_suffix}
+%description -n libarmnnSerializer%{version_lib}%{?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,
@@ -277,16 +316,16 @@ modification – across Arm Cortex CPUs and Arm Mali GPUs.
This package contains the libarmnnSerializer library from armnn.
-%package -n libarmnnTfLiteParser%{version_major}%{?package_suffix}
+%package -n libarmnnTfLiteParser%{version_lib}%{?package_suffix}
Summary: libarmnnTfLiteParser from armnn
Group: Development/Libraries/C and C++
%if "%{target}" == "opencl"
-Conflicts: libarmnnTfLiteParser%{version_major}
+Conflicts: libarmnnTfLiteParser%{version_lib}
%else
-Conflicts: libarmnnTfLiteParser%{version_major}-opencl
+Conflicts: libarmnnTfLiteParser%{version_lib}-opencl
%endif
-%description -n libarmnnTfLiteParser%{version_major}%{?package_suffix}
+%description -n libarmnnTfLiteParser%{version_lib}%{?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,
@@ -297,16 +336,16 @@ This package contains the libarmnnTfLiteParser library from armnn.
%endif
%if %{with armnn_tf}
-%package -n libarmnnTfParser%{version_major}%{?package_suffix}
+%package -n libarmnnTfParser%{version_lib}%{?package_suffix}
Summary: libarmnnTfParser from armnn
Group: Development/Libraries/C and C++
%if "%{target}" == "opencl"
-Conflicts: libarmnnTfParser%{version_major}
+Conflicts: libarmnnTfParser%{version_lib}
%else
-Conflicts: libarmnnTfParser%{version_major}-opencl
+Conflicts: libarmnnTfParser%{version_lib}-opencl
%endif
-%description -n libarmnnTfParser%{version_major}%{?package_suffix}
+%description -n libarmnnTfParser%{version_lib}%{?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,
@@ -317,16 +356,16 @@ This package contains the libarmnnTfParser library from armnn.
%endif
%if %{with armnn_caffe}
-%package -n libarmnnCaffeParser%{version_major}%{?package_suffix}
+%package -n libarmnnCaffeParser%{version_lib}%{?package_suffix}
Summary: libarmnnCaffeParser from armnn
Group: Development/Libraries/C and C++
%if "%{target}" == "opencl"
-Conflicts: libarmnnCaffeParser%{version_major}
+Conflicts: libarmnnCaffeParser%{version_lib}
%else
-Conflicts: libarmnnCaffeParser%{version_major}-opencl
+Conflicts: libarmnnCaffeParser%{version_lib}-opencl
%endif
-%description -n libarmnnCaffeParser%{version_major}%{?package_suffix}
+%description -n libarmnnCaffeParser%{version_lib}%{?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,
@@ -337,16 +376,16 @@ This package contains the libarmnnCaffeParser library from armnn.
%endif
%if %{with armnn_onnx}
-%package -n libarmnnOnnxParser%{version_major}%{?package_suffix}
+%package -n libarmnnOnnxParser%{version_lib}%{?package_suffix}
Summary: libarmnnOnnxParser from armnn
Group: Development/Libraries/C and C++
%if "%{target}" == "opencl"
-Conflicts: libarmnnOnnxParser%{version_major}
+Conflicts: libarmnnOnnxParser%{version_lib}
%else
-Conflicts: libarmnnOnnxParser%{version_major}-opencl
+Conflicts: libarmnnOnnxParser%{version_lib}-opencl
%endif
-%description -n libarmnnOnnxParser%{version_major}%{?package_suffix}
+%description -n libarmnnOnnxParser%{version_lib}%{?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,
@@ -510,30 +549,36 @@ LD_LIBRARY_PATH="$(pwd)/build/" \
./build/UnitTests $UnitTestFlags
%endif
-%post -n libarmnn%{version_major}%{?package_suffix} -p /sbin/ldconfig
-%postun -n libarmnn%{version_major}%{?package_suffix} -p /sbin/ldconfig
+%post -n libarmnn%{version_lib}%{?package_suffix} -p /sbin/ldconfig
+%postun -n libarmnn%{version_lib}%{?package_suffix} -p /sbin/ldconfig
+
+%post -n libarmnnBasePipeServer%{version_lib}%{?package_suffix} -p /sbin/ldconfig
+%postun -n libarmnnBasePipeServer%{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
%if %{with armnn_flatbuffers}
-%post -n libarmnnSerializer%{version_major}%{?package_suffix} -p /sbin/ldconfig
-%postun -n libarmnnSerializer%{version_major}%{?package_suffix} -p /sbin/ldconfig
+%post -n libarmnnSerializer%{version_lib}%{?package_suffix} -p /sbin/ldconfig
+%postun -n libarmnnSerializer%{version_lib}%{?package_suffix} -p /sbin/ldconfig
-%post -n libarmnnTfLiteParser%{version_major}%{?package_suffix} -p /sbin/ldconfig
-%postun -n libarmnnTfLiteParser%{version_major}%{?package_suffix} -p /sbin/ldconfig
+%post -n libarmnnTfLiteParser%{version_lib}%{?package_suffix} -p /sbin/ldconfig
+%postun -n libarmnnTfLiteParser%{version_lib}%{?package_suffix} -p /sbin/ldconfig
%endif
%if %{with armnn_tf}
-%post -n libarmnnTfParser%{version_major}%{?package_suffix} -p /sbin/ldconfig
-%postun -n libarmnnTfParser%{version_major}%{?package_suffix} -p /sbin/ldconfig
+%post -n libarmnnTfParser%{version_lib}%{?package_suffix} -p /sbin/ldconfig
+%postun -n libarmnnTfParser%{version_lib}%{?package_suffix} -p /sbin/ldconfig
%endif
%if %{with armnn_caffe}
-%post -n libarmnnCaffeParser%{version_major}%{?package_suffix} -p /sbin/ldconfig
-%postun -n libarmnnCaffeParser%{version_major}%{?package_suffix} -p /sbin/ldconfig
+%post -n libarmnnCaffeParser%{version_lib}%{?package_suffix} -p /sbin/ldconfig
+%postun -n libarmnnCaffeParser%{version_lib}%{?package_suffix} -p /sbin/ldconfig
%endif
%if %{with armnn_onnx}
-%post -n libarmnnOnnxParser%{version_major}%{?package_suffix} -p /sbin/ldconfig
-%postun -n libarmnnOnnxParser%{version_major}%{?package_suffix} -p /sbin/ldconfig
+%post -n libarmnnOnnxParser%{version_lib}%{?package_suffix} -p /sbin/ldconfig
+%postun -n libarmnnOnnxParser%{version_lib}%{?package_suffix} -p /sbin/ldconfig
%endif
%files
@@ -570,29 +615,35 @@ LD_LIBRARY_PATH="$(pwd)/build/" \
%{_bindir}/ArmnnExamples
%endif
-%files -n libarmnn%{version_major}%{?package_suffix}
+%files -n libarmnn%{version_lib}%{?package_suffix}
%{_libdir}/libarmnn.so.*
+%files -n libarmnnBasePipeServer%{version_lib}%{?package_suffix}
+%{_libdir}/libarmnnBasePipeServer.so.*
+
+%files -n libtimelineDecoder%{version_lib}%{?package_suffix}
+%{_libdir}/libtimelineDecoder.so.*
+
%if %{with armnn_flatbuffers}
-%files -n libarmnnSerializer%{version_major}%{?package_suffix}
+%files -n libarmnnSerializer%{version_lib}%{?package_suffix}
%{_libdir}/libarmnnSerializer.so.*
-%files -n libarmnnTfLiteParser%{version_major}%{?package_suffix}
+%files -n libarmnnTfLiteParser%{version_lib}%{?package_suffix}
%{_libdir}/libarmnnTfLiteParser.so.*
%endif
%if %{with armnn_tf}
-%files -n libarmnnTfParser%{version_major}%{?package_suffix}
+%files -n libarmnnTfParser%{version_lib}%{?package_suffix}
%{_libdir}/libarmnnTfParser.so.*
%endif
%if %{with armnn_caffe}
-%files -n libarmnnCaffeParser%{version_major}%{?package_suffix}
+%files -n libarmnnCaffeParser%{version_lib}%{?package_suffix}
%{_libdir}/libarmnnCaffeParser.so.*
%endif
%if %{with armnn_onnx}
-%files -n libarmnnOnnxParser%{version_major}%{?package_suffix}
+%files -n libarmnnOnnxParser%{version_lib}%{?package_suffix}
%{_libdir}/libarmnnOnnxParser.so.*
%endif
@@ -607,6 +658,8 @@ LD_LIBRARY_PATH="$(pwd)/build/" \
%{_includedir}/armnn/backends/profiling/*.hpp
%dir %{_includedir}/armnn/profiling
%{_includedir}/armnn/profiling/*.hpp
+%dir %{_includedir}/armnn/utility
+%{_includedir}/armnn/utility/*.hpp
%dir %{_includedir}/armnnUtils
%{_includedir}/armnnUtils/*.hpp
%dir %{_includedir}/armnnCaffeParser/
@@ -624,6 +677,8 @@ LD_LIBRARY_PATH="$(pwd)/build/" \
%dir %{_includedir}/armnnSerializer/
%{_includedir}/armnnSerializer/ISerializer.hpp
%{_libdir}/libarmnn.so
+%{_libdir}/libarmnnBasePipeServer.so
+%{_libdir}/libtimelineDecoder.so
%if %{with armnn_flatbuffers}
%{_libdir}/libarmnnSerializer.so
%{_libdir}/libarmnnTfLiteParser.so