Hello community, here is the log from the commit of package armnn for openSUSE:Leap:15.2 checked in at 2020-03-09 17:59:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/armnn (Old) and /work/SRC/openSUSE:Leap:15.2/.armnn.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "armnn" Mon Mar 9 17:59:28 2020 rev:2 rq:774105 version:19.11 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/armnn/armnn.changes 2020-02-09 11:24:51.583279856 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.armnn.new.26092/armnn.changes 2020-03-09 17:59:31.140643372 +0100 @@ -1,0 +2,17 @@ +Mon Feb 10 13:01:53 UTC 2020 - Guillaume GARDET <[email protected]> + +- 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 <[email protected]> + +- Enable ONNX on Leap 15.2 + +------------------------------------------------------------------- +Tue Jan 28 09:48:55 UTC 2020 - Guillaume GARDET <[email protected]> + +- 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 <[email protected]> + +- 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.r4W9W6/_old 2020-03-09 17:59:31.884643741 +0100 +++ /var/tmp/diff_new_pack.r4W9W6/_new 2020-03-09 17:59:31.888643743 +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} > 150000 && 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: 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/issues/274 -Patch3: armnn-fix_boost.patch -# PATCH-FIX-UPSTREAM - https://github.com/ARM-software/armnn/issues/266 -Patch4: armnn-fix_arm32_dep.patch -Patch5: armnn-fix_arm32.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 @@ -111,6 +100,15 @@ 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: cmake >= 3.0.2 +BuildRequires: gcc-c++ +BuildRequires: protobuf-devel +BuildRequires: python-rpm-macros +# 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 @@ -124,13 +122,14 @@ %if %{with armnn_caffe} BuildRequires: caffe-devel %endif -BuildRequires: ComputeLibrary-devel >= 19.08 -BuildRequires: cmake >= 3.0.2 -BuildRequires: gcc-c++ %if %{with armnn_flatbuffers} BuildRequires: flatbuffers-devel +%if %{tf_version_2} +BuildRequires: tensorflow2-lite-devel +%else BuildRequires: tensorflow-lite-devel %endif +%endif %if %{with compute_cl} # Mesa-libOpenCl is required for tests BuildRequires: Mesa-libOpenCL @@ -147,20 +146,19 @@ %if %{with armnn_onnx} BuildRequires: python3-onnx-devel %endif -BuildRequires: protobuf-devel -BuildRequires: python-rpm-macros %if %{with armnn_tests} BuildRequires: stb-devel %endif %if %{with armnn_tf} +%if %{tf_version_2} +BuildRequires: tensorflow2-devel +%else BuildRequires: tensorflow-devel %endif -BuildRequires: valgrind-devel +%endif %if %{with compute_cl} Recommends: Mesa-libOpenCL %endif -# Make armnn-opencl pulls lib*-opencl, and armnn pulls non opencl libs -Requires: libarmnn%{version_major}%{?package_suffix} = %{version} %if %{with armnn_flatbuffers} Requires: libarmnnSerializer%{version_major}%{?package_suffix} = %{version} Requires: libarmnnTfLiteParser%{version_major}%{?package_suffix} = %{version} @@ -180,8 +178,6 @@ %else Conflicts: armnn-opencl %endif -BuildRoot: %{_tmppath}/%{name}-%{version}-build -ExcludeArch: %ix86 %description Arm NN is an inference engine for CPUs, GPUs and NPUs. @@ -194,13 +190,14 @@ 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} +# Make sure we do not install both openCL and non-openCL (CPU only) versions. %if "%{target}" == "opencl" Conflicts: armnn-devel %else Conflicts: armnn-opencl-devel %endif -Requires: %{name} = %{version} -Requires: libarmnn%{version_major}%{?package_suffix} = %{version} %if %{with armnn_flatbuffers} Requires: libarmnnSerializer%{version_major}%{?package_suffix} = %{version} Requires: libarmnnTfLiteParser%{version_major}%{?package_suffix} = %{version} @@ -229,12 +226,13 @@ Summary: Additionnal downstream tests for Arm NN # Make sure we do not install both openCL and non-openCL (CPU only) versions. Group: Development/Libraries/C and C++ +Requires: %{name} +# Make sure we do not install both openCL and non-openCL (CPU only) versions. %if "%{target}" == "opencl" Conflicts: armnn-extratests %else Conflicts: armnn-opencl-extratests %endif -Requires: %{name} %description -n %{name}-extratests Arm NN is an inference engine for CPUs, GPUs and NPUs. @@ -247,13 +245,13 @@ %endif %package -n libarmnn%{version_major}%{?package_suffix} +Summary: libarmnn from armnn +Group: Development/Libraries/C and C++ %if "%{target}" == "opencl" Conflicts: libarmnn%{version_major} %else Conflicts: libarmnn%{version_major}-opencl %endif -Summary: libarmnn from armnn -Group: Development/Libraries/C and C++ %description -n libarmnn%{version_major}%{?package_suffix} Arm NN is an inference engine for CPUs, GPUs and NPUs. @@ -266,13 +264,13 @@ %if %{with armnn_flatbuffers} %package -n libarmnnSerializer%{version_major}%{?package_suffix} +Summary: libarmnnSerializer from armnn +Group: Development/Libraries/C and C++ %if "%{target}" == "opencl" Conflicts: libarmnnSerializer%{version_major} %else Conflicts: libarmnnSerializer%{version_major}-opencl %endif -Summary: libarmnnSerializer from armnn -Group: Development/Libraries/C and C++ %description -n libarmnnSerializer%{version_major}%{?package_suffix} Arm NN is an inference engine for CPUs, GPUs and NPUs. @@ -284,13 +282,13 @@ This package contains the libarmnnSerializer library from armnn. %package -n libarmnnTfLiteParser%{version_major}%{?package_suffix} +Summary: libarmnnTfLiteParser from armnn +Group: Development/Libraries/C and C++ %if "%{target}" == "opencl" Conflicts: libarmnnTfLiteParser%{version_major} %else Conflicts: libarmnnTfLiteParser%{version_major}-opencl %endif -Summary: libarmnnTfLiteParser from armnn -Group: Development/Libraries/C and C++ %description -n libarmnnTfLiteParser%{version_major}%{?package_suffix} Arm NN is an inference engine for CPUs, GPUs and NPUs. @@ -304,13 +302,13 @@ %if %{with armnn_tf} %package -n libarmnnTfParser%{version_major}%{?package_suffix} +Summary: libarmnnTfParser from armnn +Group: Development/Libraries/C and C++ %if "%{target}" == "opencl" Conflicts: libarmnnTfParser%{version_major} %else Conflicts: libarmnnTfParser%{version_major}-opencl %endif -Summary: libarmnnTfParser from armnn -Group: Development/Libraries/C and C++ %description -n libarmnnTfParser%{version_major}%{?package_suffix} Arm NN is an inference engine for CPUs, GPUs and NPUs. @@ -324,13 +322,13 @@ %if %{with armnn_caffe} %package -n libarmnnCaffeParser%{version_major}%{?package_suffix} +Summary: libarmnnCaffeParser from armnn +Group: Development/Libraries/C and C++ %if "%{target}" == "opencl" Conflicts: libarmnnCaffeParser%{version_major} %else Conflicts: libarmnnCaffeParser%{version_major}-opencl %endif -Summary: libarmnnCaffeParser from armnn -Group: Development/Libraries/C and C++ %description -n libarmnnCaffeParser%{version_major}%{?package_suffix} Arm NN is an inference engine for CPUs, GPUs and NPUs. @@ -344,13 +342,13 @@ %if %{with armnn_onnx} %package -n libarmnnOnnxParser%{version_major}%{?package_suffix} +Summary: libarmnnOnnxParser from armnn +Group: Development/Libraries/C and C++ %if "%{target}" == "opencl" Conflicts: libarmnnOnnxParser%{version_major} %else Conflicts: libarmnnOnnxParser%{version_major}-opencl %endif -Summary: libarmnnOnnxParser from armnn -Group: Development/Libraries/C and C++ %description -n libarmnnOnnxParser%{version_major}%{?package_suffix} Arm NN is an inference engine for CPUs, GPUs and NPUs. @@ -366,9 +364,6 @@ %setup -q -n armnn-%{version} %patch1 -p1 %patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 %patch200 -p1 %patch201 -p1 %patch202 -p1 @@ -417,7 +412,11 @@ %endif %if %{with armnn_tf} -DBUILD_TF_PARSER=ON \ +%if %{tf_version_2} + -DTF_GENERATED_SOURCES=%{python3_sitelib}/tensorflow_core/include/ \ +%else -DTF_GENERATED_SOURCES=%{python3_sitelib}/tensorflow/include/ \ +%endif %else -DBUILD_TF_PARSER=OFF \ %endif @@ -425,7 +424,7 @@ -DARMCOMPUTE_INCLUDE=%{_includedir} \ -DHALF_INCLUDE=%{_includedir}/half \ -DARMCOMPUTE_BUILD_DIR=%{_libdir} \ - -DARMCOMPUTE_ROOT=/usr \ + -DARMCOMPUTE_ROOT=%{_prefix} \ %endif %if %{with compute_neon} -DARMCOMPUTENEON=ON \ @@ -457,14 +456,14 @@ -DBUILD_ARMNN_EXAMPLES=OFF %endif -%if %{suse_version} > 1500 +%if 0%{?suse_version} > 1500 %cmake_build %else %make_jobs %endif %if %{with armnn_tests} pushd tests/ -%if %{suse_version} > 1500 +%if 0%{?suse_version} > 1500 %cmake_build %else %make_jobs @@ -495,8 +494,12 @@ %if %{without compute_cl} && %{with armnn_tests} %check # Run tests +%if !%{tf_version_2} +# Skip some TF Lite tests because TensorFlow < 1.14 is used and make some tests failing +export UnitTestFlags="-t !TensorflowLiteParser/SliceSingleDim -t !TensorflowLiteParser/SliceD123 -t !TensorflowLiteParser/SliceD213 -t !TensorflowLiteParser/TransposeWithPermuteData -t !TensorflowLiteParser/TransposeWithoutPermuteDims" +%endif LD_LIBRARY_PATH="$(pwd)/build/" \ -./build/UnitTests +./build/UnitTests $UnitTestFlags %endif %post -n libarmnn%{version_major}%{?package_suffix} -p /sbin/ldconfig ++++++ armnn-19.08.tar.gz -> armnn-19.11.tar.gz ++++++ ++++ 119742 lines of diff (skipped) ++++++ armnn-fix_include.patch ++++++ >From 78f24e16bd7de81f2fa3da34247797106161d0d4 Mon Sep 17 00:00:00 2001 From: Francis Murtagh <[email protected]> Date: Fri, 06 Dec 2019 14:50:54 +0000 Subject: [PATCH] Bugfix: Fix include directives for Gatord * Github issue #311 Change-Id: I5fd8bca4512643573f97805d69384d9445962801 Signed-off-by: Francis Murtagh <[email protected]> --- diff --git a/tests/profiling/gatordmock/PeriodicCounterCaptureCommandHandler.hpp b/tests/profiling/gatordmock/PeriodicCounterCaptureCommandHandler.hpp index 4135a2f..478d0a6 100644 --- a/tests/profiling/gatordmock/PeriodicCounterCaptureCommandHandler.hpp +++ b/tests/profiling/gatordmock/PeriodicCounterCaptureCommandHandler.hpp @@ -7,7 +7,6 @@ #include <Packet.hpp> #include <CommandHandlerFunctor.hpp> -#include "../../armnn/src/profiling/Packet.hpp" #include <vector> diff --git a/tests/profiling/gatordmock/PeriodicCounterSelectionResponseHandler.hpp b/tests/profiling/gatordmock/PeriodicCounterSelectionResponseHandler.hpp index faf9792..6b82280 100644 --- a/tests/profiling/gatordmock/PeriodicCounterSelectionResponseHandler.hpp +++ b/tests/profiling/gatordmock/PeriodicCounterSelectionResponseHandler.hpp @@ -3,8 +3,8 @@ // SPDX-License-Identifier: MIT // -#include "../../armnn/src/profiling/CommandHandlerFunctor.hpp" -#include "../../armnn/src/profiling/Packet.hpp" +#include <CommandHandlerFunctor.hpp> +#include <Packet.hpp> #include <vector>
