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 <[email protected]> + +- 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 <[email protected]> + +- Package ArmnnConverter and ArmnnQuantizer + +------------------------------------------------------------------- +Tue Jan 14 11:59:14 UTC 2020 - Dominique Leuenberger <[email protected]> + +- 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 %{with armnn_tools} +%{_bindir}/ArmnnConverter +%{_bindir}/ArmnnQuantizer +%endif %{_bindir}/TfLite*-Armnn %{_bindir}/Image*Generator %endif @@ -604,5 +618,4 @@ %{_libdir}/libarmnnOnnxParser.so %endif - %changelog
