From 90ac70aa6ecb8ac0188d844a358140984d28dd5e663cf4684b15e1e41a5e036b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= <ismail@i10z.com>
Date: Thu, 29 Mar 2018 08:42:43 +0000
Subject: [PATCH 1/5] Accepting request 589772 from home:mnhauke:opencl:stable
- Update to version 1.1
* Support for LLVM/Clang 6.0 and 5.0.
* Experimental SPIR and SPIR-V support
* Improved kernel compilation speed
- Several tests have problems on some OBS workers while the same
tests run perfectly fine in a local chroot.
Disable tests for now.
- Create subpackage for the shared library
- Run tests after the build
OBS-URL: https://build.opensuse.org/request/show/589772
OBS-URL: https://build.opensuse.org/package/show/science/pocl?expand=0&rev=33
---
pocl-1.0.tar.gz | 3 ---
pocl-1.1.tar.gz | 3 +++
pocl.changes | 17 +++++++++++++++++
pocl.spec | 48 +++++++++++++++++++++++++++++++-----------------
4 files changed, 51 insertions(+), 20 deletions(-)
delete mode 100644 pocl-1.0.tar.gz
create mode 100644 pocl-1.1.tar.gz
diff --git a/pocl-1.0.tar.gz b/pocl-1.0.tar.gz
deleted file mode 100644
index 5195a3f..0000000
--- a/pocl-1.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:94bd86a2f9847c03e6c3bf8dca12af3734f8b272ffeacbc3fa8fcca58844b1d4
-size 1536827
diff --git a/pocl-1.1.tar.gz b/pocl-1.1.tar.gz
new file mode 100644
index 0000000..1c57dc3
--- /dev/null
+++ b/pocl-1.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1e8dd0693a88c84937754df947b202871a40545b1b0a97ebefa370b0281c3c53
+size 1545659
diff --git a/pocl.changes b/pocl.changes
index fb38a7d..f646bcf 100644
--- a/pocl.changes
+++ b/pocl.changes
@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Fri Mar 9 17:17:10 UTC 2018 - mardnh@gmx.de
+
+- Update to version 1.1
+ * Support for LLVM/Clang 6.0 and 5.0.
+ * Experimental SPIR and SPIR-V support
+ * Improved kernel compilation speed
+- Several tests have problems on some OBS workers while the same
+ tests run perfectly fine in a local chroot.
+ Disable tests for now.
+
+-------------------------------------------------------------------
+Mon Mar 5 19:34:47 UTC 2018 - mardnh@gmx.de
+
+- Create subpackage for the shared library
+- Run tests after the build
+
-------------------------------------------------------------------
Wed Jan 31 14:51:17 UTC 2018 - msrb@suse.com
diff --git a/pocl.spec b/pocl.spec
index 5e43522..2b394b6 100644
--- a/pocl.spec
+++ b/pocl.spec
@@ -17,9 +17,9 @@
#
-%define sover 2.0.0
+%define sover 2.1.0
Name: pocl
-Version: 1.0
+Version: 1.1
Release: 0
Summary: Portable Computing Language - an OpenCL implementation
# The whole code is under MIT
@@ -27,8 +27,9 @@ Summary: Portable Computing Language - an OpenCL implementation
# except lib/kernel/vecmath which is under GPLv3+ or LGPLv3+ (and unbundled in future)
License: MIT
Group: Development/Tools/Other
-Url: http://portablecl.org/
-Source0: http://portablecl.org/downloads/%{name}-%{version}.tar.gz
+URL: http://portablecl.org/
+#Source0: http://portablecl.org/downloads/%{name}-%{version}.tar.gz
+Source0: https://github.com/pocl/pocl/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
Source99: pocl-rpmlintrc
BuildRequires: clang
BuildRequires: clang-devel
@@ -44,7 +45,7 @@ BuildRequires: uthash-devel
BuildRequires: pkgconfig(OpenCL)
BuildRequires: pkgconfig(glew)
BuildRequires: pkgconfig(hwloc)
-Requires: clang4
+Requires: clang
Requires: gcc
Requires: libstdc++-devel
Requires: libut2
@@ -67,6 +68,17 @@ can generate multi-work-item work-group functions that exploit various types of
parallel hardware resources, such as VLIW, superscalar, SIMD, SIMT, multicore
and multithread.
+%package -n libpocl2
+Summary: Shared Library part of pocl
+Group: System/Libraries
+
+%description -n libpocl2
+Portable Computing Language (pocl) is an implementation of the OpenCL standard
+which can be adapted for new targets and devices, both for homogeneous CPU and
+heterogenous GPUs/accelerators.
+
+This subpackage contains the share library part of pocl.
+
%package devel
Summary: Development files for the Portable Computing Language
Group: Development/Languages/Other
@@ -106,14 +118,17 @@ This subpackage provides the development files needed for pocl.
# FIXME - should be handled upstream
mv %{buildroot}%{_prefix}%{_libdir} %{buildroot}%{_libdir}
sed -i 's|%{_prefix}%{_prefix}/|%{_prefix}/|g' %{buildroot}%{_sysconfdir}/OpenCL/vendors/pocl.icd
-
# Unbundle vecmath
-#rm -vf %{buildroot}/%{_libdir}/pocl/vecmath/
-#ln -vs %{_includedir}/vecmath %{buildroot}/%{_libdir}/pocl/vecmath
+#rm -vf %%{buildroot}/%%{_libdir}/pocl/vecmath/
+#ln -vs %%{_includedir}/vecmath %{buildroot}/%%{_libdir}/pocl/vecmath
# <visit0r> but you need to run the .py to generate the files under the pocl dir
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%%check
+#cd build
+#ctest
+
+%post -n libpocl2 -p /sbin/ldconfig
+%postun -n libpocl2 -p /sbin/ldconfig
%files
%doc CHANGES README doc/sphinx/source/*.rst
@@ -121,17 +136,16 @@ sed -i 's|%{_prefix}%{_prefix}/|%{_prefix}/|g' %{buildroot}%{_sysconfdir}/OpenCL
%dir %{_sysconfdir}/OpenCL/vendors
%{_sysconfdir}/OpenCL/vendors/pocl.icd
%{_bindir}/poclcc
-%{_libdir}/libpocl.so.2
-%{_libdir}/libpocl.so.%{sover}
-%{_libdir}/libpoclu.so.2
-%{_libdir}/libpoclu.so.%{sover}
-%{_libdir}/pocl/
%{_datadir}/pocl/
+%files -n libpocl2
+%{_libdir}/libpocl.so.2
+%{_libdir}/libpocl.so.%{sover}
+%dir %{_libdir}/pocl/
+%{_libdir}/pocl/libllvmopencl.so
+
%files devel
-%{_libdir}/libpoclu.so
%{_libdir}/libpocl.so
%{_libdir}/pkgconfig/pocl.pc
-%{_includedir}/poclu.h
%changelog
From b416bd3511eeb498ffbb4018cdf27c378f32c568732d4f2ecc44a22439efcb5f Mon Sep 17 00:00:00 2001
From: Stanislav Brabec <sbrabec@suse.com>
Date: Tue, 15 May 2018 17:43:11 +0000
Subject: [PATCH 2/5] Accepting request 607653 from
home:mimi_vx:branches:science
- remove lib subpackage - part of libs isnt clearly versioned
OBS-URL: https://build.opensuse.org/request/show/607653
OBS-URL: https://build.opensuse.org/package/show/science/pocl?expand=0&rev=34
---
pocl.changes | 5 +++++
pocl.spec | 15 +--------------
2 files changed, 6 insertions(+), 14 deletions(-)
diff --git a/pocl.changes b/pocl.changes
index f646bcf..3ff3557 100644
--- a/pocl.changes
+++ b/pocl.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue May 15 17:39:33 UTC 2018 - mimi.vx@gmail.com
+
+- remove lib subpackage - part of libs isnt clearly versioned
+
-------------------------------------------------------------------
Fri Mar 9 17:17:10 UTC 2018 - mardnh@gmx.de
diff --git a/pocl.spec b/pocl.spec
index 2b394b6..efecfa4 100644
--- a/pocl.spec
+++ b/pocl.spec
@@ -68,21 +68,10 @@ can generate multi-work-item work-group functions that exploit various types of
parallel hardware resources, such as VLIW, superscalar, SIMD, SIMT, multicore
and multithread.
-%package -n libpocl2
-Summary: Shared Library part of pocl
-Group: System/Libraries
-
-%description -n libpocl2
-Portable Computing Language (pocl) is an implementation of the OpenCL standard
-which can be adapted for new targets and devices, both for homogeneous CPU and
-heterogenous GPUs/accelerators.
-
-This subpackage contains the share library part of pocl.
-
%package devel
Summary: Development files for the Portable Computing Language
Group: Development/Languages/Other
-Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
Requires: opencl-headers
%description devel
@@ -137,8 +126,6 @@ sed -i 's|%{_prefix}%{_prefix}/|%{_prefix}/|g' %{buildroot}%{_sysconfdir}/OpenCL
%{_sysconfdir}/OpenCL/vendors/pocl.icd
%{_bindir}/poclcc
%{_datadir}/pocl/
-
-%files -n libpocl2
%{_libdir}/libpocl.so.2
%{_libdir}/libpocl.so.%{sover}
%dir %{_libdir}/pocl/
From ab288ec8bee536bf0bacdeaf0ccde2161ecd8abc3fb44d283632e52733b88b32 Mon Sep 17 00:00:00 2001
From: Stanislav Brabec <sbrabec@suse.com>
Date: Tue, 15 May 2018 18:27:50 +0000
Subject: [PATCH 3/5] Accepting request 607660 from
home:mimi_vx:branches:science
fix
OBS-URL: https://build.opensuse.org/request/show/607660
OBS-URL: https://build.opensuse.org/package/show/science/pocl?expand=0&rev=35
---
pocl.spec | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pocl.spec b/pocl.spec
index efecfa4..88ec978 100644
--- a/pocl.spec
+++ b/pocl.spec
@@ -112,12 +112,12 @@ sed -i 's|%{_prefix}%{_prefix}/|%{_prefix}/|g' %{buildroot}%{_sysconfdir}/OpenCL
#ln -vs %%{_includedir}/vecmath %{buildroot}/%%{_libdir}/pocl/vecmath
# <visit0r> but you need to run the .py to generate the files under the pocl dir
-%%check
+#%%check
#cd build
#ctest
-%post -n libpocl2 -p /sbin/ldconfig
-%postun -n libpocl2 -p /sbin/ldconfig
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
%files
%doc CHANGES README doc/sphinx/source/*.rst
From fd2ef28460dcfccba8756589848dddddc89743f95315d155a13709eb89316739 Mon Sep 17 00:00:00 2001
From: Stanislav Brabec <sbrabec@suse.com>
Date: Tue, 15 May 2018 21:09:21 +0000
Subject: [PATCH 4/5] Accepting request 607712 from
home:mimi_vx:branches:science
- move nonversioned lib to main package
OBS-URL: https://build.opensuse.org/request/show/607712
OBS-URL: https://build.opensuse.org/package/show/science/pocl?expand=0&rev=36
---
pocl.changes | 4 ++--
pocl.spec | 32 +++++++++++++++++++++++---------
2 files changed, 25 insertions(+), 11 deletions(-)
diff --git a/pocl.changes b/pocl.changes
index 3ff3557..9f7f7d2 100644
--- a/pocl.changes
+++ b/pocl.changes
@@ -1,7 +1,7 @@
-------------------------------------------------------------------
-Tue May 15 17:39:33 UTC 2018 - mimi.vx@gmail.com
+Tue May 15 20:34:02 UTC 2018 - mimi.vx@gmail.com
-- remove lib subpackage - part of libs isnt clearly versioned
+- move nonversioned lib to main package
-------------------------------------------------------------------
Fri Mar 9 17:17:10 UTC 2018 - mardnh@gmx.de
diff --git a/pocl.spec b/pocl.spec
index 88ec978..9efedda 100644
--- a/pocl.spec
+++ b/pocl.spec
@@ -31,8 +31,8 @@ URL: http://portablecl.org/
#Source0: http://portablecl.org/downloads/%{name}-%{version}.tar.gz
Source0: https://github.com/pocl/pocl/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
Source99: pocl-rpmlintrc
-BuildRequires: clang
-BuildRequires: clang-devel
+BuildRequires: clang < 7
+BuildRequires: clang-devel < 7
BuildRequires: cmake
BuildRequires: libboost_headers-devel
BuildRequires: libtool
@@ -45,7 +45,7 @@ BuildRequires: uthash-devel
BuildRequires: pkgconfig(OpenCL)
BuildRequires: pkgconfig(glew)
BuildRequires: pkgconfig(hwloc)
-Requires: clang
+Requires: clang <7
Requires: gcc
Requires: libstdc++-devel
Requires: libut2
@@ -68,10 +68,22 @@ can generate multi-work-item work-group functions that exploit various types of
parallel hardware resources, such as VLIW, superscalar, SIMD, SIMT, multicore
and multithread.
+%package -n libpocl2
+Summary: Shared Library part of pocl
+Group: System/Libraries
+
+%description -n libpocl2
+Portable Computing Language (pocl) is an implementation of the OpenCL standard
+which can be adapted for new targets and devices, both for homogeneous CPU and
+heterogenous GPUs/accelerators.
+
+This subpackage contains the share library part of pocl.
+
%package devel
Summary: Development files for the Portable Computing Language
Group: Development/Languages/Other
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: libpocl2 = %{version}-%{release}
Requires: opencl-headers
%description devel
@@ -116,8 +128,8 @@ sed -i 's|%{_prefix}%{_prefix}/|%{_prefix}/|g' %{buildroot}%{_sysconfdir}/OpenCL
#cd build
#ctest
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%post -n libpocl2 -p /sbin/ldconfig
+%postun -n libpocl2 -p /sbin/ldconfig
%files
%doc CHANGES README doc/sphinx/source/*.rst
@@ -125,11 +137,13 @@ sed -i 's|%{_prefix}%{_prefix}/|%{_prefix}/|g' %{buildroot}%{_sysconfdir}/OpenCL
%dir %{_sysconfdir}/OpenCL/vendors
%{_sysconfdir}/OpenCL/vendors/pocl.icd
%{_bindir}/poclcc
-%{_datadir}/pocl/
-%{_libdir}/libpocl.so.2
-%{_libdir}/libpocl.so.%{sover}
%dir %{_libdir}/pocl/
%{_libdir}/pocl/libllvmopencl.so
+%{_datadir}/pocl/
+
+%files -n libpocl2
+%{_libdir}/libpocl.so.2
+%{_libdir}/libpocl.so.%{sover}
%files devel
%{_libdir}/libpocl.so
From 5bd435fab4e3893ef1524e7005b8f10f4aac741103e2a39210fe06f6764c99a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= <ismail@i10z.com>
Date: Wed, 16 May 2018 08:18:38 +0000
Subject: [PATCH 5/5] Accepting request 607716 from
home:mimi_vx:branches:science
typo ..
OBS-URL: https://build.opensuse.org/request/show/607716
OBS-URL: https://build.opensuse.org/package/show/science/pocl?expand=0&rev=37
---
pocl.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pocl.spec b/pocl.spec
index 9efedda..c51b526 100644
--- a/pocl.spec
+++ b/pocl.spec
@@ -45,7 +45,7 @@ BuildRequires: uthash-devel
BuildRequires: pkgconfig(OpenCL)
BuildRequires: pkgconfig(glew)
BuildRequires: pkgconfig(hwloc)
-Requires: clang <7
+Requires: clang < 7
Requires: gcc
Requires: libstdc++-devel
Requires: libut2