From: Samuel Thibault Date: Sat, 23 Feb 2019 10:03:38 +0000 (+0100) Subject: Import starpu_1.2.6+dfsg-7.debian.tar.xz X-Git-Tag: archive/raspbian/1.4.5+dfsg-2+rpi1^2^2^2^2^2~7^2 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c2bf79f7746aa33d944bf72bd11a0ff9b3534972;p=starpu.git Import starpu_1.2.6+dfsg-7.debian.tar.xz [dgit import tarball starpu 1.2.6+dfsg-7 starpu_1.2.6+dfsg-7.debian.tar.xz] --- c2bf79f7746aa33d944bf72bd11a0ff9b3534972 diff --git a/README.source b/README.source new file mode 100644 index 0000000..9e79e59 --- /dev/null +++ b/README.source @@ -0,0 +1,9 @@ +StarPU for Debian +----------------- + +The source is the same for the main and the contrib package. The only difference +is that the contrib package build-depends on the cuda SDK. To switch to main +rules, run ./debian/rules main, and the same for contrib. + +The content of the orig file is the same as upstream except that +examples/pi/SobolQRNG and doc/doxygen/{html,starpu.pdf} were removed. diff --git a/changelog b/changelog new file mode 100644 index 0000000..7c3e74d --- /dev/null +++ b/changelog @@ -0,0 +1,484 @@ +starpu (1.2.6+dfsg-7) unstable; urgency=medium + + * rules: Properly pass -k to make check. + * debian/patches/heat-opengl: Do not try opengl display without X display. + + -- Samuel Thibault Sat, 23 Feb 2019 11:03:38 +0100 + +starpu (1.2.6+dfsg-6) unstable; urgency=medium + + * patches/doc-nopdf: Disable building pdf version of doxygen documentation + (Closes: Bug#921301, Bug#921766). + * rules: Fix docdir. + + -- Samuel Thibault Tue, 05 Feb 2019 19:57:23 +0200 + +starpu (1.2.6+dfsg-5) unstable; urgency=medium + + [ Andreas Beckmann ] + * Build with CUDA 9.2 and GCC 7. (Closes: #892403). + + -- Samuel Thibault Mon, 14 Jan 2019 17:52:08 +0100 + +starpu (1.2.6+dfsg-4) unstable; urgency=medium + + * debian/rules: Trick nvcc into compiling with g++ 8. + * debian/control: Do not build-depend on gcc-6 (Closes: #892403). + + -- Samuel Thibault Tue, 01 Jan 2019 16:48:57 +0100 + +starpu (1.2.6+dfsg-3) unstable; urgency=medium + + * Upstream fix for reproducibility. + + -- Samuel Thibault Sat, 10 Nov 2018 14:03:31 +0100 + +starpu (1.2.6+dfsg-2) unstable; urgency=medium + + * Use upstream fix for reproducibility. + + -- Samuel Thibault Sun, 04 Nov 2018 01:37:12 +0100 + +starpu (1.2.6+dfsg-1) unstable; urgency=medium + + * New upstream release. + + -- Samuel Thibault Tue, 25 Sep 2018 12:24:09 +0200 + +starpu (1.2.5+dfsg-2) unstable; urgency=medium + + * rules: Sed all changelog entries into starpu-contrib instead of just the + first, to fix version tracking. + + -- Samuel Thibault Tue, 04 Sep 2018 21:03:09 +0200 + +starpu (1.2.5+dfsg-1) unstable; urgency=medium + + * New upstream release. + - Rename libstarpu-1.2-4 to libstarpu-1.2-5 due to soname bump. + * Bump Standards-Version to 4.2.0 (no changes). + * tests: Add autopkgtest. + * control: Mark most packages Multi-Arch: same. + * info: Remove starpu.info, not built any more by upstream. + + -- Samuel Thibault Sat, 01 Sep 2018 11:53:26 +0200 + +starpu (1.2.4+dfsg-1) unstable; urgency=medium + + * New upstream release. + - patches/gnu_source: Merged upstream + - Rename packages according to soname bumps. + + -- Samuel Thibault Fri, 13 Apr 2018 15:28:08 +0200 + +starpu (1.2.3+dfsg-5) unstable; urgency=medium + + * control: Bump to CUDA 9. + * rules: Use gcc 6 for nvcc (Closes: #873416). + + -- Samuel Thibault Fri, 12 Jan 2018 10:25:46 +0100 + +starpu (1.2.3+dfsg-4) unstable; urgency=medium + + * control: Make -contrib packages provide -any virtual packages, so that + packages in main can depend on main | -any and thus get apt avoid + installing contrib and non-free packages unexpectedly (Closes: Bug#884309) + * control: Deactivate guile dependency, which was only used for plugin tests + (Closes: Bug#885230, Bug#885234) + + -- Samuel Thibault Fri, 05 Jan 2018 19:57:08 +0100 + +starpu (1.2.3+dfsg-3) unstable; urgency=medium + + * Apply upstream fix for macro test. + + -- Samuel Thibault Mon, 20 Nov 2017 15:10:40 +0100 + +starpu (1.2.3+dfsg-2) unstable; urgency=medium + + * Upload to unstable. + + -- Samuel Thibault Mon, 20 Nov 2017 13:12:57 +0100 + +starpu (1.2.3+dfsg-1) experimental; urgency=medium + + * New upstream release. + - rename libstarpu-1.2-2 to libstarpu-1.2-3 and libstarpumpi-1.2-1 to + libstarpumpi-1.2-2 according to soname bumps. + - patches/qt5: Refresh. + - patches/doc: Remove, merged upstream. + + -- Samuel Thibault Fri, 10 Nov 2017 18:32:51 +0100 + +starpu (1.2.2+dfsg-1) unstable; urgency=medium + + * New upstream release. + - rename libstarpu-1.2-0 to libstarpu-1.2-2 and libstarpumpi-1.2-0 to + libstarpumpi-1.2-1 according to soname bumps. + - patches/cnf: Remove, merged upstream. + - patches/examples: Remove, merged upstream. + - patches/nvcc_noccbin: Remove, merged upstream. + - patches/doc: Add from upstream to ship doc source. + * control: Bump Standards-Version to 4.1.1 (no changes). + * control: Depend on gfortran (Closes: Bug#877028) + * rules: Use NVCC_CC instead of setting -ccbin in NVCCFLAGS. + + -- Samuel Thibault Mon, 30 Oct 2017 17:05:59 +0100 + +starpu (1.2.0+dfsg-5) unstable; urgency=medium + + * Update source repository URL to git. + * patches/reproducibility: Fix reproducibility. + * rules: Support DEB_BUILD_OPTIONS nodoc tag. + * control: Migrate priority to optional. + * control: Bump Standards-Version to 4.0.1. + * patches/qt5: Upstream fixes for qt5. + * control: Replace qt4 dependencies with qt5. + * rules: Make sure qt5 gets detected (Closes: Bug#875196) + * control: Replace qwt5 dependencies with qwt6. + * rules: upgrade to libqwt 6. + + -- Samuel Thibault Fri, 18 Aug 2017 19:39:36 +0200 + +starpu (1.2.0+dfsg-4) unstable; urgency=medium + + * control: Make libstarpu-dev depend on libsocl (Closes: Bug#857163) + * rules: Append -contrib to that dependency for contrib package. + + -- Samuel Thibault Wed, 08 Mar 2017 15:18:09 +0100 + +starpu (1.2.0+dfsg-3) unstable; urgency=medium + + * Run the full testsuite even if there are failures. + * control [contrib]: Build-Depend on clang-3.8 instead of gcc-5 + * rules: Pass -ccbin clang-3.8 (Closes: Bug#835941). + * patches/nvcc_noccbin: Avoid overriding our -ccbin option. + + -- Samuel Thibault Sun, 22 Jan 2017 21:05:52 +0100 + +starpu (1.2.0+dfsg-2) unstable; urgency=medium + + * debian/rules: Also set FC to set gfortran version. + + -- Samuel Thibault Tue, 25 Oct 2016 22:49:22 +0200 + +starpu (1.2.0+dfsg-1) unstable; urgency=medium + + * New upstream release. + - Fix final soname version. + - Drop the documentation that we already generate from the tarball. + - patches/openmp-valgrind: Remove, merged upstream + - patches/examples: backport upstream fix to properly build some examples. + - copyright: Use BSD-uthash licence name for uthash.h, since it is a + modified BSD licence (Only the first item is kept, about keeping notices + in source code redistribution) + - copyright: Move standard licence texts to the end of the file. + - copyright: Label the CL headers as Expat licence since that's it. + * Downgrade opencl-headers build-dep to opencl-c-headers. + (Closes: Bug#837911). + * Build starpu-contrib on non-amd64 too (Closes: Bug#840559). + + -- Samuel Thibault Thu, 25 Aug 2016 13:50:02 +0200 + +starpu (1.2.0~rc2+dfsg-2) experimental; urgency=medium + + * Fix libsocl conflicting package names (Closes: Bug#779599). + + -- Samuel Thibault Tue, 07 Jul 2015 16:29:49 +0200 + +starpu (1.2.0~rc2+dfsg-1) experimental; urgency=medium + + * New upstream release. + - Rename libstarpu-1.2-0 to libstarpu-1.2-1 according to soname bump. + * Merge unstable changes (Closes: Bug#779599). + + -- Samuel Thibault Tue, 03 Mar 2015 10:40:17 +0100 + +starpu (1.2.0~20141210+dfsg-1) experimental; urgency=medium + + * New upstream snapshot. + - Bump sonames to 1.2-0. + - control: Add libleveldb-dev. + - rules: Add --enable-openmp. + + -- Samuel Thibault Wed, 10 Dec 2014 17:33:58 +0100 + +starpu (1.1.4+dfsg-6) unstable; urgency=medium + + * debian/patches/cnf: Drop testing for unused f77.h. + * control: + - Bump Standards-Version to 3.9.8 (no change) + - Drop actually-unused libcnf-dev dependency. + + -- Samuel Thibault Thu, 14 Jul 2016 12:12:16 +0200 + +starpu (1.1.4+dfsg-5) unstable; urgency=medium + + * Drop i386 arch from contrib, CUDA only supports amd64 nowadays. + * watch: Update to submission from bartm. + * rules: Use dpkg-parsechangelog. + * control: Bump Standards-Version to 3.9.7 (no change). + * starpu-examples.install: Add missing OpenCL programs. + * Bump starpu-contrib gcc dependency to 5, now that CUDA 7.5 is in + (Closes: Bug#818764). + + -- Samuel Thibault Tue, 03 May 2016 13:28:32 +0200 + +starpu (1.1.4+dfsg-4) unstable; urgency=medium + + * patches/sm_13: New patch from upstream to drop requesting sm_13 + architecture support, available since long. Fixes build with cuda 7. + + -- Samuel Thibault Tue, 08 Dec 2015 17:40:24 +0100 + +starpu (1.1.4+dfsg-3) unstable; urgency=medium + + * compat: Bump to 9. + * control: + - Bump debhelper build-dependency accordingly. + - Drop hardening-wrapper depdency. + - Add opencl-dev build-dep alternative to ocl-icd-opencl-dev. + - Enable numa and valgrind support on mips64* (closes: Bug#806711). + - Add doxygen and doxygen-latex build dependencies. + * rules: + - Drop use of hardening-wrapper. + - Disable gcc version dependency, which was only needed for the + plugin. (Closes: Bug#813173) + * *.dirs: Drop, useless. + * *.install: Update to multiarch libdir path. + * starpu-examples.install: Also install OpenCL programs. + * starpu-contrib-examples.install: Make a symlink to + starpu-examples.install. + * docs: Drop manual installation of PDF documentation, now automatically + done. + + -- Samuel Thibault Sun, 06 Dec 2015 00:52:49 +0100 + +starpu (1.1.4+dfsg-2) unstable; urgency=medium + + * Bump gcc versions according to newer nvcc support (closes: Bug#796844). + + -- Samuel Thibault Tue, 25 Aug 2015 00:01:15 +0200 + +starpu (1.1.4+dfsg-1) unstable; urgency=medium + + * New upstream release + - Rename libstarpu-1.1-7 into libstarpu-1.1-9 and libstarpumpi-1.1-2 into + libstarpumpi-1.1-3 according to soname bump. No rdeps. + * Enable libnuma-dev and valgrind on arm64 and ppc64el too. + * control: Add missing dependency on ocl-icd-opencl-dev for libstarpu-dev + * rules: + - Prevent the testsuite from running in parallel. + - Pass --enable-quick-check to configure. + + -- Samuel Thibault Mon, 11 May 2015 13:41:06 +0200 + +starpu (1.1.3+dfsg-3) unstable; urgency=medium + + * control: Make libsocl-1.1-1 and libsocl-contrib-1.1-1 conflict/provide each + other (Closes: Bug#767557). + * Bump Standards-Version to 3.9.6 (no changes). + + -- Samuel Thibault Fri, 07 Nov 2014 16:50:43 +0100 + +starpu (1.1.3+dfsg-2) unstable; urgency=medium + + * control: Make libstarpu-1.1-7 Replace libstarpu-1.1-6: the soname bump + actually happened earlier :/ (Closes: Bug#761483). + + -- Samuel Thibault Mon, 15 Sep 2014 00:00:39 +0200 + +starpu (1.1.3+dfsg-1) unstable; urgency=medium + + * New upstream release. + * Rename libstarpu-1.1-6 package into libstarpu-1.1-7 due to soname bump. + + -- Samuel Thibault Fri, 12 Sep 2014 14:19:21 +0200 + +starpu (1.1.2+dfsg-2) unstable; urgency=medium + + * Make starpu-contrib use gfortran 4.8 too (Closes: Bug#752030). + + -- Samuel Thibault Thu, 19 Jun 2014 16:24:21 +0200 + +starpu (1.1.2+dfsg-1) unstable; urgency=medium + + * New upstream release. + * control: Make libstarpu-dev depend on opencl-headers, since we now build + with OpenCL enabled (Closes: Bug#748101). + * control, rules: Drop libcuda1 build-dependency, it is brought through + nvidia-cuda-toolkit anyway (Closes: Bug#749430). + * rules: Default gcc version is now 4.9, nvcc can use 4.8. + * rules: Make mpicc use our selected version of gcc. + + -- Samuel Thibault Wed, 18 Jun 2014 01:45:45 +0200 + +starpu (1.1.1+dfsg-2) unstable; urgency=medium + + * control,rules: Build with gcc-4.9 instead of gcc-4.7 (Closes: Bug#748009). + * rules: Disable the GCC plugin, as it doesn't build with gcc-4.9. + + -- Samuel Thibault Tue, 13 May 2014 15:43:03 +0200 + +starpu (1.1.1+dfsg-1) unstable; urgency=medium + + * New upstream release. + - Bump soname of libstarpu to 1.1-6 + - Add libsocl to main, now that we can build it against ocl-icd. + * README.source: matvecmult kernel included again, as it has been rewritten. + * control: Build-depend on opencl-headers, ocl-icd-opencl-dev to make main + support OpenCL. + * patches/build_fixes: Remove, merged upstream. + + -- Samuel Thibault Mon, 14 Apr 2014 13:15:18 +0200 + +starpu (1.1.0+dfsg-2) unstable; urgency=medium + + * patches/build_fixes: Fix sync_synchronize use on non-x86 archs. + * control: Depend on valgrind only on archs which have it. + + -- Samuel Thibault Sun, 29 Dec 2013 12:52:48 +0100 + +starpu (1.1.0+dfsg-1) unstable; urgency=low + + * New upstream release. + * Do not depend on install-info any more. + * Bump Standards-Version to 3.9.5. + * patches: refresh. + * control: Add valgrind and guile build-dependency. + * docs: Add pdf documentation. + + -- Samuel Thibault Mon, 28 Oct 2013 09:04:50 +0100 + +starpu (1.0.5+dfsg-1) unstable; urgency=low + + * Rebuild orig tarball without NVIDIA proprietary source code + (Closes: Bug#724919). + * watch: Mangle tarball name against +dfsg. + + -- Samuel Thibault Mon, 30 Sep 2013 18:14:07 +0200 + +starpu (1.0.5-3) unstable; urgency=high + + * patches/automake-nowerror: Do not pass -Werror to automake + (Closes: Bug#724128). + + -- Samuel Thibault Sun, 22 Sep 2013 21:55:39 +0200 + +starpu (1.0.5-2) unstable; urgency=low + + * Make starpu-top also replace/break starpu-contrib-tools + (Closes: Bug#717996). + + -- Samuel Thibault Sat, 27 Jul 2013 20:44:13 +0200 + +starpu (1.0.5-1) unstable; urgency=low + + * New upstream release. + * Move starpu_top.1.gz to starpu-top package. + * control, rules: upgrade to gcc-4.7. + * control: Make libstarpu-dev also depend on libstarpufft and libstarpumpi + (Closes: Bug#715121). + * Bump Standards-Version to 3.9.4 (no changes). + * patches/mpi_link: disable using mpicc --showme:link link flags: they bring + unnecessary rpath. + + -- Samuel Thibault Sat, 06 Jul 2013 09:42:41 +0200 + +starpu (1.0.1-4) unstable; urgency=low + + * patches/binding: Backport upstream change to fix binding on CPU near GPUs, + and for combined workers. + * patches/bashism: Backport upstream change to fix bashism. + (Closes: Bug#690935). + * patches/automake-Werror: Fix automake warnings (Closes: Bug#713335). + + -- Samuel Thibault Fri, 05 Jul 2013 15:32:05 +0200 + +starpu (1.0.1-3) unstable; urgency=low + + * control, rules: Use gcc-4.4 instead of gcc-4.5 for starpu-contrib + (Closes: Bug#680898). + + -- Samuel Thibault Mon, 30 Jul 2012 09:40:40 +0200 + +starpu (1.0.1-2) unstable; urgency=low + + * control: Really use relaxed gcc-4.6 version test, not just exactly the + upstream version part, thanks Andreas Beckmann for initial patch + (Closes: Bug#670422). + + -- Samuel Thibault Thu, 31 May 2012 13:53:27 +0200 + +starpu (1.0.1-1) unstable; urgency=low + + * New upstream release. + * Explicitly use gcc-4.6 to fix plugin build (Closes: Bug#667381). + * Use gcc-4.5 for starpu, as nvcc does not actually support all 4.6 + features, notably not __float128. + * patches/relax-gcc-plugin: Relax gcc-4.6 dependency for plugins to upstream + release version (Closes: #670422) + * watch: Fix URL. + + -- Samuel Thibault Thu, 12 Apr 2012 15:04:15 +0200 + +starpu (1.0.0-1) unstable; urgency=low + + * New upstream release. + - Add qt dependencies for StarPU-Top, Use system qwt. + - Add new libsocl0 binary package. + - Remove patches/{format,info,memory,no-fftwl}, merged upstream. + - Update debian/copyright + - Add starpu-top package. + + * control: + - Depend on hardening-check. + - Make libstarpu-dev depend on libhwloc-dev. + - build-depend on gcc-4.6-plugin-dev and help2man. + - Add missing shlib dependency for libstarpu-dev. + - Add provides to contrib variants. + - Bump Standards-Version to 3.9.3 (no changes). + * rules: + - Set DEB_BUILD_HARDENING=1 to enable hardening. + - Set empty DISPLAY to avoid opening a window during Mandelbrot test. + - Enable parallel build. + - build out of source to prepare for gcc plugins built for several gcc + versions. + - rules: Run make showcheck after check. + + * rules, control: Make libstarpu-dev depend on the exact version of gcc that + compiled the plugin, as the plugin infrastructure is very strict about it. + * lib*.install: Use wildcard instead of 1.0. + * libstarpu-dev.install: Add gcc plugin. + * starpu-tools.install: Install manpages. + * info: Install all info files. + + -- Samuel Thibault Wed, 28 Mar 2012 14:42:41 +0200 + +starpu (0.9.1-3) unstable; urgency=low + + * debian/control: + - Add libcnf-dev and gfortran build-dependency for the fortran example. + - Depend on nvidia-cuda-toolkit and libcuda1 instead of nvidia-opencl-dev + and nvidia-cuda-dev, since starpu also needs nvcc (Closes: Bug#638980) + - Make contrib Architecture: amd64 i386 since it only makes sense there. + * debian/rules: Fix main/contrib switch rules accordingly. + + -- Samuel Thibault Tue, 24 May 2011 19:12:30 +0200 + +starpu (0.9.1-2) unstable; urgency=low + + * debian/rules: + - Add rule to change Sections to contrib/. + - Set HOME to $PWD while making test, to permit buildds to write into + $HOME/.starpu. + * debian/control: Depend on libnuma-dev only on architectures which have it. + * debian/patches/no-fftwl: Build starpufft even without fftwl. + + -- Samuel Thibault Tue, 24 May 2011 18:26:07 +0200 + +starpu (0.9.1-1) unstable; urgency=low + + * Initial release (Closes: #619848) + + -- Samuel Thibault Thu, 19 May 2011 13:34:51 +0200 diff --git a/compat b/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/compat @@ -0,0 +1 @@ +9 diff --git a/control b/control new file mode 100644 index 0000000..6c93363 --- /dev/null +++ b/control @@ -0,0 +1,181 @@ +Source: starpu +Priority: optional +Maintainer: Samuel Thibault +Build-Depends: debhelper (>= 9~), autotools-dev, dh-autoreconf, + pkg-config, + libnuma-dev [amd64 arm64 i386 ia64 mips mips64 mipsel mips64el powerpc ppc64el], + libglpk-dev, + mpi-default-dev, + libgl1-mesa-dev | libgl-dev, + libglu1-mesa-dev | libglu-dev, + freeglut3-dev, + libx11-dev, + libblas-dev, + libfftw3-dev, + libhwloc-dev, + libleveldb-dev, +# qt4-qmake, libqt4-dev, libqt4-opengl-dev, libqwt5-qt4-dev, + qt5-qmake, qtbase5-dev, libqt5opengl5-dev, libqwt-dev, libqwt-headers, + valgrind [amd64 arm64 armhf i386 mips mips64 mipsel mips64el powerpc ppc64el s390x], +# guile-2.2, + opencl-c-headers, ocl-icd-opencl-dev | opencl-dev, + gfortran, + gcc-7, g++-7, gfortran-7, gcc-7-plugin-dev, gcc, +# gcc-7, g++-7, gfortran-7, gcc-7-plugin-dev, +# clang-5.0, + help2man, doxygen, doxygen-latex, +# nvidia-cuda-toolkit (>= 9.2), +#Build-Conflicts: gcc-8, g++-8 +Standards-Version: 4.2.0 +Section: libs +Homepage: http://starpu.gforge.inria.fr/ +Vcs-Git: https://scm.gforge.inria.fr/anonscm/git/starpu-debian/starpu-debian.git +Vcs-Browser: https://gforge.inria.fr/scm/browser.php?group_id=9532 + +Package: libstarpu-dev +Section: libdevel +Architecture: any +Depends: libstarpu-1.2-5 (= ${binary:Version}) | libstarpu-any-1.2-5, libstarpufft-1.2-0 (= ${binary:Version}) | libstarpu-anyfft-1.2-0, libstarpumpi-1.2-3 (= ${binary:Version}) | libstarpu-anympi-1.2-3, libsocl-1.2-0 (= ${binary:Version}) | libsocl-any-1.2-0, ${shlibs:Depends}, ${misc:Depends}, ${gccDeps}, libhwloc-dev, opencl-headers, ocl-icd-opencl-dev +Conflicts: libstarpu-contrib-dev +Provides: libstarpu-any-dev +Description: Task scheduler for heterogeneous multicore machines - dev + StarPU is a runtime system that offers support for heterogeneous + multicore machines. While many efforts are devoted to design efficient + computation kernels for those architectures (e.g. to implement BLAS + kernels on GPUs or on Cell's SPUs), StarPU not only takes care of + offloading such kernels (and implementing data coherency across + the machine), but it also makes sure the kernels are executed as + efficiently as possible. + . + This package contains development headers and libraries. +# This "contrib" version is built against CUDA. + +Package: libstarpu-1.2-5 +Section: libs +Architecture: any +Multi-Arch: same +Depends: ${shlibs:Depends}, ${misc:Depends} +Conflicts: libstarpu-contrib-1.2-5 +Provides: libstarpu-any-1.2-5 +Description: Task scheduler for heterogeneous multicore machines + StarPU is a runtime system that offers support for heterogeneous + multicore machines. While many efforts are devoted to design efficient + computation kernels for those architectures (e.g. to implement BLAS + kernels on GPUs or on Cell's SPUs), StarPU not only takes care of + offloading such kernels (and implementing data coherency across + the machine), but it also makes sure the kernels are executed as + efficiently as possible. + . + This package contains the main StarPU library +# This "contrib" version is built against CUDA. + +Package: libstarpufft-1.2-0 +Section: libs +Architecture: any +Multi-Arch: same +Depends: ${shlibs:Depends}, ${misc:Depends} +Conflicts: libstarpu-contribfft-1.2-0 +Provides: libstarpu-anyfft-1.2-0 +Description: Task scheduler for heterogeneous multicore machines + StarPU is a runtime system that offers support for heterogeneous + multicore machines. While many efforts are devoted to design efficient + computation kernels for those architectures (e.g. to implement BLAS + kernels on GPUs or on Cell's SPUs), StarPU not only takes care of + offloading such kernels (and implementing data coherency across + the machine), but it also makes sure the kernels are executed as + efficiently as possible. + . + This package contains a hybrid CPU+GPU FFT library. +# This "contrib" version is built against CUDA. + +Package: libstarpumpi-1.2-3 +Section: libs +Architecture: any +Multi-Arch: same +Depends: ${shlibs:Depends}, ${misc:Depends} +Conflicts: libstarpu-contribmpi-1.2-3 +Provides: libstarpu-anympi-1.2-3 +Description: Task scheduler for heterogeneous multicore machines + StarPU is a runtime system that offers support for heterogeneous + multicore machines. While many efforts are devoted to design efficient + computation kernels for those architectures (e.g. to implement BLAS + kernels on GPUs or on Cell's SPUs), StarPU not only takes care of + offloading such kernels (and implementing data coherency across + the machine), but it also makes sure the kernels are executed as + efficiently as possible. + . + This package contains MPI extensions for StarPU. +# This "contrib" version is built against CUDA. + +Package: starpu-tools +Section: utils +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Conflicts: starpu-contrib-tools +Provides: starpu-any-tools +Description: Task scheduler for heterogeneous multicore machines - tools + StarPU is a runtime system that offers support for heterogeneous + multicore machines. While many efforts are devoted to design efficient + computation kernels for those architectures (e.g. to implement BLAS + kernels on GPUs or on Cell's SPUs), StarPU not only takes care of + offloading such kernels (and implementing data coherency across + the machine), but it also makes sure the kernels are executed as + efficiently as possible. + . + This package contains StarPU tools. +# This "contrib" version is built against CUDA. + +Package: starpu-top +Section: utils +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Replaces: starpu-tools (<< 1.0.5~), starpu-contrib-tools (<< 1.0.5~) +Breaks: starpu-tools (<< 1.0.5~), starpu-contrib-tools (<< 1.0.5~) +Description: Task scheduler for heterogeneous multicore machines - top + StarPU is a runtime system that offers support for heterogeneous + multicore machines. While many efforts are devoted to design efficient + computation kernels for those architectures (e.g. to implement BLAS + kernels on GPUs or on Cell's SPUs), StarPU not only takes care of + offloading such kernels (and implementing data coherency across + the machine), but it also makes sure the kernels are executed as + efficiently as possible. + . + This package contains a graphical top tool. + +Package: starpu-examples +Section: science +Architecture: any +Multi-Arch: same +Depends: ${shlibs:Depends}, ${misc:Depends} +Conflicts: starpu-contrib-examples +Provides: starpu-any-examples +Description: Task scheduler for heterogeneous multicore machines - exs + StarPU is a runtime system that offers support for heterogeneous + multicore machines. While many efforts are devoted to design efficient + computation kernels for those architectures (e.g. to implement BLAS + kernels on GPUs or on Cell's SPUs), StarPU not only takes care of + offloading such kernels (and implementing data coherency across + the machine), but it also makes sure the kernels are executed as + efficiently as possible. + . + This package contains application examples. +# This "contrib" version is built against CUDA. + +Package: libsocl-1.2-0 +Section: libs +Architecture: any +Multi-Arch: same +Depends: ${shlibs:Depends}, ${misc:Depends} +Conflicts: libsocl-contrib-1.2-0 +Provides: libsocl-any-1.2-0 +Description: Task scheduler for heterogeneous multicore machines + StarPU is a runtime system that offers support for heterogeneous + multicore machines. While many efforts are devoted to design efficient + computation kernels for those architectures (e.g. to implement BLAS + kernels on GPUs or on Cell's SPUs), StarPU not only takes care of + offloading such kernels (and implementing data coherency across + the machine), but it also makes sure the kernels are executed as + efficiently as possible. + . + This package contains an OpenCL-compatible library interface to StarPU. +# This "contrib" version is built against CUDA. diff --git a/copyright b/copyright new file mode 100644 index 0000000..809bfe1 --- /dev/null +++ b/copyright @@ -0,0 +1,188 @@ +Format: http://dep.debian.net/deps/dep5 +Upstream-Name: starpu +Source: http://starpu.gforge.inria.fr/ + +Files: * +Copyright: 2008-2012 Université de Bordeaux 1 + 2010-2012 Centre National de la Recherche Scientifique + 2010-2012 Institut National de Recherche en Informatique et Automatique + 2011 Télécom-SudParis + 2010 Mehdi Juhoor + 2010 Sylvain Gault + 2011 William Braik, Yann Courtois, Jean-Marie Couteyen, Anthony Roy +License: LGPL-2.1 + +Files: src/common/uthash.h +Copyright: 2003-2010, Troy D. Hanson +License: BSD-uthash + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + . + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + . + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS + IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A + PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER + OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Files: acinclude.m4 +Copyright: Free Software Foundation, Inc. +License: GPL-2 + +Files: gcc-plugin/* +Copyright: 2011 Institut National de Recherche en Informatique et Automatique +License: GPL-3 + +Files: starpu-top/qwt/* +Copyright: 1997 Josef Wilgen + 2002-2003,2008 Uwe Rathmann +License: QWT + +Files: starpu-top/qledindicator/* +Copyright: 2010 by Tn +License: GPL-3 + +Files: socl/include/CL/* +Copyright: 2008-2010 The Khronos Group Inc. +License: Expat + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and/or associated documentation files (the + "Materials"), to deal in the Materials without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Materials, and to + permit persons to whom the Materials are furnished to do so, subject to + the following conditions: + . + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Materials. + . + THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. + +Files: doc/doxygen/refman.tex + doc/doxygen/chapters/* +Copyright: 2009-2013 Université de Bordeaux + 2010, 2011, 2012, 2013, 2014 CNRS + 2011 Télécom-SudParis + 2011, 2012 INRIA +License: GFDL-NIV + +Files: debian/* +Copyright: 2011-2012 Samuel Thibault +License: LGPL-2.1 + +License: LGPL-2.1 + This package is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + . + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see . + . + On Debian systems, the complete text of the GNU Lesser General + Public License can be found in "/usr/share/common-licenses/LGPL-2". + +License: GPL-2 + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + . + On Debian systems, the complete text of the GNU General + Public License can be found in "/usr/share/common-licenses/GPL-2". + +License: GPL-3 + GCC-StarPU is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + . + GCC-StarPU is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with GCC-StarPU. If not, see . */ + . + On Debian systems, the complete text of the GNU General + Public License can be found in "/usr/share/common-licenses/GPL-3". + +License: QWT + This library is free software; you can redistribute it and/or + modify it under the terms of the Qwt License, Version 1.0 + . + Qwt License + Version 1.0, January 1, 2003 + . + The Qwt library and included programs are provided under the terms + of the GNU LESSER GENERAL PUBLIC LICENSE (LGPL) with the following + exceptions: + . + 1. Widgets that are subclassed from Qwt widgets do not + constitute a derivative work. + . + 2. Static linking of applications and widgets to the + Qwt library does not constitute a derivative work + and does not require the author to provide source + code for the application or widget, use the shared + Qwt libraries, or link their applications or + widgets against a user-supplied version of Qwt. + . + If you link the application or widget to a modified + version of Qwt, then the changes to Qwt must be + provided under the terms of the LGPL in sections + 1, 2, and 4. + . + 3. You do not have to provide a copy of the Qwt license + with programs that are linked to the Qwt library, nor + do you have to identify the Qwt license in your + program or documentation as required by section 6 + of the LGPL. + . + . + However, programs must still identify their use of Qwt. + The following example statement can be included in user + documentation to satisfy this requirement: + . + [program/widget] is based in part on the work of + the Qwt project (http://qwt.sf.net). + +License: GFDL-NIV + Permission is granted to copy, distribute and/or modify this document + under the terms of the GNU Free Documentation License, Version 1.3 or + any later version published by the Free Software Foundation; with no + Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. A + copy of the license is included in the section entitled “GNU Free + Documentation License”. + . + On Debian systems, the complete text of the GNU Free Documentation + License can be found in "/usr/share/common-licenses/GFDL-1.3". diff --git a/docs b/docs new file mode 100644 index 0000000..55bc0a6 --- /dev/null +++ b/docs @@ -0,0 +1,2 @@ +README +AUTHORS diff --git a/gbp.conf b/gbp.conf new file mode 100644 index 0000000..8dac02b --- /dev/null +++ b/gbp.conf @@ -0,0 +1,6 @@ +[DEFAULT] +upstream-branch = upstream-dfsg + +[import-orig] +upstream-branch = upstream +merge = False diff --git a/libsocl-1.2-0.install b/libsocl-1.2-0.install new file mode 100644 index 0000000..4c1968b --- /dev/null +++ b/libsocl-1.2-0.install @@ -0,0 +1 @@ +usr/lib/*/libsocl-*.so.* diff --git a/libsocl-1.2-0.shlibs b/libsocl-1.2-0.shlibs new file mode 100644 index 0000000..5e872a2 --- /dev/null +++ b/libsocl-1.2-0.shlibs @@ -0,0 +1 @@ +libsocl-1.2 0 libsocl-1.2-0 (>= 1.2.3+dfsg~) | libsocl-any-1.2-0 diff --git a/libsocl-contrib-1.2-0.install b/libsocl-contrib-1.2-0.install new file mode 120000 index 0000000..a9a9533 --- /dev/null +++ b/libsocl-contrib-1.2-0.install @@ -0,0 +1 @@ +libsocl-1.2-0.install \ No newline at end of file diff --git a/libstarpu-1.2-5.install b/libstarpu-1.2-5.install new file mode 100644 index 0000000..963a0b1 --- /dev/null +++ b/libstarpu-1.2-5.install @@ -0,0 +1 @@ +usr/lib/*/libstarpu-*.so.* diff --git a/libstarpu-1.2-5.shlibs b/libstarpu-1.2-5.shlibs new file mode 100644 index 0000000..a3e96c4 --- /dev/null +++ b/libstarpu-1.2-5.shlibs @@ -0,0 +1 @@ +libstarpu-1.2 5 libstarpu-1.2-5 (>= 1.2.5+dfsg~) | libstarpu-any-1.2-5 diff --git a/libstarpu-contrib-1.2-5.install b/libstarpu-contrib-1.2-5.install new file mode 120000 index 0000000..dcd9b35 --- /dev/null +++ b/libstarpu-contrib-1.2-5.install @@ -0,0 +1 @@ +libstarpu-1.2-5.install \ No newline at end of file diff --git a/libstarpu-contrib-dev.install b/libstarpu-contrib-dev.install new file mode 120000 index 0000000..7754fbb --- /dev/null +++ b/libstarpu-contrib-dev.install @@ -0,0 +1 @@ +libstarpu-dev.install \ No newline at end of file diff --git a/libstarpu-contribfft-1.2-0.install b/libstarpu-contribfft-1.2-0.install new file mode 120000 index 0000000..a08aa7c --- /dev/null +++ b/libstarpu-contribfft-1.2-0.install @@ -0,0 +1 @@ +libstarpufft-1.2-0.install \ No newline at end of file diff --git a/libstarpu-contribmpi-1.2-3.install b/libstarpu-contribmpi-1.2-3.install new file mode 120000 index 0000000..85b6029 --- /dev/null +++ b/libstarpu-contribmpi-1.2-3.install @@ -0,0 +1 @@ +libstarpumpi-1.2-3.install \ No newline at end of file diff --git a/libstarpu-dev.install b/libstarpu-dev.install new file mode 100644 index 0000000..8f16288 --- /dev/null +++ b/libstarpu-dev.install @@ -0,0 +1,5 @@ +usr/include +usr/lib/*/lib*.a +usr/lib/*/lib*.so +usr/lib/*/pkgconfig/* +usr/share/doc/libstarpu-dev/manual diff --git a/libstarpufft-1.2-0.install b/libstarpufft-1.2-0.install new file mode 100644 index 0000000..d6ba93d --- /dev/null +++ b/libstarpufft-1.2-0.install @@ -0,0 +1 @@ +usr/lib/*/libstarpufft-*.so.* diff --git a/libstarpufft-1.2-0.shlibs b/libstarpufft-1.2-0.shlibs new file mode 100644 index 0000000..180fd60 --- /dev/null +++ b/libstarpufft-1.2-0.shlibs @@ -0,0 +1 @@ +libstarpufft-1.2 0 libstarpufft-1.2-0 (>= 1.2.3+dfsg~) | libstarpu-anyfft-1.2-0 diff --git a/libstarpumpi-1.2-3.install b/libstarpumpi-1.2-3.install new file mode 100644 index 0000000..0cc9b02 --- /dev/null +++ b/libstarpumpi-1.2-3.install @@ -0,0 +1 @@ +usr/lib/*/libstarpumpi-*.so.* diff --git a/libstarpumpi-1.2-3.shlibs b/libstarpumpi-1.2-3.shlibs new file mode 100644 index 0000000..64a77ad --- /dev/null +++ b/libstarpumpi-1.2-3.shlibs @@ -0,0 +1 @@ +libstarpumpi-1.2 3 libstarpumpi-1.2-3 (>= 1.2.4+dfsg~) | libstarpu-anympi-1.2-3 diff --git a/patches/disable-proprietary b/patches/disable-proprietary new file mode 100644 index 0000000..a767caf --- /dev/null +++ b/patches/disable-proprietary @@ -0,0 +1,32 @@ +SobolQRNG is not free enough for Debian + +--- a/examples/Makefile.am ++++ b/examples/Makefile.am +@@ -113,11 +113,6 @@ noinst_HEADERS = \ + filters/custom_mf/custom_types.h \ + interface/complex_interface.h \ + interface/complex_codelet.h \ +- pi/pi.h \ +- pi/SobolQRNG/sobol.h \ +- pi/SobolQRNG/sobol_gold.h \ +- pi/SobolQRNG/sobol_gpu.h \ +- pi/SobolQRNG/sobol_primitives.h \ + reductions/dot_product.h \ + basic_examples/vector_scal_cpu_template.h + +@@ -819,6 +816,7 @@ top_hello_world_top_SOURCES = \ + # Pi # + ###### + ++if FALSE + if !STARPU_HAVE_WINDOWS + + examplebin_PROGRAMS += \ +@@ -847,6 +845,7 @@ pi_pi_redux_SOURCES += \ + $(STARPU_CURAND_LDFLAGS) + endif + endif ++endif + + ########################### + # OpenGL interoperability # diff --git a/patches/doc-nopdf b/patches/doc-nopdf new file mode 100644 index 0000000..4054a55 --- /dev/null +++ b/patches/doc-nopdf @@ -0,0 +1,30 @@ +I give up trying to keep the pdf doc buildable with the moving +doxygen+latex combination. See Bug#921301. + +--- + doc/doxygen/Makefile.am | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +--- a/doc/doxygen/Makefile.am ++++ b/doc/doxygen/Makefile.am +@@ -32,9 +32,8 @@ txtdir = $(docdir)/manual + EXTRA_DIST = + + if BUILD_DOC +-all: $(DOX_HTML_DIR) $(DOX_PDF) +-EXTRA_DIST += $(DOX_HTML_DIR) $(DOX_PDF) +-txt_DATA = $(DOX_PDF) ++all: $(DOX_HTML_DIR) ++EXTRA_DIST += $(DOX_HTML_DIR) + DOX_HTML_SRCDIR=$(DOX_HTML_DIR) + install-exec-hook: + $(MKDIR_P) $(DESTDIR)$(docdir)/manual/html +@@ -286,6 +285,8 @@ $(DOX_TAG): $(dox_inputs) + @$(SED) -i '/\\begin{titlepage}/,$$d' $(DOX_LATEX_DIR)/refman.tex + @cat $(top_srcdir)/doc/doxygen/refman.tex >> $(DOX_LATEX_DIR)/refman.tex + ++$(DOX_HTML_DIR): $(DOX_TAG) ++ + $(DOX_PDF): $(DOX_TAG) refman.tex + @cp $(top_srcdir)/doc/doxygen/chapters/version.sty $(DOX_LATEX_DIR) + @cp $(top_srcdir)/doc/doxygen/chapters/images/*pdf $(DOX_LATEX_DIR) diff --git a/patches/heat-opengl b/patches/heat-opengl new file mode 100644 index 0000000..bd02d91 --- /dev/null +++ b/patches/heat-opengl @@ -0,0 +1,40 @@ +commit fd3e4dae459f7fc2819ea23ead69a5f191f2c97b +Author: Samuel Thibault +Date: Tue Feb 5 22:47:12 2019 +0200 + + Only display heat results if DISPLAY is set + +diff --git a/examples/heat/heat.c b/examples/heat/heat.c +index f5324b74e..7d9b4ee33 100644 +--- a/examples/heat/heat.c ++++ b/examples/heat/heat.c +@@ -804,7 +804,8 @@ int main(int argc, char **argv) + } + + #ifdef STARPU_OPENGL_RENDER +- opengl_render(ntheta, nthick, result, pmesh, argc, argv); ++ if (getenv("DISPLAY")) ++ opengl_render(ntheta, nthick, result, pmesh, argc, argv); + #endif + + free(pmesh); +commit 0409614344d5ee686cefb6a00a0914c167deacf7 +Author: Samuel Thibault +Date: Sat Feb 23 11:21:23 2019 +0100 + + Also avoid displaying heat results if DISPLAY is empty + +diff --git a/examples/heat/heat.c b/examples/heat/heat.c +index 7d9b4ee33..eff671db2 100644 +--- a/examples/heat/heat.c ++++ b/examples/heat/heat.c +@@ -804,7 +804,8 @@ int main(int argc, char **argv) + } + + #ifdef STARPU_OPENGL_RENDER +- if (getenv("DISPLAY")) ++ const char *display = getenv("DISPLAY"); ++ if (display && display[0]) + opengl_render(ntheta, nthick, result, pmesh, argc, argv); + #endif + diff --git a/patches/mpi_link b/patches/mpi_link new file mode 100644 index 0000000..a93ee6c --- /dev/null +++ b/patches/mpi_link @@ -0,0 +1,17 @@ +disable using mpicc --showme:link link flags: they bring unnecessary rpath. + +--- a/configure.ac ++++ b/configure.ac +@@ -1218,12 +1218,6 @@ AC_MSG_RESULT($mpicc_path) + AC_SUBST(MPICC, $mpicc_path) + if test x$use_mpi = xyes; then + cc_or_mpicc=$mpicc_path +- # For some reason, libtool uses gcc instead of mpicc when linking +- # libstarpumpi. +- # On Darwin (and maybe other systems ?) the linker will fail (undefined +- # references to MPI_*). We manually add the required flags to fix this +- # issue. +- AC_SUBST(MPICC_LDFLAGS, `$mpicc_path --showme:link`) + else + cc_or_mpicc=$CC + fi diff --git a/patches/qt5 b/patches/qt5 new file mode 100644 index 0000000..7c592e2 --- /dev/null +++ b/patches/qt5 @@ -0,0 +1,15 @@ +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/configure.ac ++++ b/configure.ac +@@ -2113,7 +2113,7 @@ AC_MSG_CHECKING(for StarPU-Top) + + if test "x$enable_starpu_top" != "xno" ; then + can_build_starpu_top=no +- AC_PATH_PROGS([QMAKE], [qmake-qt4 qmake], [not-found]) ++ AC_PATH_PROGS([QMAKE], [qmake], [not-found]) + if test x$QMAKE != xnot-found; then + QMAKE_VERSION=`$QMAKE --version 2>&1 | head -n 1 | cut -d '.' -f 1 | cut -d ' ' -f 3` + QT_VERSION=`$QMAKE --version 2>&1 | tail -n 1 | cut -d '.' -f 1 | cut -d ' ' -f 4` diff --git a/patches/relax-gcc-plugin b/patches/relax-gcc-plugin new file mode 100644 index 0000000..718b2de --- /dev/null +++ b/patches/relax-gcc-plugin @@ -0,0 +1,12 @@ +Relax gcc-4.6 dependency for plugins to upstream release version. + +--- a/gcc-plugin/src/starpu.c ++++ b/gcc-plugin/src/starpu.c +@@ -1699,7 +1699,6 @@ plugin_init (struct plugin_name_args *pl + VERSION_CHECK (basever); /* e.g., "4.6.2" */ + VERSION_CHECK (devphase); + VERSION_CHECK (revision); +- VERSION_CHECK (configuration_arguments); + + #undef VERSION_CHECK + diff --git a/patches/reproducibility b/patches/reproducibility new file mode 100644 index 0000000..c0bf282 --- /dev/null +++ b/patches/reproducibility @@ -0,0 +1,103 @@ +commit 0d915f2262a3155cbf1d59131a0a0ab55a0368f2 +Author: Samuel Thibault +Date: Sun Nov 4 01:35:40 2018 +0100 + + Avoid exposing STARPU_BUILD_DIR in installed files + + (cherry picked from commit 66846a66ec363332bbfe4883e7bee402848c414f) + + +commit 66846a66ec363332bbfe4883e7bee402848c414f (HEAD -> master, origin/master, origin/HEAD) +Author: Samuel Thibault +Date: Sun Nov 4 01:35:40 2018 +0100 + + Avoid exposing STARPU_BUILD_DIR in installed files + + +commit 6195855544e1ae7f97b60ecfc3e3a74fdff479e4 +Author: Samuel Thibault +Date: Sat Nov 10 14:02:13 2018 +0100 + + Avoid getting $BASH from the shell (/bin/sh, typically), we prefer to use /bin/bash for reproducibility + +--- + configure.ac | 2 +- + examples/ppm_downscaler/yuv_downscaler.c | 5 ----- + include/starpu_config.h.in | 1 - + src/drivers/opencl/driver_opencl_utils.c | 9 --------- + tests/loader.c | 2 ++ + tools/starpu_codelet_profile.in | 2 +- + 6 files changed, 4 insertions(+), 17 deletions(-) + +--- a/examples/ppm_downscaler/yuv_downscaler.c ++++ b/examples/ppm_downscaler/yuv_downscaler.c +@@ -47,11 +47,6 @@ void parse_args(int argc, char **argv) + strncpy(filename_in, argv[1], 1023); + strncpy(filename_out, argv[2], 1023); + } +- else +- { +- snprintf(filename_in, 1024, "%s/examples/ppm_downscaler/%s", STARPU_BUILD_DIR, filename_in_default); +- snprintf(filename_out, 1024, "%s/examples/ppm_downscaler/%s", STARPU_BUILD_DIR, filename_out_default); +- } + } + + #define FRAMESIZE sizeof(struct yuv_frame) +--- a/include/starpu_config.h.in ++++ b/include/starpu_config.h.in +@@ -58,7 +58,6 @@ + #undef STARPU_MKL + #undef STARPU_SYSTEM_BLAS + +-#undef STARPU_BUILD_DIR + #undef STARPU_OPENCL_DATADIR + #undef STARPU_HAVE_MAGMA + +--- a/src/drivers/opencl/driver_opencl_utils.c ++++ b/src/drivers/opencl/driver_opencl_utils.c +@@ -70,15 +70,6 @@ int _starpu_opencl_locate_file(const cha + + if (ret == EXIT_FAILURE) + { +- _STARPU_CALLOC(*located_file_name, 1, strlen(STARPU_SRC_DIR)+1+strlen(source_file_name)+1); +- sprintf(*located_file_name, "%s/%s", STARPU_SRC_DIR, source_file_name); +- _STARPU_DEBUG("Trying to locate <%s>\n", *located_file_name); +- if (access(*located_file_name, R_OK) == 0) +- ret = EXIT_SUCCESS; +- } +- +- if (ret == EXIT_FAILURE) +- { + _STARPU_CALLOC(*located_file_name, 1, strlen(_STARPU_STRINGIFY(STARPU_OPENCL_DATADIR))+1+strlen(source_file_name)+1); + sprintf(*located_file_name, "%s/%s", _STARPU_STRINGIFY(STARPU_OPENCL_DATADIR), source_file_name); + _STARPU_DEBUG("Trying to locate <%s>\n", *located_file_name); +--- a/tests/loader.c ++++ b/tests/loader.c +@@ -262,6 +262,8 @@ int main(int argc, char *argv[]) + if (timeout <= 0) + timeout = DEFAULT_TIMEOUT; + ++ setenv("STARPU_OPENCL_PROGRAM_DIR", STARPU_SRC_DIR, 1); ++ + /* set SIGALARM handler */ + sa.sa_flags = 0; + sigemptyset(&sa.sa_mask); +--- a/configure.ac ++++ b/configure.ac +@@ -99,7 +99,7 @@ AC_HEADER_STDC + AC_C_RESTRICT + + # Check if bash is available +-AC_CHECK_PROGS([BASH], [bash]) ++AC_PATH_PROG([REALBASH], [bash], , [/bin:$PATH]) + + # Record git version + AC_PATH_PROG(gitcommand, git) +--- a/tools/starpu_codelet_profile.in ++++ b/tools/starpu_codelet_profile.in +@@ -1,4 +1,4 @@ +-#!@BASH@ ++#!@REALBASH@ + # StarPU --- Runtime system for heterogeneous multicore architectures. + # + # Copyright (C) 2008-2011,2013-2014 Université de Bordeaux diff --git a/patches/series b/patches/series new file mode 100644 index 0000000..2bd2a58 --- /dev/null +++ b/patches/series @@ -0,0 +1,7 @@ +disable-proprietary +relax-gcc-plugin +mpi_link +reproducibility +qt5 +doc-nopdf +heat-opengl diff --git a/rules b/rules new file mode 100755 index 0000000..4d0cd97 --- /dev/null +++ b/rules @@ -0,0 +1,126 @@ +#!/usr/bin/make -f + +DH_OPTIONS=-Bbuild + +source=$(shell dpkg-parsechangelog -S Source) + +# This is the current default version, which we may have to conflict against +DEFAULT_GCC_VERSION := 8 + +# This is the version we want to build starpu against (may have to change +# according to plugin support) +GCC_VERSION := 7 + +# These are the best versions that nvcc supports. +CONTRIB_GCC_VERSION := 7 +CONTRIB_CLANG_VERSION := 5.0 + +ifeq ($(source),starpu) +#CC=gcc-$(GCC_VERSION) +#CXX=g++-$(GCC_VERSION) +#F77=gfortran-$(GCC_VERSION) +else +# nvcc sometimes chokes on some gcc features +CC=gcc-$(CONTRIB_GCC_VERSION) +CXX=g++-$(CONTRIB_GCC_VERSION) +F77=gfortran-$(CONTRIB_GCC_VERSION) +FC=gfortran-$(CONTRIB_GCC_VERSION) +endif +OMPI_CC=$(CC) +export CC +export CXX +export F77 +export FC +export OMPI_CC +V=1 +export V + +#export NVCC_CC = gcc-7 +#export NVCC_CC = clang-5.0 +export NVCCFLAGS = -Xcompiler -fPIC -Xcompiler -std=c++03 + +export QT_SELECT=5 + +ifneq (,$(filter nodoc,$(DEB_BUILD_OPTIONS))) +CONFIGURE_NODOC = --disable-build-doc +endif + +#CONFIGURE_QWT = --with-qwt-include-dir=/usr/include/qwt \ +# --with-qwt-lib=qwt + +%: + dh $@ --parallel $(DH_OPTIONS) --with autoreconf + +override_dh_auto_configure: + dh_auto_configure $(DH_OPTIONS) -- --enable-opengl-render \ + $(CONFIGURE_QWT) \ + --enable-openmp --enable-quick-check --docdir=/usr/share/doc/libstarpu-dev \ + $(CONFIGURE_NODOC) + +override_dh_auto_test: + -HOME=$$PWD DISPLAY= DEB_BUILD_OPTIONS=$(patsubst parallel=%,,$(DEB_BUILD_OPTIONS)) dh_auto_test $(DH_OPTIONS) -- -k + $(MAKE) -C build showcheck + +#ifeq ($(source),starpu) +#override_dh_install: +# dh_install usr/lib/starpu/*/gcc/*/*.so* /usr/lib/gcc/$(DEB_HOST_MULTIARCH)/$(GCC_VERSION)/plugin +#endif + +override_dh_auto_clean: + dh_auto_clean $(DH_OPTIONS) + rm -fr doc/doxygen/starpu.pdf + rm -fr doc/doxygen/html + rm -fr .starpu + rm -f starpu-top/StarPU-Top + rm -fr .nv + +# This is required by the gcc plugin infrastructure +#GCC_DEBIAN_VERSION := $(shell dpkg-query -f '$${Version}' -W $(CC)) +#GCC_UPSTREAM_VERSION := $(firstword $(subst -, ,$(GCC_DEBIAN_VERSION))) +#override_dh_gencontrol: +# dh_gencontrol -- -VgccDeps='$(CC) (>= $(GCC_DEBIAN_VERSION)), $(CC) (<< $(GCC_UPSTREAM_VERSION)A)' + +# Switch to main rules +main: + sed -i 's/^starpu-contrib /starpu /' debian/changelog + sed -i '1s/^Source: starpu-contrib/Source: starpu/' debian/control + sed -i 's/Package: libstarpu-contrib/Package: libstarpu/' debian/control + sed -i 's/Package: starpu-contrib/Package: starpu/' debian/control + sed -i 's/Package: libsocl-contrib/Package: libsocl/' debian/control + sed -i '/Depends/s/ libstarpu-contrib/ libstarpu/g' debian/control + sed -i '/Depends/s/ libsocl-contrib/ libsocl/g' debian/control + sed -i 's/Conflicts: libstarpu/Conflicts: libstarpu-contrib/' debian/control + sed -i 's/Conflicts: libsocl/Conflicts: libsocl-contrib/' debian/control + sed -i 's/Conflicts: starpu/Conflicts: starpu-contrib/' debian/control + sed -i 's/# gcc-$(GCC_VERSION), g++-$(GCC_VERSION), gfortran-$(GCC_VERSION), gcc-$(GCC_VERSION)-plugin-dev, gcc,$$/ gcc-$(GCC_VERSION), g++-$(GCC_VERSION), gfortran-$(GCC_VERSION), gcc-$(GCC_VERSION)-plugin-dev, gcc,/' debian/control + sed -i 's/^ gcc-$(CONTRIB_GCC_VERSION), g++-$(CONTRIB_GCC_VERSION), gfortran-$(CONTRIB_GCC_VERSION), gcc-$(CONTRIB_GCC_VERSION)-plugin-dev,$$/# gcc-$(CONTRIB_GCC_VERSION), g++-$(CONTRIB_GCC_VERSION), gfortran-$(CONTRIB_GCC_VERSION), gcc-$(CONTRIB_GCC_VERSION)-plugin-dev,/' debian/control + #sed -i 's/^ clang-$(CONTRIB_CLANG_VERSION),$$/# clang-$(CONTRIB_CLANG_VERSION),/' debian/control + sed -i 's/^ nvidia-cuda-toolkit/# nvidia-cuda-toolkit/' debian/control + #sed -i 's/^Build-Conflicts: gcc-$(DEFAULT_GCC_VERSION), g++-$(DEFAULT_GCC_VERSION)/#Build-Conflicts: gcc-$(DEFAULT_GCC_VERSION), g++-$(DEFAULT_GCC_VERSION)/' debian/control + sed -i 's_^Section: contrib/_Section: _' debian/control + sed -i 's/contrib-contrib/contrib/g' debian/control debian/changelog + sed -i '/starpu-top/,/starpu-examples/s/^#//' debian/control + sed -i 's/^ This "contrib" version/# This "contrib" version/' debian/control + +# Switch to contrib rules +contrib: + sed -i '/starpu-top/,/^$$/s/^/#/' debian/control + sed -i 's/^starpu /starpu-contrib /' debian/changelog + sed -i '1s/^Source: starpu/Source: starpu-contrib/' debian/control + sed -i 's/Package: libstarpu/Package: libstarpu-contrib/' debian/control + sed -i 's/Package: starpu/Package: starpu-contrib/' debian/control + sed -i 's/Package: libsocl/Package: libsocl-contrib/' debian/control + sed -i '/Depends/s/ libstarpu/ libstarpu-contrib/g' debian/control + sed -i '/Depends/s/ libsocl/ libsocl-contrib/g' debian/control + sed -i 's/Conflicts: libstarpu-contrib/Conflicts: libstarpu/' debian/control + sed -i 's/Conflicts: libsocl-contrib/Conflicts: libsocl/' debian/control + sed -i 's/Conflicts: starpu-contrib/Conflicts: starpu/' debian/control + sed -i 's/^ gcc-$(GCC_VERSION), g++-$(GCC_VERSION), gfortran-$(GCC_VERSION), gcc-$(GCC_VERSION)-plugin-dev, gcc,$$/# gcc-$(GCC_VERSION), g++-$(GCC_VERSION), gfortran-$(GCC_VERSION), gcc-$(GCC_VERSION)-plugin-dev, gcc,/' debian/control + sed -i 's/# gcc-$(CONTRIB_GCC_VERSION), g++-$(CONTRIB_GCC_VERSION), gfortran-$(CONTRIB_GCC_VERSION), gcc-$(CONTRIB_GCC_VERSION)-plugin-dev,$$/ gcc-$(CONTRIB_GCC_VERSION), g++-$(CONTRIB_GCC_VERSION), gfortran-$(CONTRIB_GCC_VERSION), gcc-$(CONTRIB_GCC_VERSION)-plugin-dev,/' debian/control + #sed -i 's/^# clang-$(CONTRIB_CLANG_VERSION),$$/ clang-$(CONTRIB_CLANG_VERSION),/' debian/control + sed -i 's/# nvidia-cuda-toolkit/ nvidia-cuda-toolkit/' debian/control + #sed -i 's/^#Build-Conflicts: gcc-$(DEFAULT_GCC_VERSION), g++-$(DEFAULT_GCC_VERSION)/Build-Conflicts: gcc-$(DEFAULT_GCC_VERSION), g++-$(DEFAULT_GCC_VERSION)/' debian/control + sed -i 's_contrib/contrib/_contrib_g' debian/control debian/control + sed -i 's/contrib-contrib/contrib/g' debian/control debian/changelog + sed -i 's_^Section: \([^/]*\)$$_Section: contrib/\1_' debian/control + sed -i 's/^# This "contrib" version/ This "contrib" version/' debian/control diff --git a/source/format b/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/starpu-contrib-examples.install b/starpu-contrib-examples.install new file mode 120000 index 0000000..17d6d0b --- /dev/null +++ b/starpu-contrib-examples.install @@ -0,0 +1 @@ +starpu-examples.install \ No newline at end of file diff --git a/starpu-contrib-tools.install b/starpu-contrib-tools.install new file mode 120000 index 0000000..c1b46ee --- /dev/null +++ b/starpu-contrib-tools.install @@ -0,0 +1 @@ +starpu-tools.install \ No newline at end of file diff --git a/starpu-examples.install b/starpu-examples.install new file mode 100644 index 0000000..58a3c0f --- /dev/null +++ b/starpu-examples.install @@ -0,0 +1,2 @@ +usr/lib/*/starpu/examples +usr/share/starpu/opencl diff --git a/starpu-tools.install b/starpu-tools.install new file mode 100644 index 0000000..e9a0857 --- /dev/null +++ b/starpu-tools.install @@ -0,0 +1,3 @@ +usr/bin/starpu_[a-su-z]* +usr/share/starpu/gdbinit +usr/share/man/man1/starpu_[a-su-z]* diff --git a/starpu-top.install b/starpu-top.install new file mode 100644 index 0000000..4d91488 --- /dev/null +++ b/starpu-top.install @@ -0,0 +1,2 @@ +usr/bin/starpu_top +usr/share/man/man1/starpu_top* diff --git a/tests/control b/tests/control new file mode 100644 index 0000000..f371555 --- /dev/null +++ b/tests/control @@ -0,0 +1,3 @@ +Depends: starpu-examples +Tests: examples +Restrictions: allow-stderr diff --git a/tests/examples b/tests/examples new file mode 100644 index 0000000..f7682b4 --- /dev/null +++ b/tests/examples @@ -0,0 +1,43 @@ +#!/bin/sh +MULTIARCH=$(dpkg-architecture -qDEB_HOST_MULTIARCH) +for STARPU_SCHED in eager dmda +do + export STARPU_SCHED + for i in /usr/lib/$MULTIARCH/starpu/examples/* ; do + [ -d "$i" ] && continue + base=$(basename $i) + case $base in + cg) + # long and buggy + continue + ;; + ppm_downscaler|yuv_downscaler) + # needs arguments + continue + ;; + heat|mandelbrot) + # wants display + continue + ;; + hello_world_top) + # wants starpu-top + continue + ;; + parallel_tasks*|sched_ctx*) + # buggy + continue + ;; + tasks_size_overhead.gp|tasks_size_overhead.sh) + # only output + continue + ;; + esac + echo Running $i + $i + case $? in + 77) continue;; # SKIP + 0) continue;; + *) exit 1;; + esac + done +done diff --git a/watch b/watch new file mode 100644 index 0000000..631e9bb --- /dev/null +++ b/watch @@ -0,0 +1,4 @@ +version=3 +opts=dversionmangle=s/\+dfsg\d*$//,uversionmangle=s/(\d)(rc\d*)$/$1~$2/ \ +https://gforge.inria.fr/frs/?group_id=1570 \ +(?:|.*/)starpu(?:[_\-]v?|)(\d[^\s/]*)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz)