Accepting request 1039048 from home:Guillaume_G:branches:science:machinelearning
- Update to 22.11: * Changelog: https://github.com/ARM-software/armnn/releases/tag/v22.11 * Add libarmnnTestUtils - Add patch to fix build: * armnn-gh711.patch - Update to 22.08: * Changelog: https://github.com/ARM-software/armnn/releases/tag/v22.08 - Drop upstream patch: * armnn-fix-gcc12.patch - Update to 22.05: * Changelog: https://github.com/ARM-software/armnn/releases/tag/v22.05 - Add patch to fix build with GCC12 and new flatbuffers: * armnn-fix-gcc12.patch OBS-URL: https://build.opensuse.org/request/show/1039048 OBS-URL: https://build.opensuse.org/package/show/science:machinelearning/armnn?expand=0&rev=64
This commit is contained in:
Git OBS Bridge
parent
c559658e25
commit
fe92d870c9
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:b11fe8e4af3a178a1fd7405950e444e1358057921b97c864b91fcadd6ae41716
|
||||
size 27958237
|
||||
3
armnn-22.11.tar.gz
Normal file
3
armnn-22.11.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:5d609381687ad63bcb6f9506e48d54ed9d7b134c95bcbad2a142d40c3a7f1290
|
||||
size 28448912
|
||||
10
armnn-gh711.patch
Normal file
10
armnn-gh711.patch
Normal file
@ -0,0 +1,10 @@
|
||||
--- armnn-22.11/tests/TfLiteYoloV3Big-Armnn/TfLiteYoloV3Big-Armnn.cpp.orig 2022-11-29 15:20:31.148251027 +0100
|
||||
+++ armnn-22.11/tests/TfLiteYoloV3Big-Armnn/TfLiteYoloV3Big-Armnn.cpp 2022-11-29 15:20:52.820459889 +0100
|
||||
@@ -20,6 +20,7 @@
|
||||
#include <chrono>
|
||||
#include <fstream>
|
||||
#include <iostream>
|
||||
+#include <iterator>
|
||||
#include <cmath>
|
||||
|
||||
using namespace armnnTfLiteParser;
|
||||
@ -1,3 +1,28 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Nov 28 07:40:40 UTC 2022 - Guillaume GARDET <guillaume.gardet@opensuse.org>
|
||||
|
||||
- Update to 22.11:
|
||||
* Changelog: https://github.com/ARM-software/armnn/releases/tag/v22.11
|
||||
* Add libarmnnTestUtils
|
||||
- Add patch to fix build:
|
||||
* armnn-gh711.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Aug 30 09:19:52 UTC 2022 - Guillaume GARDET <guillaume.gardet@opensuse.org>
|
||||
|
||||
- Update to 22.08:
|
||||
* Changelog: https://github.com/ARM-software/armnn/releases/tag/v22.08
|
||||
- Drop upstream patch:
|
||||
* armnn-fix-gcc12.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue May 31 13:31:55 UTC 2022 - Guillaume GARDET <guillaume.gardet@opensuse.org>
|
||||
|
||||
- Update to 22.05:
|
||||
* Changelog: https://github.com/ARM-software/armnn/releases/tag/v22.05
|
||||
- Add patch to fix build with GCC12 and new flatbuffers:
|
||||
* armnn-fix-gcc12.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Mar 15 13:06:29 UTC 2022 - Guillaume GARDET <guillaume.gardet@opensuse.org>
|
||||
|
||||
|
||||
43
armnn.spec
43
armnn.spec
@ -64,8 +64,9 @@
|
||||
%bcond_with armnn_onnx
|
||||
%endif
|
||||
%define version_major 22
|
||||
%define version_minor 02
|
||||
%define version_lib 28
|
||||
%define version_minor 11
|
||||
%define version_lib 31
|
||||
%define version_lib_testutils 2
|
||||
%define version_lib_tfliteparser 24
|
||||
%define version_lib_onnxparser 24
|
||||
Name: armnn%{?package_suffix}
|
||||
@ -77,6 +78,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/issues/711
|
||||
Patch1: armnn-gh711.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
|
||||
@ -108,7 +111,11 @@ BuildRequires: libboost_thread-devel >= 1.59
|
||||
%endif
|
||||
%if %{with armnn_flatbuffers}
|
||||
BuildRequires: flatbuffers-devel
|
||||
BuildRequires: tensorflow2-lite-devel
|
||||
%if 0%{?suse_version} > 1550
|
||||
BuildRequires: tensorflow-lite-devel >= 2.10
|
||||
%else
|
||||
BuildRequires: tensorflow2-lite-devel >= 2.10
|
||||
%endif
|
||||
%endif
|
||||
%if %{with compute_cl}
|
||||
# Mesa-libOpenCl is required for tests
|
||||
@ -167,6 +174,7 @@ Group: Development/Libraries/C and C++
|
||||
Requires: %{name} = %{version}
|
||||
Requires: libarmnn%{version_lib}%{?package_suffix} = %{version}
|
||||
Requires: libarmnnBasePipeServer%{version_lib}%{?package_suffix} = %{version}
|
||||
Requires: libarmnnTestUtils%{version_lib_testutils}%{?package_suffix}
|
||||
Requires: libtimelineDecoder%{version_lib}%{?package_suffix} = %{version}
|
||||
Requires: libtimelineDecoderJson%{version_lib}%{?package_suffix} = %{version}
|
||||
# Make sure we do not install both openCL and non-openCL (CPU only) versions.
|
||||
@ -251,6 +259,24 @@ modification – across Arm Cortex CPUs and Arm Mali GPUs.
|
||||
|
||||
This package contains the libarmnnBasePipeServer library from armnn.
|
||||
|
||||
%package -n libarmnnTestUtils%{version_lib_testutils}%{?package_suffix}
|
||||
Summary: libarmnnTestUtils from armnn
|
||||
Group: Development/Libraries/C and C++
|
||||
%if "%{target}" == "opencl"
|
||||
Conflicts: libarmnnTestUtils%{version_lib_testutils}
|
||||
%else
|
||||
Conflicts: libarmnnTestUtils%{version_lib_testutils}-opencl
|
||||
%endif
|
||||
|
||||
%description -n libarmnnTestUtils%{version_lib_testutils}%{?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 Lite, allowing them to run efficiently – without
|
||||
modification – across Arm Cortex CPUs and Arm Mali GPUs.
|
||||
|
||||
This package contains the libarmnnTestUtils library from armnn.
|
||||
|
||||
%package -n libtimelineDecoder%{version_lib}%{?package_suffix}
|
||||
Summary: libtimelineDecoder from armnn
|
||||
Group: Development/Libraries/C and C++
|
||||
@ -347,6 +373,7 @@ This package contains the libarmnnOnnxParser library from armnn.
|
||||
|
||||
%prep
|
||||
%setup -q -n armnn-%{version}
|
||||
%patch1 -p1
|
||||
%if %{with armnn_extra_tests}
|
||||
%patch200 -p1
|
||||
%patch201 -p1
|
||||
@ -458,6 +485,8 @@ cp $CP_ARGS ./build/samples/SimpleSample %{buildroot}%{_bindir}
|
||||
%endif
|
||||
# Drop static libs - https://github.com/ARM-software/armnn/issues/514
|
||||
rm -f %{buildroot}%{_libdir}/*.a
|
||||
# Drop unneeded files - https://github.com/ARM-software/armnn/issues/711
|
||||
rm -rf %{buildroot}%{_libdir}/objects-RelWithDebInfo
|
||||
|
||||
# openCL UnitTests are failing in OBS due to the lack of openCL device
|
||||
%if %{without compute_cl} && %{with armnn_tests}
|
||||
@ -473,6 +502,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 libarmnnTestUtils%{version_lib_testutils}%{?package_suffix} -p /sbin/ldconfig
|
||||
%postun -n libarmnnTestUtils%{version_lib_testutils}%{?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
|
||||
|
||||
@ -521,6 +553,9 @@ LD_LIBRARY_PATH="$(pwd)/build/" \
|
||||
%files -n libarmnnBasePipeServer%{version_lib}%{?package_suffix}
|
||||
%{_libdir}/libarmnnBasePipeServer.so.*
|
||||
|
||||
%files -n libarmnnTestUtils%{version_lib_testutils}%{?package_suffix}
|
||||
%{_libdir}/libarmnnTestUtils.so.*
|
||||
|
||||
%files -n libtimelineDecoder%{version_lib}%{?package_suffix}
|
||||
%{_libdir}/libtimelineDecoder.so.*
|
||||
|
||||
@ -547,8 +582,6 @@ LD_LIBRARY_PATH="$(pwd)/build/" \
|
||||
%dir %{_includedir}/armnn/backends
|
||||
%{_includedir}/armnn/backends/CMakeLists.txt
|
||||
%{_includedir}/armnn/backends/*.hpp
|
||||
%dir %{_includedir}/armnn/backends/profiling
|
||||
%{_includedir}/armnn/backends/profiling/*.hpp
|
||||
%dir %{_includedir}/armnn/profiling
|
||||
%{_includedir}/armnn/profiling/*.hpp
|
||||
%dir %{_includedir}/armnn/utility
|
||||
|
||||
Loading…
Reference in New Issue
Block a user