commit armnn for openSUSE:Factory
Hello community,
here is the log from the commit of package armnn for openSUSE:Factory checked
in at 2020-09-08 22:46:26
Comparing /work/SRC/openSUSE:Factory/armnn (Old)
and /work/SRC/openSUSE:Factory/.armnn.new.3399 (New)
Package is "armnn"
Tue Sep 8 22:46:26 2020 rev:11 rq:832531 version:20.08
Changes:
--- /work/SRC/openSUSE:Factory/armnn/armnn.changes 2020-06-17
14:56:52.290323554 +0200
+++ /work/SRC/openSUSE:Factory/.armnn.new.3399/armnn.changes2020-09-08
22:46:46.799500354 +0200
@@ -1,0 +2,23 @@
+Fri Sep 4 16:07:09 UTC 2020 - Guillaume GARDET
+
+- Add python support, disabled for now as it does not install
+ files atm
+
+---
+Fri Sep 4 14:56:36 UTC 2020 - Guillaume GARDET
+
+- Package libtimelineDecoderJson
+
+---
+Thu Sep 3 11:18:40 UTC 2020 - Guillaume GARDET
+
+- Update to 20.08:
+ * Changelog: https://github.com/ARM-software/armnn/releases/tag/v20.08
+- Refresh patch:
+ * 0005-add-armnn-mobilenet-test-example.patch
+- Drop upstream patch:
+ * armnn-fix-catch.patch
+- Disable ONNX on Tumbleweed since there is a compatibility issue
+ with ONNX 1.7.0, see: https://github.com/ARM-software/armnn/issues/419
+
+---
Old:
armnn-20.05.tar.gz
armnn-fix-catch.patch
New:
armnn-20.08.tar.gz
Other differences:
--
++ armnn.spec ++
--- /var/tmp/diff_new_pack.9scjiM/_old 2020-09-08 22:46:48.587501224 +0200
+++ /var/tmp/diff_new_pack.9scjiM/_new 2020-09-08 22:46:48.595501228 +0200
@@ -15,9 +15,12 @@
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
-
# Disable LTO until UnitTests passes with LTO enabled -
https://github.com/ARM-software/armnn/issues/341
%define _lto_cflags %{nil}
+
+# Disable Python binding for now
+%bcond_with PyArmnn
+
%define target @BUILD_FLAVOR@%{nil}
%if "%{target}" != ""
%define package_suffix -%{target}
@@ -63,15 +66,16 @@
%else # suse_version
%bcond_with armnn_tf
%endif # suse_version
-# ONNX is available on Leap 15.2+/SLE15SP2+
-%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150200
+# ONNX is available on Leap 15.2+/SLE15SP2+, but there is a compatibility issue
+# with ONNX 1.7.0 in Tumbleweed -
https://github.com/ARM-software/armnn/issues/419
+%if 0%{?sle_version} >= 150200
%bcond_without armnn_onnx
%else
%bcond_with armnn_onnx
%endif
%define version_major 20
-%define version_minor 05
-%define version_lib 21
+%define version_minor 08
+%define version_lib 22
# Do not package ArmnnConverter and ArmnnQuantizer, by default
%bcond_with armnn_tools
# Enable CAFFE
@@ -85,8 +89,6 @@
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/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
@@ -153,6 +155,11 @@
BuildRequires: tensorflow-devel
%endif
%endif
+%if %{with PyArmnn}
+BuildRequires: python3-devel
+BuildRequires: python3-wheel
+BuildRequires: swig >= 4
+%endif
%if %{with compute_cl}
Recommends: Mesa-libOpenCL
%endif
@@ -263,7 +270,7 @@
This package contains the libarmnn library from armnn.
%package -n libarmnnBasePipeServer%{version_lib}%{?package_suffix}
-Summary:libarmnn from armnn
+Summary:libarmnnBasePipeServer from armnn
Group: Development/Libraries/C and C++
%if "%{target}" == "opencl"
Conflicts: libarmnnBasePipeServer%{version_lib}
@@ -281,7 +288,7 @@
This package contains the libarmnnBasePipeServer library from armnn.
%package -n libtimelineDecoder%{version_lib}%{?package_suffix}
-Summary:libarmnn from armnn
+Summary:libtimelineDecoder from armnn
Group: Development/Libraries/C and C++
%if "%{target}" == "opencl"
Conflicts: libtimelineDecoder%{version_lib}
@@ -298,6 +305,24 @@
This package contains the libtimelineDecoder library from armnn.
+%package -n libtimelineDecoderJson%{version_lib}%{?package_suffix}
+Summary:libtimelineDecoderJson from armnn
+Group: Development/Libraries/C and C++
+%if "%{target}" == "opencl"
+Conflicts: libtimelineDecoderJson%{version_lib}
+%else
+Conflicts: libtimelineDecoderJson%{version_lib}-opencl
+%endif
+
+%description -n
commit armnn for openSUSE:Factory
Hello community, here is the log from the commit of package armnn for openSUSE:Factory checked in at 2020-06-17 14:56:25 Comparing /work/SRC/openSUSE:Factory/armnn (Old) and /work/SRC/openSUSE:Factory/.armnn.new.3606 (New) Package is "armnn" Wed Jun 17 14:56:25 2020 rev:10 rq:815376 version:20.05 Changes: --- /work/SRC/openSUSE:Factory/armnn/armnn.changes 2020-06-12 21:41:45.768078749 +0200 +++ /work/SRC/openSUSE:Factory/.armnn.new.3606/armnn.changes2020-06-17 14:56:52.290323554 +0200 @@ -1,0 +2,6 @@ +Wed Jun 17 07:19:10 UTC 2020 - Guillaume GARDET + +- Build only where ComputeLibrary is built: + aarch64 armv7 and x86_64 + +--- Other differences: -- ++ armnn.spec ++ --- /var/tmp/diff_new_pack.z6VMzp/_old 2020-06-17 14:56:53.718328444 +0200 +++ /var/tmp/diff_new_pack.z6VMzp/_new 2020-06-17 14:56:53.722328458 +0200 @@ -175,6 +175,7 @@ %else Conflicts: armnn-opencl %endif +ExclusiveArch: aarch64 armv7l armv7hl x86_64 %description Arm NN is an inference engine for CPUs, GPUs and NPUs.
commit armnn for openSUSE:Factory
Hello community,
here is the log from the commit of package armnn for openSUSE:Factory checked
in at 2020-06-12 21:39:12
Comparing /work/SRC/openSUSE:Factory/armnn (Old)
and /work/SRC/openSUSE:Factory/.armnn.new.3606 (New)
Package is "armnn"
Fri Jun 12 21:39:12 2020 rev:9 rq:812530 version:20.05
Changes:
--- /work/SRC/openSUSE:Factory/armnn/armnn.changes 2020-05-29
21:39:06.714959716 +0200
+++ /work/SRC/openSUSE:Factory/.armnn.new.3606/armnn.changes2020-06-12
21:40:36.947882072 +0200
@@ -1,0 +2,14 @@
+Thu Jun 4 09:51:23 UTC 2020 - Guillaume GARDET
+
+- 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
+
+---
Old:
armnn-20.02.tar.gz
armnn-enable-use-of-arm-compute-shared-library.patch
New:
armnn-20.05.tar.gz
armnn-fix-catch.patch
Other differences:
--
++ armnn.spec ++
--- /var/tmp/diff_new_pack.bEkNxH/_old 2020-06-12 21:40:38.579886736 +0200
+++ /var/tmp/diff_new_pack.bEkNxH/_new 2020-06-12 21:40:38.583886747 +0200
@@ -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 @@
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: 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 @@
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:
commit armnn for openSUSE:Factory
Hello community,
here is the log from the commit of package armnn for openSUSE:Factory checked
in at 2020-05-29 21:24:14
Comparing /work/SRC/openSUSE:Factory/armnn (Old)
and /work/SRC/openSUSE:Factory/.armnn.new.3606 (New)
Package is "armnn"
Fri May 29 21:24:14 2020 rev:8 rq:810035 version:20.02
Changes:
--- /work/SRC/openSUSE:Factory/armnn/armnn.changes 2020-04-01
19:13:43.651406646 +0200
+++ /work/SRC/openSUSE:Factory/.armnn.new.3606/armnn.changes2020-05-29
21:39:06.714959716 +0200
@@ -1,0 +2,7 @@
+Thu May 28 15:10:11 UTC 2020 - Guillaume GARDET
+
+- Apply boost link fixes only for armnn_extra_tests
+- Apply patches for armnn_extra_tests only when
+ armnn_extra_tests is built
+
+---
Other differences:
--
++ armnn.spec ++
--- /var/tmp/diff_new_pack.bMn9M3/_old 2020-05-29 21:39:07.382961705 +0200
+++ /var/tmp/diff_new_pack.bMn9M3/_new 2020-05-29 21:39:07.382961705 +0200
@@ -107,12 +107,14 @@
BuildRequires: boost-devel >= 1.59
%else
BuildRequires: libboost_filesystem-devel >= 1.59
-BuildRequires: libboost_log-devel >= 1.59
BuildRequires: libboost_program_options-devel >= 1.59
BuildRequires: libboost_system-devel >= 1.59
BuildRequires: libboost_test-devel >= 1.59
+%if %{with armnn_extra_tests}
+BuildRequires: libboost_log-devel >= 1.59
BuildRequires: libboost_thread-devel >= 1.59
%endif
+%endif
%if %{with armnn_caffe}
BuildRequires: caffe-devel
%endif
@@ -357,14 +359,16 @@
%prep
%setup -q -n armnn-%{version}
%patch1 -p1
+%if %{with armnn_extra_tests}
%patch200 -p1
%patch201 -p1
%patch202 -p1
%patch203 -p1
%patch204 -p1
%patch205 -p1
-# Boost fixes for dynamic linking
-sed -i 's/find_package(Boost 1.59 REQUIRED COMPONENTS unit_test_framework
system filesystem program_options)/find_package(Boost 1.59 REQUIRED COMPONENTS
unit_test_framework system filesystem log thread program_options)/'
./cmake/GlobalConfig.cmake
+# Add Boost log as downstream extra test requires it
+sed -i 's/find_package(Boost 1.59 REQUIRED COMPONENTS unit_test_framework
system filesystem program_options)/find_package(Boost 1.59 REQUIRED COMPONENTS
unit_test_framework system filesystem log program_options)/'
./cmake/GlobalConfig.cmake
+%endif
%build
%if %{with armnn_onnx}
commit armnn for openSUSE:Factory
Hello community,
here is the log from the commit of package armnn for openSUSE:Factory checked
in at 2020-04-01 19:10:51
Comparing /work/SRC/openSUSE:Factory/armnn (Old)
and /work/SRC/openSUSE:Factory/.armnn.new.3248 (New)
Package is "armnn"
Wed Apr 1 19:10:51 2020 rev:7 rq:790253 version:20.02
Changes:
--- /work/SRC/openSUSE:Factory/armnn/armnn.changes 2020-03-24
22:38:54.097280675 +0100
+++ /work/SRC/openSUSE:Factory/.armnn.new.3248/armnn.changes2020-04-01
19:13:43.651406646 +0200
@@ -1,0 +2,5 @@
+Tue Mar 31 15:23:29 UTC 2020 - Guillaume GARDET
+
+- Disable RPATH to fix build on Leap15.2/SLE15SP2
+
+---
Other differences:
--
++ armnn.spec ++
--- /var/tmp/diff_new_pack.UnRdEN/_old 2020-04-01 19:13:46.575407962 +0200
+++ /var/tmp/diff_new_pack.UnRdEN/_new 2020-04-01 19:13:46.579407963 +0200
@@ -386,6 +386,7 @@
%endif
%endif
%cmake \
+ -DCMAKE_SKIP_RPATH=True \
-DSHARED_BOOST=1 \
-DCMAKE_CXX_FLAGS:STRING="%{optflags} -pthread $CXX_ADDITIONAL_FLAGS
-Wno-error=implicit-fallthrough -Wno-error=unused-parameter" \
-DBOOST_LIBRARYDIR=%{_libdir} \
commit armnn for openSUSE:Factory
Hello community,
here is the log from the commit of package armnn for openSUSE:Factory checked
in at 2020-03-24 22:37:15
Comparing /work/SRC/openSUSE:Factory/armnn (Old)
and /work/SRC/openSUSE:Factory/.armnn.new.3160 (New)
Package is "armnn"
Tue Mar 24 22:37:15 2020 rev:6 rq:787844 version:20.02
Changes:
--- /work/SRC/openSUSE:Factory/armnn/armnn.changes 2020-03-11
18:52:00.367585270 +0100
+++ /work/SRC/openSUSE:Factory/.armnn.new.3160/armnn.changes2020-03-24
22:38:54.097280675 +0100
@@ -1,0 +2,9 @@
+Tue Mar 24 14:01:29 UTC 2020 - Guillaume GARDET
+
+- Add '-Wno-error=deprecated-declarations' to fix build with latest
+ protobuf 3.11.x (Tumbleweed)
+ https://github.com/ARM-software/armnn/issues/366
+- Use python-onnx package instead of python-onnx-devel, since it
+ is now a single package.
+
+---
Other differences:
--
++ armnn.spec ++
--- /var/tmp/diff_new_pack.Hd2MKU/_old 2020-03-24 22:38:55.237281229 +0100
+++ /var/tmp/diff_new_pack.Hd2MKU/_new 2020-03-24 22:38:55.241281231 +0100
@@ -138,7 +138,7 @@
%endif
%endif
%if %{with armnn_onnx}
-BuildRequires: python3-onnx-devel
+BuildRequires: python3-onnx
%endif
%if %{with armnn_tests}
BuildRequires: stb-devel
@@ -366,7 +366,6 @@
# Boost fixes for dynamic linking
sed -i 's/find_package(Boost 1.59 REQUIRED COMPONENTS unit_test_framework
system filesystem program_options)/find_package(Boost 1.59 REQUIRED COMPONENTS
unit_test_framework system filesystem log thread program_options)/'
./cmake/GlobalConfig.cmake
-
%build
%if %{with armnn_onnx}
mkdir onnx_deps
@@ -374,7 +373,7 @@
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"
+export CXX_ADDITIONAL_FLAGS="$CXX_ADDITIONAL_FLAGS -Wno-error=deprecated-copy
-Wno-error=deprecated-declarations"
%endif
%if 0%{?sle_version} == 150200
%if %{with armnn_tf}
commit armnn for openSUSE:Factory
Hello community,
here is the log from the commit of package armnn for openSUSE:Factory checked
in at 2020-03-11 18:50:08
Comparing /work/SRC/openSUSE:Factory/armnn (Old)
and /work/SRC/openSUSE:Factory/.armnn.new.3160 (New)
Package is "armnn"
Wed Mar 11 18:50:08 2020 rev:5 rq:783721 version:20.02
Changes:
--- /work/SRC/openSUSE:Factory/armnn/armnn.changes 2020-03-01
21:27:35.816505643 +0100
+++ /work/SRC/openSUSE:Factory/.armnn.new.3160/armnn.changes2020-03-11
18:52:00.367585270 +0100
@@ -1,0 +2,21 @@
+Wed Mar 11 08:41:20 UTC 2020 - Guillaume GARDET
+
+- Fix build on Leap 15.2
+
+---
+Mon Mar 9 17:47:42 UTC 2020 - Guillaume GARDET
+
+- Update to 20.02:
+ * Changelog: https://github.com/ARM-software/armnn/releases/tag/v20.02
+ * Drop upstream patch:
+- armnn-fix_include.patch
+ * Refresh patch:
+- 0006-armnn-mobilenet-test-example.patch
+ * Replace downstream patch:
+- 0007-enable-use-of-arm-compute-shared-library.patch
+by upstream patch:
+- armnn-enable-use-of-arm-compute-shared-library.patch
+ * Add 'vim' as BuildRequires since it needs 'xxd' tool
+- Use TensorFlow 2 also on Leap 15.2 / SLE15SP2
+
+---
Old:
0007-enable-use-of-arm-compute-shared-library.patch
armnn-19.11.tar.gz
armnn-fix_include.patch
New:
armnn-20.02.tar.gz
armnn-enable-use-of-arm-compute-shared-library.patch
Other differences:
--
++ armnn.spec ++
--- /var/tmp/diff_new_pack.sl3mqD/_old 2020-03-11 18:52:01.951585979 +0100
+++ /var/tmp/diff_new_pack.sl3mqD/_new 2020-03-11 18:52:01.951585979 +0100
@@ -18,17 +18,12 @@
# Disable LTO until UnitTests passes with LTO enabled -
https://github.com/ARM-software/armnn/issues/341
%define _lto_cflags %{nil}
-
%define target @BUILD_FLAVOR@%{nil}
%if "%{target}" != ""
%define package_suffix -%{target}
%endif
-# Use Tensorflow 2 for Tumbleweed only
-%if 0%{?suse_version} > 1500
+# Use Tensorflow version 2
%define tf_version_2 1
-%else
-%define tf_version_2 0
-%endif
# Compute library has neon enabled for aarch64 only
%ifarch aarch64
%bcond_without compute_neon
@@ -58,8 +53,8 @@
%else
%bcond_with armnn_flatbuffers
%endif
-# Enable TensorFlow only on TW aarch64 and x86_64 (TF fails to build on Leap
15.x and on armv7 TW)
-%if 0%{?suse_version} > 1500
+# Enable TensorFlow on TW and Leap 15.2/SLE15SP2 for aarch64 and x86_64 (TF
fails to build on armv7)
+%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150200
%ifarch aarch64 x86_64
%bcond_without armnn_tf
%else
@@ -74,8 +69,8 @@
%else
%bcond_with armnn_onnx
%endif
-%define version_major 19
-%define version_minor 11
+%define version_major 20
+%define version_minor 02
# Do not package ArmnnConverter and ArmnnQuantizer, by default
%bcond_with armnn_tools
# Enable CAFFE
@@ -89,10 +84,8 @@
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/311
-Patch1: armnn-fix_include.patch
-# Patch:
http://arago-project.org/git/?p=meta-arago.git;a=blob;f=meta-arago-extras/recipes-support/armnn/armnn/0007-enable-use-of-arm-compute-shared-library.patch;hb=master
-Patch2: 0007-enable-use-of-arm-compute-shared-library.patch
+# PATCH-FIX-UPSTREAM -
https://github.com/ARM-software/armnn/commit/6445cfff7519effd1df04eac88ae17d6e4e6693b
+Patch1: armnn-enable-use-of-arm-compute-shared-library.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
@@ -100,15 +93,16 @@
Patch203: 0009-command-line-options-for-video-port-selection.patch
Patch204: 0010-armnnexamples-update-for-19.08-modifications.patch
Patch205: armnn-fix_find_opencv.patch
-BuildRequires: ComputeLibrary-devel >= 19.08
+BuildRequires: ComputeLibrary-devel >= %{version_major}.%{version_minor}
BuildRequires: cmake >= 3.0.2
BuildRequires: gcc-c++
BuildRequires: protobuf-devel
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}
ExcludeArch:%ix86
-BuildRequires: valgrind-devel
%if 0%{?suse_version} < 1330
BuildRequires: boost-devel >= 1.59
%else
@@ -363,7 +357,6 @@
%prep
%setup -q -n
commit armnn for openSUSE:Factory
Hello community,
here is the log from the commit of package armnn for openSUSE:Factory checked
in at 2020-03-01 21:27:16
Comparing /work/SRC/openSUSE:Factory/armnn (Old)
and /work/SRC/openSUSE:Factory/.armnn.new.26092 (New)
Package is "armnn"
Sun Mar 1 21:27:16 2020 rev:4 rq:773364 version:19.11
Changes:
--- /work/SRC/openSUSE:Factory/armnn/armnn.changes 2020-01-20
22:51:45.827258554 +0100
+++ /work/SRC/openSUSE:Factory/.armnn.new.26092/armnn.changes 2020-03-01
21:27:35.816505643 +0100
@@ -1,0 +2,17 @@
+Mon Feb 10 13:01:53 UTC 2020 - Guillaume GARDET
+
+- Use Tensorflow 2.x only for Tumbleweed, as TensorFlow2 is not
+ available in Leap 15.2
+- Skip some tests if TensorFlow < 1.14 is used
+
+---
+Tue Jan 28 12:33:19 UTC 2020 - Guillaume GARDET
+
+- Enable ONNX on Leap 15.2
+
+---
+Tue Jan 28 09:48:55 UTC 2020 - Guillaume GARDET
+
+- Use tensorflow2 as armnn 19.11 now requires TensorFlow >= 1.14
+
+---
@@ -16,0 +34,13 @@
+
+---
+Fri Dec 6 13:45:57 UTC 2019 - Guillaume GARDET
+
+- Update to 19.11:
+ * Changelog: https://github.com/ARM-software/armnn/releases/tag/v19.11
+- Remove upstreamed patches:
+ * armnn-generate-versioned-library.patch
+ * armnn-fix_boost.patch
+ * armnn-fix_arm32_dep.patch
+ * armnn-fix_arm32.patch
+- Add patch to fix include:
+ * armnn-fix_include.patch
Old:
armnn-19.08.tar.gz
armnn-fix_arm32.patch
armnn-fix_arm32_dep.patch
armnn-fix_boost.patch
armnn-generate-versioned-library.patch
New:
armnn-19.11.tar.gz
armnn-fix_include.patch
Other differences:
--
++ armnn.spec ++
--- /var/tmp/diff_new_pack.X4Em8o/_old 2020-03-01 21:27:36.576507187 +0100
+++ /var/tmp/diff_new_pack.X4Em8o/_new 2020-03-01 21:27:36.576507187 +0100
@@ -16,52 +16,48 @@
#
-%define target @BUILD_FLAVOR@%{nil}
-
-# Disable LTO until lto link is fixed -
https://github.com/ARM-software/armnn/issues/251
+# Disable LTO until UnitTests passes with LTO enabled -
https://github.com/ARM-software/armnn/issues/341
%define _lto_cflags %{nil}
+%define target @BUILD_FLAVOR@%{nil}
%if "%{target}" != ""
%define package_suffix -%{target}
%endif
-
+# Use Tensorflow 2 for Tumbleweed only
+%if 0%{?suse_version} > 1500
+%define tf_version_2 1
+%else
+%define tf_version_2 0
+%endif
# Compute library has neon enabled for aarch64 only
%ifarch aarch64
%bcond_without compute_neon
%else
%bcond_with compute_neon
%endif
-
%if "%{target}" == "opencl"
%bcond_without compute_cl
%else
%bcond_with compute_cl
%endif
-
# stb-devel is available on Leap 15.1+
%if 0%{?suse_version} > 1500 || ( 0%{?sle_version} > 15 &&
0%{?is_opensuse} )
%bcond_without armnn_tests
%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
%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} )
%bcond_without armnn_flatbuffers
%else
%bcond_with armnn_flatbuffers
%endif
-
-# Enable CAFFE
-%bcond_without armnn_caffe
-
# Enable TensorFlow only on TW aarch64 and x86_64 (TF fails to build on Leap
15.x and on armv7 TW)
%if 0%{?suse_version} > 1500
%ifarch aarch64 x86_64
@@ -72,20 +68,18 @@
%else # suse_version
%bcond_with armnn_tf
%endif # suse_version
-
-# ONNX is available on Tumbleweed only
-%if 0%{?suse_version} > 1500
+# ONNX is available on Leap 15.2+
+%if 0%{?suse_version} > 1500 || ( 0%{?sle_version} >= 150200 &&
0%{?is_opensuse} )
%bcond_without armnn_onnx
%else
%bcond_with armnn_onnx
%endif
-
+%define version_major 19
+%define version_minor 11
# Do not package ArmnnConverter and ArmnnQuantizer, by default
%bcond_with armnn_tools
-
-%define version_major 19
-%define version_minor 08
-
+# Enable CAFFE
+%bcond_without armnn_caffe
Name: armnn%{?package_suffix}
Version:%{version_major}.%{version_minor}
Release:0
@@ -95,15 +89,10 @@
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/275
-Patch1: armnn-generate-versioned-library.patch
+# PATCH-FIX-UPSTREAM - https://github.com/ARM-software/armnn/issues/311
+Patch1:
commit armnn for openSUSE:Factory
Hello community,
here is the log from the commit of package armnn for openSUSE:Factory checked
in at 2020-01-20 22:51:06
Comparing /work/SRC/openSUSE:Factory/armnn (Old)
and /work/SRC/openSUSE:Factory/.armnn.new.26092 (New)
Package is "armnn"
Mon Jan 20 22:51:06 2020 rev:3 rq:765890 version:19.08
Changes:
--- /work/SRC/openSUSE:Factory/armnn/armnn.changes 2019-11-27
13:55:29.504295781 +0100
+++ /work/SRC/openSUSE:Factory/.armnn.new.26092/armnn.changes 2020-01-20
22:51:45.827258554 +0100
@@ -1,0 +2,17 @@
+Mon Jan 20 15:21:09 UTC 2020 - Guillaume GARDET
+
+- Disable ArmnnConverter and ArmnnQuantizer packaging by default
+ as it requires libQuantizer.so to be packaged, which is not yet
+
+---
+Tue Jan 14 13:07:58 UTC 2020 - Guillaume GARDET
+
+- Package ArmnnConverter and ArmnnQuantizer
+
+---
+Tue Jan 14 11:59:14 UTC 2020 - Dominique Leuenberger
+
+- ExcludeArch %ix86: Parts of the build deps (tensorflow/bazel) are
+ not supported on ix86.
+
+---
Other differences:
--
++ armnn.spec ++
--- /var/tmp/diff_new_pack.lHZMz7/_old 2020-01-20 22:51:47.675259265 +0100
+++ /var/tmp/diff_new_pack.lHZMz7/_new 2020-01-20 22:51:47.687259269 +0100
@@ -1,7 +1,7 @@
#
# spec file for package armnn
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,9 +12,10 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
+
%define target @BUILD_FLAVOR@%{nil}
# Disable LTO until lto link is fixed -
https://github.com/ARM-software/armnn/issues/251
@@ -79,6 +80,9 @@
%bcond_with armnn_onnx
%endif
+# Do not package ArmnnConverter and ArmnnQuantizer, by default
+%bcond_with armnn_tools
+
%define version_major 19
%define version_minor 08
@@ -88,7 +92,7 @@
Summary:Arm NN SDK enables machine learning workloads on
power-efficient devices
License:MIT
Group: Development/Libraries/Other
-Url:
https://developer.arm.com/products/processors/machine-learning/arm-nn
+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/275
@@ -120,8 +124,8 @@
%if %{with armnn_caffe}
BuildRequires: caffe-devel
%endif
-BuildRequires: cmake >= 3.0.2
BuildRequires: ComputeLibrary-devel >= 19.08
+BuildRequires: cmake >= 3.0.2
BuildRequires: gcc-c++
%if %{with armnn_flatbuffers}
BuildRequires: flatbuffers-devel
@@ -177,6 +181,7 @@
Conflicts: armnn-opencl
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+ExcludeArch:%ix86
%description
Arm NN is an inference engine for CPUs, GPUs and NPUs.
@@ -187,8 +192,8 @@
%package devel
Summary:Development headers and libraries for armnn
-Group: Development/Libraries/C and C++
# Make sure we do not install both openCL and non-openCL (CPU only) versions.
+Group: Development/Libraries/C and C++
%if "%{target}" == "opencl"
Conflicts: armnn-devel
%else
@@ -222,8 +227,8 @@
%if %{with armnn_extra_tests}
%package -n %{name}-extratests
Summary:Additionnal downstream tests for Arm NN
-Group: Development/Libraries/C and C++
# Make sure we do not install both openCL and non-openCL (CPU only) versions.
+Group: Development/Libraries/C and C++
%if "%{target}" == "opencl"
Conflicts: armnn-extratests
%else
@@ -478,6 +483,12 @@
%if %{with armnn_flatbuffers}
# Install Sample app
cp $CP_ARGS ./build/samples/SimpleSample %{buildroot}%{_bindir}
+%if %{with armnn_tools}
+# Install ArmNNConverter
+cp $CP_ARGS ./build/ArmnnConverter %{buildroot}%{_bindir}
+# Install ArmNNQuantizer
+cp $CP_ARGS ./build/ArmnnQuantizer %{buildroot}%{_bindir}
+%endif
%endif
# openCL UnitTests are failing in OBS due to the lack of openCL device
@@ -514,7 +525,6 @@
%postun -n libarmnnOnnxParser%{version_major}%{?package_suffix} -p
/sbin/ldconfig
%endif
-
%files
%defattr(-,root,root)
%doc README.md
@@ -526,6 +536,10 @@
%{_bindir}/MultipleNetworksCifar10
%endif
%if %{with armnn_flatbuffers}
+%if
commit armnn for openSUSE:Factory
Hello community, here is the log from the commit of package armnn for openSUSE:Factory checked in at 2019-11-27 13:54:58 Comparing /work/SRC/openSUSE:Factory/armnn (Old) and /work/SRC/openSUSE:Factory/.armnn.new.26869 (New) Package is "armnn" Wed Nov 27 13:54:58 2019 rev:2 rq:751086 version:19.08 Changes: --- /work/SRC/openSUSE:Factory/armnn/armnn.changes 2019-11-26 16:51:47.504261731 +0100 +++ /work/SRC/openSUSE:Factory/.armnn.new.26869/armnn.changes 2019-11-27 13:55:29.504295781 +0100 @@ -1,0 +2,7 @@ +Mon Nov 25 14:16:29 UTC 2019 - Guillaume GARDET + +- tensorflow-devel package now includes *.pb.* files, so + remove TensorFlow parser build workaround: + * armnn-fix_tensorflow_link.patch + +--- Old: armnn-fix_tensorflow_link.patch Other differences: -- ++ armnn.spec ++ --- /var/tmp/diff_new_pack.IF4oZt/_old 2019-11-27 13:55:30.840295218 +0100 +++ /var/tmp/diff_new_pack.IF4oZt/_new 2019-11-27 13:55:30.848295214 +0100 @@ -100,9 +100,6 @@ # PATCH-FIX-UPSTREAM - https://github.com/ARM-software/armnn/issues/266 Patch4: armnn-fix_arm32_dep.patch Patch5: armnn-fix_arm32.patch -# https://github.com/ARM-software/armnn/issues/207 -# FIXME: remove this patch once *.pb.cc files are packaged properly in tensorflow-devel - https://github.com/ARM-software/armnn/issues/269 -Patch100: armnn-fix_tensorflow_link.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 @@ -367,7 +364,6 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 -%patch100 -p1 %patch200 -p1 %patch201 -p1 %patch202 -p1
