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.changes 2020-09-08 22:46:46.799500354 +0200 @@ -1,0 +2,23 @@ +Fri Sep 4 16:07:09 UTC 2020 - Guillaume GARDET <guillaume.gar...@opensuse.org> + +- Add python support, disabled for now as it does not install + files atm + +------------------------------------------------------------------- +Fri Sep 4 14:56:36 UTC 2020 - Guillaume GARDET <guillaume.gar...@opensuse.org> + +- Package libtimelineDecoderJson + +------------------------------------------------------------------- +Thu Sep 3 11:18:40 UTC 2020 - Guillaume GARDET <guillaume.gar...@opensuse.org> + +- 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 libtimelineDecoderJson%{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_lib}%{?package_suffix} Summary: libarmnnSerializer from armnn @@ -398,7 +423,6 @@ %prep %setup -q -n armnn-%{version} -%patch1 -p1 %if %{with armnn_extra_tests} %patch200 -p1 %patch201 -p1 @@ -407,7 +431,7 @@ %patch204 -p1 %patch205 -p1 # 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 +sed -i 's/find_package(Boost 1.59 REQUIRED COMPONENTS unit_test_framework filesystem system program_options)/find_package(Boost 1.59 REQUIRED COMPONENTS unit_test_framework filesystem system log program_options)/' ./cmake/GlobalConfig.cmake %endif %build @@ -498,6 +522,13 @@ -DBUILD_UNIT_TESTS=OFF \ -DBUILD_TESTS=OFF \ %endif +%if %{with PyArmnn} + -DBUILD_PYTHON_WHL=ON \ + -DBUILD_PYTHON_SRC=ON \ +%else + -DBUILD_PYTHON_WHL=OFF \ + -DBUILD_PYTHON_SRC=OFF \ +%endif %if %{with armnn_extra_tests} -DBUILD_ARMNN_EXAMPLES=ON %else @@ -625,6 +656,9 @@ %files -n libtimelineDecoder%{version_lib}%{?package_suffix} %{_libdir}/libtimelineDecoder.so.* +%files -n libtimelineDecoderJson%{version_lib}%{?package_suffix} +%{_libdir}/libtimelineDecoderJson.so.* + %if %{with armnn_flatbuffers} %files -n libarmnnSerializer%{version_lib}%{?package_suffix} %{_libdir}/libarmnnSerializer.so.* @@ -680,6 +714,7 @@ %{_libdir}/libarmnn.so %{_libdir}/libarmnnBasePipeServer.so %{_libdir}/libtimelineDecoder.so +%{_libdir}/libtimelineDecoderJson.so %if %{with armnn_flatbuffers} %{_libdir}/libarmnnSerializer.so %{_libdir}/libarmnnTfLiteParser.so ++++++ 0005-add-armnn-mobilenet-test-example.patch ++++++ --- /var/tmp/diff_new_pack.9scjiM/_old 2020-09-08 22:46:48.615501238 +0200 +++ /var/tmp/diff_new_pack.9scjiM/_new 2020-09-08 22:46:48.623501242 +0200 @@ -7,6 +7,7 @@ Signed-off-by: Qin Su <q...@ti.com> Signed-off-by: Djordje Senicic <x0157...@ti.com> [Guillaume's update: Add boost_log dep] +[Guillaume's update: Update to apply on top of 20.08] --- tests/CMakeLists.txt | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) @@ -23,7 +24,7 @@ include(CheckIncludeFiles) @@ -348,3 +351,42 @@ if(BUILD_ARMNN_QUANTIZER) - add_executable_ex(ImageCSVFileGenerator ${ImageCSVFileGenerator_sources}) + target_include_directories(ImageCSVFileGenerator PRIVATE ../src/armnnUtils) ImageTensorExecutor(ImageCSVFileGenerator) endif() + ++++++ armnn-20.05.tar.gz -> armnn-20.08.tar.gz ++++++ /work/SRC/openSUSE:Factory/armnn/armnn-20.05.tar.gz /work/SRC/openSUSE:Factory/.armnn.new.3399/armnn-20.08.tar.gz differ: char 15, line 1
