Accepting request 536898 from home:pluskalm:branches:science

- Simplify spec file a bit
- Enable CUDA backend
- Enable all available cpu specific kernels for intel platform

OBS-URL: https://build.opensuse.org/request/show/536898
OBS-URL: https://build.opensuse.org/package/show/science/pocl?expand=0&rev=27

pocl.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Oct 26 14:13:18 UTC 2017 - mpluskal@suse.com
+
+- Simplify spec file a bit
+- Enable CUDA backend
+- Enable all available cpu specific kernels for intel platform
+
 -------------------------------------------------------------------
 Sat Oct 21 06:28:35 UTC 2017 - mpluskal@suse.com
 

pocl.spec

@@ -31,12 +31,13 @@ Url:            http://portablecl.org/
 Source0:        http://portablecl.org/downloads/%{name}-%{version}.tar.gz
 Source99:       pocl-rpmlintrc
 Patch0:         pocl-disable-tests.diff
-BuildRequires:  clang4-devel
+BuildRequires:  clang
-BuildRequires:  clang4-devel-static
+BuildRequires:  clang-devel
-BuildRequires:  cmake >= 2.8.12
+BuildRequires:  clang-devel-static
+BuildRequires:  cmake
+BuildRequires:  libboost_headers-devel
 BuildRequires:  libtool
 BuildRequires:  libtool-ltdl-devel
-BuildRequires:  llvm4-devel
 BuildRequires:  ncurses-devel
 BuildRequires:  ninja
 BuildRequires:  opencl-headers
@@ -46,14 +47,13 @@ BuildRequires:  pkgconfig(OpenCL)
 BuildRequires:  pkgconfig(glew)
 BuildRequires:  pkgconfig(hwloc)
 Requires:       clang4
+Requires:       gcc
 Requires:       libstdc++-devel
 Requires:       libut2
 # Only armv7l is supported
 # PPC support is currently broken, due to path problems
 # s390(x) and aarch64 also not supported, so use ExclusiveArch
 ExclusiveArch:  %{ix86} x86_64 armv7l armv7hl
-BuildRequires:  libboost_headers-devel
-Requires:       gcc
 
 %description
 Portable Computing Language (pocl) is an implementation of the OpenCL standard
@@ -88,24 +88,26 @@ This subpackage provides the development files needed for pocl.
 
 %build
 %define __builder ninja
-%cmake ..\
+%cmake \
+  -DENABLE_CUDA=1 \
+  -DENABLE_ICD=1 \
+  -DPOCL_INSTALL_ICD_VENDORDIR=%{_sysconfdir}/OpenCL/vendors \
   -DCMAKE_C_COMPILER=clang  \
   -DCMAKE_CXX_COMPILER=clang++ \
+%ifarch %{ix86} x86_64
+  -DKERNELLIB_HOST_CPU_VARIANTS=distro \
+%endif
+  -DEXTRA_KERNEL_CXX_FLAGS="%{optflags} -std=c++11" \
   -DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,now" \
   -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,now" \
   -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,now" \
   -DWITH_LLVM_CONFIG=%{_bindir}/llvm-config
 %make_jobs
 
-# docs
-#cd doc/sphinx
-#make html
-
 %install
 %cmake_install
 # FIXME - should be handled upstream
 mv %{buildroot}%{_prefix}%{_libdir} %{buildroot}%{_libdir}
-mv %{buildroot}%{_prefix}%{_sysconfdir} %{buildroot}%{_sysconfdir}
 sed -i 's|%{_prefix}%{_prefix}/|%{_prefix}/|g' %{buildroot}%{_sysconfdir}/OpenCL/vendors/pocl.icd
 
 # Unbundle vecmath
@@ -113,10 +115,6 @@ 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
-#cd build
-#ctest %{?_smp_mflags} ||:
-
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig