Befator-Inc-Firmen-Netzwerk/MINGW-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge pull request #8745 from 3rav/patch-5

Browse Source 
starpu: update and delete temporary fix (patch)
This commit is contained in:
Christoph Reiter
2021-05-24 21:03:44 +02:00
committed by GitHub
parent f466f50944 d08d8e09e0
commit cc367da29e
2 changed files with 4 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
mingw-w64-starpu/0000-fix.patch
View File

@@ -1,73 +0,0 @@
diff -urN starpu-1.3.7.orig/mpi/tests/driver.c starpu-1.3.7/mpi/tests/driver.c
--- starpu-1.3.7.orig/mpi/tests/driver.c 2020-10-13 10:17:40.000000000 +0200
+++ starpu-1.3.7/mpi/tests/driver.c 2020-11-10 15:54:37.769536200 +0100
@@ -18,6 +18,14 @@
#include <math.h>
#include "helper.h"
+#if !defined(STARPU_HAVE_SETENV)
+#warning setenv is not defined. Skipping test
+int main(int argc, char **argv)
+{
+ return STARPU_TEST_SKIPPED;
+}
+#else
+
int main(int argc, char **argv)
{
int ret, rank, size, i;
@@ -132,3 +140,4 @@
return 0;
}
+#endif
\ No newline at end of file
diff -urN starpu-1.3.7.orig/starpufft/src/starpufft-double.h starpu-1.3.7/starpufft/src/starpufft-double.h
--- starpu-1.3.7.orig/starpufft/src/starpufft-double.h 2020-10-13 10:17:40.000000000 +0200
+++ starpu-1.3.7/starpufft/src/starpufft-double.h 2020-12-30 12:50:30.097489900 +0100
@@ -25,8 +25,8 @@
#include <cufft.h>
#endif
-#undef FLOAT
-#define DOUBLE
+#undef STARPUFFT_FLOAT
+#define STARPUFFT_DOUBLE
typedef double real;
#if defined(STARPU_HAVE_FFTW) && !defined(__CUDACC__)
diff -urN starpu-1.3.7.orig/starpufft/src/starpufft-float.h starpu-1.3.7/starpufft/src/starpufft-float.h
--- starpu-1.3.7.orig/starpufft/src/starpufft-float.h 2020-10-13 10:17:40.000000000 +0200
+++ starpu-1.3.7/starpufft/src/starpufft-float.h 2020-12-30 12:50:47.864506100 +0100
@@ -25,8 +25,8 @@
#include <cufft.h>
#endif
-#undef DOUBLE
-#define FLOAT
+#undef STARPUFFT_DOUBLE
+#define STARPUFFT_FLOAT
typedef float real;
#if defined(STARPU_HAVE_FFTW) && !defined(__CUDACC__)
diff -urN starpu-1.3.7.orig/starpufft/src/starpufftx.c starpu-1.3.7/starpufft/src/starpufftx.c
--- starpu-1.3.7.orig/starpufft/src/starpufftx.c 2020-10-13 10:17:40.000000000 +0200
+++ starpu-1.3.7/starpufft/src/starpufftx.c 2020-12-30 12:51:16.395138000 +0100
@@ -28,7 +28,7 @@
#define _externC extern
#include "cudax_kernels.h"
-#if defined(FLOAT) || defined(STARPU_HAVE_CUFFTDOUBLECOMPLEX)
+#if defined(STARPUFFT_FLOAT) || defined(STARPU_HAVE_CUFFTDOUBLECOMPLEX)
# define __STARPU_USE_CUDA
#else
# undef __STARPU_USE_CUDA
@@ -172,7 +172,7 @@
}
/* Only CUDA capability >= 1.3 supports doubles, rule old card out. */
-#ifdef DOUBLE
+#ifdef STARPUFFT_DOUBLE
static int can_execute(unsigned workerid, struct starpu_task *task STARPU_ATTRIBUTE_UNUSED, unsigned nimpl STARPU_ATTRIBUTE_UNUSED) {
if (starpu_worker_get_type(workerid) == STARPU_CPU_WORKER)
return 1;

12
mingw-w64-starpu/PKGBUILD
View File

@@ -3,8 +3,8 @@
_realname=starpu
pkgbase=mingw-w64-${_realname}
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
pkgver=1.3.7
pkgrel=3
pkgver=1.3.8
pkgrel=1
pkgdesc='StarPU is a task programming library for hybrid architectures (mingw-w64)'
arch=('any')
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64')
@@ -15,15 +15,11 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-hwloc")
options=('!docs')
license=('LGPL')
url='https://starpu.gitlabpages.inria.fr'
source=(https://files.inria.fr/starpu/${_realname}-${pkgver}/${_realname}-${pkgver}.tar.gz
0000-fix.patch)
#temporary fix: https://prod-gitlab.inria.fr/starpu/starpu/-/commit/11ade2e903c49ebddc4d4b85bc63c3ead36d844a
sha256sums=('1D7E01567FBD4A66B7E563626899374735E37883226AFB96C8952FEA1DAB77C2'
'9D4CD10013A3CAA38C71CE0A1C388D5BABB80047948FD4BC361C3A22C43BCF80')
source=(https://files.inria.fr/starpu/${_realname}-${pkgver}/${_realname}-${pkgver}.tar.gz)
sha256sums=('D35A27B219AF8E7973888EBBFF728EC0112AE9CDA88D6B79C4CC7A1399B4D052')
prepare() {
cd ${_realname}-${pkgver}
patch -p1 -i "${srcdir}/0000-fix.patch"
autoreconf -fiv
}