From 2865b988e4b2755c4343d316eaa64bc7824390d4f0717be427f08b64ac76f136 Mon Sep 17 00:00:00 2001
From: Guillaume GARDET <guillaume.gardet@opensuse.org>
Date: Wed, 5 Jun 2019 16:12:02 +0000
Subject: [PATCH] Accepting request 707890 from
 home:Guillaume_G:branches:science:machinelearning

- Add validation test option (disabled by default since CL is
  unusable inside OBS)
- Update to 19.05 (no upstream changelog)
- Remove upstream patch:
  * computelibrary-fix_opencl.patch

OBS-URL: https://build.opensuse.org/request/show/707890
OBS-URL: https://build.opensuse.org/package/show/science:machinelearning/ComputeLibrary?expand=0&rev=2
---
 ComputeLibrary-19.02.tar.gz     |  3 ---
 ComputeLibrary-19.05.tar.gz     |  3 +++
 ComputeLibrary.changes          | 13 +++++++++++++
 ComputeLibrary.spec             | 21 ++++++++++++++++-----
 computelibrary-fix_opencl.patch | 11 -----------
 5 files changed, 32 insertions(+), 19 deletions(-)
 delete mode 100644 ComputeLibrary-19.02.tar.gz
 create mode 100644 ComputeLibrary-19.05.tar.gz
 delete mode 100644 computelibrary-fix_opencl.patch

diff --git a/ComputeLibrary-19.02.tar.gz b/ComputeLibrary-19.02.tar.gz
deleted file mode 100644
index 1720d16..0000000
--- a/ComputeLibrary-19.02.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a02f9dbcf303d0c5d03804f84b009dcf21c392bfe7ccababca94dd7e297ea0c8
-size 40298644
diff --git a/ComputeLibrary-19.05.tar.gz b/ComputeLibrary-19.05.tar.gz
new file mode 100644
index 0000000..be78969
--- /dev/null
+++ b/ComputeLibrary-19.05.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:48a7f254e14f7ee5673b365d3c63acff6ce6e2d92a59e036fb12f48b6489de95
+size 42547101
diff --git a/ComputeLibrary.changes b/ComputeLibrary.changes
index d12ab2e..bb0372a 100644
--- a/ComputeLibrary.changes
+++ b/ComputeLibrary.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Mon Jun  3 13:50:04 UTC 2019 - Guillaume GARDET <guillaume.gardet@opensuse.org>
+
+- Add validation test option (disabled by default since CL is 
+  unusable inside OBS)
+
+-------------------------------------------------------------------
+Mon Jun  3 13:05:20 UTC 2019 - Guillaume GARDET <guillaume.gardet@opensuse.org>
+
+- Update to 19.05 (no upstream changelog)
+- Remove upstream patch:
+  * computelibrary-fix_opencl.patch
+
 -------------------------------------------------------------------
 Fri Apr 19 10:25:12 UTC 2019 - Guillaume GARDET <guillaume.gardet@opensuse.org>
 
diff --git a/ComputeLibrary.spec b/ComputeLibrary.spec
index 9fdb27b..de29004 100644
--- a/ComputeLibrary.spec
+++ b/ComputeLibrary.spec
@@ -22,17 +22,19 @@
 %endif
 %endif
 
-%define so_ver 14
+%define so_ver 15
+
+# Disable validation tests by default due to CL
+%bcond_with computelibrary_tests
 
 Name:           ComputeLibrary
-Version:        19.02
+Version:        19.05
 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
-Patch0:         computelibrary-fix_opencl.patch
 %if 0%{?broken_gcc48}
 BuildRequires:  gcc5
 BuildRequires:  gcc5-c++
@@ -81,7 +83,6 @@ Free *.npy and *.ppm files to use with example binaries.
 
 %prep
 %setup -q -n ComputeLibrary-%{version}
-%patch0 -p1
 
 %build
 %if 0%{?broken_gcc48}
@@ -92,6 +93,12 @@ scons os=linux build=native \
       set_soname=1 \
       examples=1 \
       gles_compute=0 \
+      opencl=1 \
+%if %{with computelibrary_tests}
+      validation_tests=1 \
+%else
+      validation_tests=0 \
+%endif
 %ifarch aarch64 aarch64_ilp32
       neon=1 arch=arm64-v8a \
 %else
@@ -101,7 +108,6 @@ scons os=linux build=native \
       neon=0 arch=x86_64 \
 %endif
 %endif
-      opencl=1 \
       extra_cxx_flags="%{optflags}" \
       Werror=0 %{?_smp_mflags}
 
@@ -125,6 +131,11 @@ cp scripts/* %{buildroot}%{_bindir}
 
 %postun -n libarm_compute%{so_ver} -p /sbin/ldconfig
 
+%if %{with computelibrary_tests}
+%check
+LD_LIBRARY_PATH="build/" build/tests/arm_compute_validation
+%endif
+
 %files
 %defattr(-,root,root)
 %{_bindir}/*
diff --git a/computelibrary-fix_opencl.patch b/computelibrary-fix_opencl.patch
deleted file mode 100644
index 918d4fa..0000000
--- a/computelibrary-fix_opencl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ComputeLibrary-19.02.orig/SConscript	2019-04-11 14:22:27.016123111 +0200
-+++ ComputeLibrary-19.02/SConscript	2019-04-11 14:22:30.812150049 +0200
-@@ -70,7 +70,7 @@ def resolve_includes(target, source, env
-     for i in range(len(source)):
-         src = source[i]
-         dst = target[i]
--        contents = src.get_contents().splitlines()
-+        contents = src.get_contents().decode('utf-8').splitlines()
-         entry = FileEntry(target_name=dst, file_contents=contents)
-         files.append((os.path.basename(src.get_path()),entry))
-