From e3f529cb50a51b85e07bf025710970be851a286cf797db13912bd27230c088a6 Mon Sep 17 00:00:00 2001 From: Guillaume GARDET Date: Wed, 29 Jan 2020 16:46:06 +0000 Subject: [PATCH 1/2] Accepting request 768396 from home:Guillaume_G:branches:science:machinelearning Update to 19.11 OBS-URL: https://build.opensuse.org/request/show/768396 OBS-URL: https://build.opensuse.org/package/show/science:machinelearning/ComputeLibrary?expand=0&rev=9 --- ComputeLibrary-19.08.tar.gz | 3 --- ComputeLibrary-19.11.tar.gz | 3 +++ ComputeLibrary.changes | 6 ++++++ ComputeLibrary.spec | 15 ++++++--------- 4 files changed, 15 insertions(+), 12 deletions(-) delete mode 100644 ComputeLibrary-19.08.tar.gz create mode 100644 ComputeLibrary-19.11.tar.gz diff --git a/ComputeLibrary-19.08.tar.gz b/ComputeLibrary-19.08.tar.gz deleted file mode 100644 index 11eef20..0000000 --- a/ComputeLibrary-19.08.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cf95e5ced61c02614a5347f0e8b67a9d1a2502808242c440a0c9e70102fc3128 -size 45351607 diff --git a/ComputeLibrary-19.11.tar.gz b/ComputeLibrary-19.11.tar.gz new file mode 100644 index 0000000..e8e0a6c --- /dev/null +++ b/ComputeLibrary-19.11.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a91ddcc66d2945da16912d50825536c59503f3744355206ca83e571c4de2bc7d +size 48920855 diff --git a/ComputeLibrary.changes b/ComputeLibrary.changes index 18696f2..5b9a88b 100644 --- a/ComputeLibrary.changes +++ b/ComputeLibrary.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Dec 6 13:44:14 UTC 2019 - Guillaume GARDET + +- Update to 19.11 (no upstream changelog) +- Revert previous commit to disable neon on armv7 + ------------------------------------------------------------------- Tue Nov 26 15:40:34 UTC 2019 - Guillaume GARDET diff --git a/ComputeLibrary.spec b/ComputeLibrary.spec index 7457a1e..0f44165 100644 --- a/ComputeLibrary.spec +++ b/ComputeLibrary.spec @@ -1,7 +1,7 @@ # # spec file for package ComputeLibrary # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,26 +15,24 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # -%define so_ver 16 +%define so_ver 17 # Disable validation tests by default due to CL %bcond_with computelibrary_tests - Name: ComputeLibrary -Version: 19.08 +Version: 19.11 Release: 0 Summary: ARM Compute Library License: MIT Group: Productivity/Graphics/Other -Url: https://developer.arm.com/technologies/compute-library +URL: https://developer.arm.com/technologies/compute-library Source: https://github.com/ARM-software/ComputeLibrary/archive/v%{version}.tar.gz#/ComputeLibrary-%{version}.tar.gz BuildRequires: gcc-c++ BuildRequires: git BuildRequires: ocl-icd-devel BuildRequires: scons >= 2.4 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -ExclusiveArch: aarch64 armv7l armv7hl x86_64 Recommends: %{name}-sample-data +ExclusiveArch: aarch64 armv7l armv7hl x86_64 %description A software library for computer vision and machine learning. @@ -50,7 +48,6 @@ A software library for computer vision and machine learning. The Compute Library is a collection of low-level functions optimized for Arm CPU and GPU architectures targeted at image processing, computer vision, and machine learning. Library part. - %package devel Summary: ARM Compute Library -- devel Group: Development/Languages/C and C++ @@ -88,7 +85,7 @@ scons os=linux build=native \ neon=1 arch=arm64-v8a \ %else %ifarch armv7l armv7hl - neon=1 arch=armv7a \ + neon=0 arch=armv7a \ %else neon=0 arch=x86_64 \ %endif From 0987b05829c6f17e2a4f7f8df21779fcb5dbb680b2323b0753f72fd8b7b5b906 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 26 Feb 2020 09:49:33 +0000 Subject: [PATCH 2/2] - Update to 19.11.1: * Fix offset calculation in NEReductionOperationKernel. * Fix data layout in NEScaleKernel for nhwc. * Retain configuration step data layout to avoid side-effects. * Perform sqrt in double domain for L2 pooling. * Fix output shape calculation for Reduce Mean. - Cleanup a bit with spec-cleaner OBS-URL: https://build.opensuse.org/package/show/science:machinelearning/ComputeLibrary?expand=0&rev=10 --- ComputeLibrary-19.11.1.tar.gz | 3 +++ ComputeLibrary-19.11.tar.gz | 3 --- ComputeLibrary.changes | 15 +++++++++++++++ ComputeLibrary.spec | 34 +++++++++++++++------------------- 4 files changed, 33 insertions(+), 22 deletions(-) create mode 100644 ComputeLibrary-19.11.1.tar.gz delete mode 100644 ComputeLibrary-19.11.tar.gz diff --git a/ComputeLibrary-19.11.1.tar.gz b/ComputeLibrary-19.11.1.tar.gz new file mode 100644 index 0000000..36a2990 --- /dev/null +++ b/ComputeLibrary-19.11.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:39e2941866b9d05064db93e168eb58fe851045dc87af5daa715d3d416e8d7c0a +size 48926903 diff --git a/ComputeLibrary-19.11.tar.gz b/ComputeLibrary-19.11.tar.gz deleted file mode 100644 index e8e0a6c..0000000 --- a/ComputeLibrary-19.11.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a91ddcc66d2945da16912d50825536c59503f3744355206ca83e571c4de2bc7d -size 48920855 diff --git a/ComputeLibrary.changes b/ComputeLibrary.changes index 5b9a88b..7dd281a 100644 --- a/ComputeLibrary.changes +++ b/ComputeLibrary.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Tue Feb 25 16:05:12 UTC 2020 - Tomáš Chvátal + +- Update to 19.11.1: + * Fix offset calculation in NEReductionOperationKernel. + * Fix data layout in NEScaleKernel for nhwc. + * Retain configuration step data layout to avoid side-effects. + * Perform sqrt in double domain for L2 pooling. + * Fix output shape calculation for Reduce Mean. + +------------------------------------------------------------------- +Tue Feb 25 15:50:33 UTC 2020 - Tomáš Chvátal + +- Cleanup a bit with spec-cleaner + ------------------------------------------------------------------- Fri Dec 6 13:44:14 UTC 2019 - Guillaume GARDET diff --git a/ComputeLibrary.spec b/ComputeLibrary.spec index 0f44165..9f20e98 100644 --- a/ComputeLibrary.spec +++ b/ComputeLibrary.spec @@ -1,7 +1,7 @@ # # spec file for package ComputeLibrary # -# Copyright (c) 2019 SUSE LLC +# 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 @@ -17,18 +17,17 @@ %define so_ver 17 -# Disable validation tests by default due to CL +# Disable validation tests by default due to opencl needing to be set up %bcond_with computelibrary_tests Name: ComputeLibrary -Version: 19.11 +Version: 19.11.1 Release: 0 Summary: ARM Compute Library License: MIT -Group: Productivity/Graphics/Other URL: https://developer.arm.com/technologies/compute-library Source: https://github.com/ARM-software/ComputeLibrary/archive/v%{version}.tar.gz#/ComputeLibrary-%{version}.tar.gz BuildRequires: gcc-c++ -BuildRequires: git +BuildRequires: git-core BuildRequires: ocl-icd-devel BuildRequires: scons >= 2.4 Recommends: %{name}-sample-data @@ -40,8 +39,7 @@ The Compute Library is a collection of low-level functions optimized for Arm CPU Examples binaries part. %package -n libarm_compute%{so_ver} -Summary: ARM Compute Library -- libs -Group: System/Libraries +Summary: ARM Compute Library %description -n libarm_compute%{so_ver} A software library for computer vision and machine learning. @@ -50,7 +48,6 @@ Library part. %package devel Summary: ARM Compute Library -- devel -Group: Development/Languages/C and C++ Requires: %{name} = %{version} Requires: libarm_compute%{so_ver} = %{version} @@ -62,7 +59,6 @@ Devel part, including headers. %package sample-data %define sampledir sample-data Summary: Compute Library sample data -Group: Productivity/Graphics/Visualization/Other %description sample-data Free *.npy and *.ppm files to use with example binaries. @@ -83,20 +79,23 @@ scons os=linux build=native \ %endif %ifarch aarch64 aarch64_ilp32 neon=1 arch=arm64-v8a \ -%else +%endif %ifarch armv7l armv7hl neon=0 arch=armv7a \ -%else - neon=0 arch=x86_64 \ %endif +%ifarch x86_64 + neon=0 arch=x86_64 \ %endif extra_cxx_flags="%{optflags}" \ Werror=0 %{?_smp_mflags} %install rm build/examples/*.o +rm build/examples/gemm_tuner/*.o +mv build/examples/gemm_tuner/* build/examples +rm -r build/examples/gemm_tuner mkdir -p %{buildroot}%{_bindir} -cp -a build/examples/* %{buildroot}%{_bindir}/ +install -Dm0755 build/examples/* %{buildroot}%{_bindir}/ mkdir -p %{buildroot}%{_libdir} cp -a build/*.so* %{buildroot}%{_libdir}/ mkdir -p %{buildroot}%{_includedir}/ @@ -107,14 +106,13 @@ rm -f $(find %{buildroot}%{_includedir}/ -name *.cpp) mkdir -p %{buildroot}%{_datadir}/ComputeLibrary/%{sampledir} cp -r data/* %{buildroot}%{_datadir}/ComputeLibrary/%{sampledir} # Install scripts -cp scripts/* %{buildroot}%{_bindir} +install -Dm0755 scripts/* %{buildroot}%{_bindir} # Fix Python scripts interpreter for pyfile in `ls %{buildroot}%{_bindir}/*.py`; do - sed -i -e 's|#!/usr/bin/env python|#!/usr/bin/python|' $pyfile + sed -i -e 's|#!%{_bindir}/env python|#!%{_bindir}/python|' $pyfile done %post -n libarm_compute%{so_ver} -p /sbin/ldconfig - %postun -n libarm_compute%{so_ver} -p /sbin/ldconfig %if %{with computelibrary_tests} @@ -123,15 +121,13 @@ LD_LIBRARY_PATH="build/" build/tests/arm_compute_validation %endif %files -%defattr(-,root,root) %{_bindir}/* %files -n libarm_compute%{so_ver} -%defattr(-,root,root) +%license LICENSE %{_libdir}/*.so.%{so_ver}* %files devel -%defattr(-,root,root) %dir %{_includedir}/arm_compute %dir %{_includedir}/half %dir %{_includedir}/libnpy