Mercurial > mxe-octave

annotate src/msvc-fftw-1.patch @ 5895:2db7f803d55d release

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
librsb: Update to version 1.2.0.10 (bug #60042). * src/librsb.mk: Update version and checksum. Remove work-around for fixed bug.
author Markus Mützel <markus.muetzel@gmx.de>
date Sun, 19 Sep 2021 14:32:07 +0200
parents 537ca0c3354d
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3241
537ca0c3354d Update fftw to 3.3.3
John Donoghue <john.donoghue@ieee.org>
parents: 3087
diff changeset
1 diff -ur fftw-3.3.3.orig/api/fftw3.h fftw-3.3.3/api/fftw3.h
537ca0c3354d Update fftw to 3.3.3
John Donoghue <john.donoghue@ieee.org>
parents: 3087
diff changeset
2 --- fftw-3.3.3.orig/api/fftw3.h 2013-08-30 20:48:15 -0400
537ca0c3354d Update fftw to 3.3.3
John Donoghue <john.donoghue@ieee.org>
parents: 3087
diff changeset
3 +++ fftw-3.3.3/api/fftw3.h 2013-08-30 20:48:31 -0400
3087
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
4 @@ -82,8 +82,14 @@
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
5 # else /* user is calling FFTW; import symbol */
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
6 # define FFTW_EXTERN extern __declspec(dllimport)
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
7 # endif
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
8 +# if defined(COMPILING_FFTW_THREADS)
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
9 +# define FFTW_THREADS_EXTERN extern __declspec(dllexport)
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
10 +# else
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
11 +# define FFTW_THREADS_EXTERN extern __declspec(dllimport)
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
12 +# endif
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
13 #else
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
14 # define FFTW_EXTERN extern
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
15 +# define FFTW_THREADS_EXTERN extern
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
16 #endif
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
17
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
18 enum fftw_r2r_kind_do_not_use_me {
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
19 @@ -315,9 +321,9 @@
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
20 \
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
21 FFTW_EXTERN void X(set_timelimit)(double t); \
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
22 \
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
23 -FFTW_EXTERN void X(plan_with_nthreads)(int nthreads); \
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
24 -FFTW_EXTERN int X(init_threads)(void); \
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
25 -FFTW_EXTERN void X(cleanup_threads)(void); \
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
26 +FFTW_THREADS_EXTERN void X(plan_with_nthreads)(int nthreads); \
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
27 +FFTW_THREADS_EXTERN int X(init_threads)(void); \
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
28 +FFTW_THREADS_EXTERN void X(cleanup_threads)(void); \
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
29 \
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
30 FFTW_EXTERN int X(export_wisdom_to_filename)(const char *filename); \
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
31 FFTW_EXTERN void X(export_wisdom_to_file)(FILE *output_file); \
3241
537ca0c3354d Update fftw to 3.3.3
John Donoghue <john.donoghue@ieee.org>
parents: 3087
diff changeset
32 diff -ur fftw-3.3.3.orig/dft/ct.h fftw-3.3.3/dft/ct.h
537ca0c3354d Update fftw to 3.3.3
John Donoghue <john.donoghue@ieee.org>
parents: 3087
diff changeset
33 --- fftw-3.3.3.orig/dft/ct.h 2013-08-30 20:48:15 -0400
537ca0c3354d Update fftw to 3.3.3
John Donoghue <john.donoghue@ieee.org>
parents: 3087
diff changeset
34 +++ fftw-3.3.3/dft/ct.h 2013-08-30 20:48:31 -0400
3087
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
35 @@ -56,7 +56,7 @@
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
36 ct_solver *X(mksolver_ct)(size_t size, INT r, int dec,
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
37 ct_mkinferior mkcldw,
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
38 ct_force_vrecursion force_vrecursionp);
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
39 -extern ct_solver *(*X(mksolver_ct_hook))(size_t, INT, int,
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
40 +IFFTW_EXTERN ct_solver *(*X(mksolver_ct_hook))(size_t, INT, int,
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
41 ct_mkinferior, ct_force_vrecursion);
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
42
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
43 void X(regsolver_ct_directw)(planner *plnr,
3241
537ca0c3354d Update fftw to 3.3.3
John Donoghue <john.donoghue@ieee.org>
parents: 3087
diff changeset
44 diff -ur fftw-3.3.3.orig/rdft/hc2hc.h fftw-3.3.3/rdft/hc2hc.h
537ca0c3354d Update fftw to 3.3.3
John Donoghue <john.donoghue@ieee.org>
parents: 3087
diff changeset
45 --- fftw-3.3.3.orig/rdft/hc2hc.h 2013-08-30 20:48:17 -0400
537ca0c3354d Update fftw to 3.3.3
John Donoghue <john.donoghue@ieee.org>
parents: 3087
diff changeset
46 +++ fftw-3.3.3/rdft/hc2hc.h 2013-08-30 20:48:31 -0400
3087
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
47 @@ -46,7 +46,7 @@
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
48 };
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
49
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
50 hc2hc_solver *X(mksolver_hc2hc)(size_t size, INT r, hc2hc_mkinferior mkcldw);
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
51 -extern hc2hc_solver *(*X(mksolver_hc2hc_hook))(size_t, INT, hc2hc_mkinferior);
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
52 +IFFTW_EXTERN hc2hc_solver *(*X(mksolver_hc2hc_hook))(size_t, INT, hc2hc_mkinferior);
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
53
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
54 void X(regsolver_hc2hc_direct)(planner *plnr, khc2hc codelet,
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
55 const hc2hc_desc *desc);
3241
537ca0c3354d Update fftw to 3.3.3
John Donoghue <john.donoghue@ieee.org>
parents: 3087
diff changeset
56 diff -ur fftw-3.3.3.orig/tests/Makefile.in fftw-3.3.3/tests/Makefile.in
537ca0c3354d Update fftw to 3.3.3
John Donoghue <john.donoghue@ieee.org>
parents: 3087
diff changeset
57 --- fftw-3.3.3.orig/tests/Makefile.in 2013-08-30 20:48:17 -0400
537ca0c3354d Update fftw to 3.3.3
John Donoghue <john.donoghue@ieee.org>
parents: 3087
diff changeset
58 +++ fftw-3.3.3/tests/Makefile.in 2013-08-30 20:48:31 -0400
537ca0c3354d Update fftw to 3.3.3
John Donoghue <john.donoghue@ieee.org>
parents: 3087
diff changeset
59 @@ -82,7 +82,7 @@
3087
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
60 $(top_builddir)/libbench2/libbench2.a $(am__DEPENDENCIES_1)
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
61 bench_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
62 --mode=link $(CCLD) $(bench_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
63 - $(LDFLAGS) -o $@
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
64 + $(LDFLAGS) -Wl,-subsystem:console -o $@
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
65 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
66 depcomp = $(SHELL) $(top_srcdir)/depcomp
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
67 am__depfiles_maybe = depfiles
3241
537ca0c3354d Update fftw to 3.3.3
John Donoghue <john.donoghue@ieee.org>
parents: 3087
diff changeset
68 @@ -251,7 +251,7 @@
3087
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
69 top_srcdir = @top_srcdir@
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
70 AM_CPPFLAGS = -I$(top_srcdir)/kernel -I$(top_srcdir)/libbench2 \
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
71 -I$(top_srcdir)/dft -I$(top_srcdir)/rdft -I$(top_srcdir)/reodft \
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
72 --I$(top_srcdir)/threads -I$(top_srcdir)/api
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
73 +-I$(top_srcdir)/threads -I$(top_srcdir)/api -DFFTW_DLL
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
74
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
75 EXTRA_DIST = check.pl README
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
76 @OPENMP_TRUE@@THREADS_FALSE@bench_CFLAGS = $(OPENMP_CFLAGS)
3241
537ca0c3354d Update fftw to 3.3.3
John Donoghue <john.donoghue@ieee.org>
parents: 3087
diff changeset
77 diff -ur fftw-3.3.3.orig/threads/Makefile.in fftw-3.3.3/threads/Makefile.in
537ca0c3354d Update fftw to 3.3.3
John Donoghue <john.donoghue@ieee.org>
parents: 3087
diff changeset
78 --- fftw-3.3.3.orig/threads/Makefile.in 2013-08-30 20:48:17 -0400
537ca0c3354d Update fftw to 3.3.3
John Donoghue <john.donoghue@ieee.org>
parents: 3087
diff changeset
79 +++ fftw-3.3.3/threads/Makefile.in 2013-08-30 20:48:31 -0400
537ca0c3354d Update fftw to 3.3.3
John Donoghue <john.donoghue@ieee.org>
parents: 3087
diff changeset
80 @@ -313,7 +313,8 @@
3087
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
81 top_builddir = @top_builddir@
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
82 top_srcdir = @top_srcdir@
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
83 AM_CPPFLAGS = -I$(top_srcdir)/kernel -I$(top_srcdir)/dft \
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
84 --I$(top_srcdir)/rdft -I$(top_srcdir)/api
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
85 +-I$(top_srcdir)/rdft -I$(top_srcdir)/api \
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
86 +-DCALLING_FFTW -DCOMPILING_FFTW_THREADS
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
87
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
88 AM_CFLAGS = $(STACK_ALIGN_CFLAGS)
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
89 @OPENMP_FALSE@FFTWOMPLIB =
3241
537ca0c3354d Update fftw to 3.3.3
John Donoghue <john.donoghue@ieee.org>
parents: 3087
diff changeset
90 @@ -329,7 +330,7 @@
3087
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
91 vrank-geq1-rdft2.c f77api.c f77funcs.h
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
92
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
93 libfftw3@PREC_SUFFIX@_threads_la_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS)
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
94 -libfftw3@PREC_SUFFIX@_threads_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
95 +libfftw3@PREC_SUFFIX@_threads_la_LDFLAGS = -no-undefined -version-info @SHARED_VERSION_INFO@
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
96 @COMBINED_THREADS_FALSE@libfftw3@PREC_SUFFIX@_threads_la_LIBADD = ../libfftw3@PREC_SUFFIX@.la
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
97 libfftw3@PREC_SUFFIX@_omp_la_SOURCES = api.c conf.c openmp.c \
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
98 threads.h dft-vrank-geq1.c ct.c rdft-vrank-geq1.c hc2hc.c \
3241
537ca0c3354d Update fftw to 3.3.3
John Donoghue <john.donoghue@ieee.org>
parents: 3087
diff changeset
99 diff -ur fftw-3.3.3.orig/tools/Makefile.in fftw-3.3.3/tools/Makefile.in
537ca0c3354d Update fftw to 3.3.3
John Donoghue <john.donoghue@ieee.org>
parents: 3087
diff changeset
100 --- fftw-3.3.3.orig/tools/Makefile.in 2013-08-30 20:48:17 -0400
537ca0c3354d Update fftw to 3.3.3
John Donoghue <john.donoghue@ieee.org>
parents: 3087
diff changeset
101 +++ fftw-3.3.3/tools/Makefile.in 2013-08-30 20:48:31 -0400
537ca0c3354d Update fftw to 3.3.3
John Donoghue <john.donoghue@ieee.org>
parents: 3087
diff changeset
102 @@ -91,7 +91,7 @@
3087
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
103 fftw@PREC_SUFFIX@_wisdom_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
104 $(LIBTOOLFLAGS) --mode=link $(CCLD) \
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
105 $(fftw@PREC_SUFFIX@_wisdom_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
106 - $(LDFLAGS) -o $@
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
107 + $(LDFLAGS) -Wl,-subsystem:console -o $@
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
108 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
109 am__vpath_adj = case $$p in \
3663f6300abf [MSVC] enable FFTW compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
110 $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \