fftw3.f | fftw3.f | |||
---|---|---|---|---|
skipping to change at line 43 | skipping to change at line 43 | |||
INTEGER FFTW_CONSERVE_MEMORY | INTEGER FFTW_CONSERVE_MEMORY | |||
PARAMETER (FFTW_CONSERVE_MEMORY=4) | PARAMETER (FFTW_CONSERVE_MEMORY=4) | |||
INTEGER FFTW_EXHAUSTIVE | INTEGER FFTW_EXHAUSTIVE | |||
PARAMETER (FFTW_EXHAUSTIVE=8) | PARAMETER (FFTW_EXHAUSTIVE=8) | |||
INTEGER FFTW_PRESERVE_INPUT | INTEGER FFTW_PRESERVE_INPUT | |||
PARAMETER (FFTW_PRESERVE_INPUT=16) | PARAMETER (FFTW_PRESERVE_INPUT=16) | |||
INTEGER FFTW_PATIENT | INTEGER FFTW_PATIENT | |||
PARAMETER (FFTW_PATIENT=32) | PARAMETER (FFTW_PATIENT=32) | |||
INTEGER FFTW_ESTIMATE | INTEGER FFTW_ESTIMATE | |||
PARAMETER (FFTW_ESTIMATE=64) | PARAMETER (FFTW_ESTIMATE=64) | |||
INTEGER FFTW_WISDOM_ONLY | ||||
PARAMETER (FFTW_WISDOM_ONLY=2097152) | ||||
INTEGER FFTW_ESTIMATE_PATIENT | INTEGER FFTW_ESTIMATE_PATIENT | |||
PARAMETER (FFTW_ESTIMATE_PATIENT=128) | PARAMETER (FFTW_ESTIMATE_PATIENT=128) | |||
INTEGER FFTW_BELIEVE_PCOST | INTEGER FFTW_BELIEVE_PCOST | |||
PARAMETER (FFTW_BELIEVE_PCOST=256) | PARAMETER (FFTW_BELIEVE_PCOST=256) | |||
INTEGER FFTW_NO_DFT_R2HC | INTEGER FFTW_NO_DFT_R2HC | |||
PARAMETER (FFTW_NO_DFT_R2HC=512) | PARAMETER (FFTW_NO_DFT_R2HC=512) | |||
INTEGER FFTW_NO_NONTHREADED | INTEGER FFTW_NO_NONTHREADED | |||
PARAMETER (FFTW_NO_NONTHREADED=1024) | PARAMETER (FFTW_NO_NONTHREADED=1024) | |||
INTEGER FFTW_NO_BUFFERING | INTEGER FFTW_NO_BUFFERING | |||
PARAMETER (FFTW_NO_BUFFERING=2048) | PARAMETER (FFTW_NO_BUFFERING=2048) | |||
skipping to change at line 71 | skipping to change at line 73 | |||
INTEGER FFTW_NO_VRECURSE | INTEGER FFTW_NO_VRECURSE | |||
PARAMETER (FFTW_NO_VRECURSE=65536) | PARAMETER (FFTW_NO_VRECURSE=65536) | |||
INTEGER FFTW_NO_SIMD | INTEGER FFTW_NO_SIMD | |||
PARAMETER (FFTW_NO_SIMD=131072) | PARAMETER (FFTW_NO_SIMD=131072) | |||
INTEGER FFTW_NO_SLOW | INTEGER FFTW_NO_SLOW | |||
PARAMETER (FFTW_NO_SLOW=262144) | PARAMETER (FFTW_NO_SLOW=262144) | |||
INTEGER FFTW_NO_FIXED_RADIX_LARGE_N | INTEGER FFTW_NO_FIXED_RADIX_LARGE_N | |||
PARAMETER (FFTW_NO_FIXED_RADIX_LARGE_N=524288) | PARAMETER (FFTW_NO_FIXED_RADIX_LARGE_N=524288) | |||
INTEGER FFTW_ALLOW_PRUNING | INTEGER FFTW_ALLOW_PRUNING | |||
PARAMETER (FFTW_ALLOW_PRUNING=1048576) | PARAMETER (FFTW_ALLOW_PRUNING=1048576) | |||
INTEGER FFTW_WISDOM_ONLY | ||||
PARAMETER (FFTW_WISDOM_ONLY=2097152) | ||||
End of changes. 2 change blocks. | ||||
0 lines changed or deleted | 2 lines changed or added | |||
fftw3.f03 | fftw3.f03 | |||
---|---|---|---|---|
skipping to change at line 26 | skipping to change at line 26 | |||
integer(C_INT), parameter :: FFTW_FORWARD = -1 | integer(C_INT), parameter :: FFTW_FORWARD = -1 | |||
integer(C_INT), parameter :: FFTW_BACKWARD = +1 | integer(C_INT), parameter :: FFTW_BACKWARD = +1 | |||
integer(C_INT), parameter :: FFTW_MEASURE = 0 | integer(C_INT), parameter :: FFTW_MEASURE = 0 | |||
integer(C_INT), parameter :: FFTW_DESTROY_INPUT = 1 | integer(C_INT), parameter :: FFTW_DESTROY_INPUT = 1 | |||
integer(C_INT), parameter :: FFTW_UNALIGNED = 2 | integer(C_INT), parameter :: FFTW_UNALIGNED = 2 | |||
integer(C_INT), parameter :: FFTW_CONSERVE_MEMORY = 4 | integer(C_INT), parameter :: FFTW_CONSERVE_MEMORY = 4 | |||
integer(C_INT), parameter :: FFTW_EXHAUSTIVE = 8 | integer(C_INT), parameter :: FFTW_EXHAUSTIVE = 8 | |||
integer(C_INT), parameter :: FFTW_PRESERVE_INPUT = 16 | integer(C_INT), parameter :: FFTW_PRESERVE_INPUT = 16 | |||
integer(C_INT), parameter :: FFTW_PATIENT = 32 | integer(C_INT), parameter :: FFTW_PATIENT = 32 | |||
integer(C_INT), parameter :: FFTW_ESTIMATE = 64 | integer(C_INT), parameter :: FFTW_ESTIMATE = 64 | |||
integer(C_INT), parameter :: FFTW_WISDOM_ONLY = 2097152 | ||||
integer(C_INT), parameter :: FFTW_ESTIMATE_PATIENT = 128 | integer(C_INT), parameter :: FFTW_ESTIMATE_PATIENT = 128 | |||
integer(C_INT), parameter :: FFTW_BELIEVE_PCOST = 256 | integer(C_INT), parameter :: FFTW_BELIEVE_PCOST = 256 | |||
integer(C_INT), parameter :: FFTW_NO_DFT_R2HC = 512 | integer(C_INT), parameter :: FFTW_NO_DFT_R2HC = 512 | |||
integer(C_INT), parameter :: FFTW_NO_NONTHREADED = 1024 | integer(C_INT), parameter :: FFTW_NO_NONTHREADED = 1024 | |||
integer(C_INT), parameter :: FFTW_NO_BUFFERING = 2048 | integer(C_INT), parameter :: FFTW_NO_BUFFERING = 2048 | |||
integer(C_INT), parameter :: FFTW_NO_INDIRECT_OP = 4096 | integer(C_INT), parameter :: FFTW_NO_INDIRECT_OP = 4096 | |||
integer(C_INT), parameter :: FFTW_ALLOW_LARGE_GENERIC = 8192 | integer(C_INT), parameter :: FFTW_ALLOW_LARGE_GENERIC = 8192 | |||
integer(C_INT), parameter :: FFTW_NO_RANK_SPLITS = 16384 | integer(C_INT), parameter :: FFTW_NO_RANK_SPLITS = 16384 | |||
integer(C_INT), parameter :: FFTW_NO_VRANK_SPLITS = 32768 | integer(C_INT), parameter :: FFTW_NO_VRANK_SPLITS = 32768 | |||
integer(C_INT), parameter :: FFTW_NO_VRECURSE = 65536 | integer(C_INT), parameter :: FFTW_NO_VRECURSE = 65536 | |||
integer(C_INT), parameter :: FFTW_NO_SIMD = 131072 | integer(C_INT), parameter :: FFTW_NO_SIMD = 131072 | |||
integer(C_INT), parameter :: FFTW_NO_SLOW = 262144 | integer(C_INT), parameter :: FFTW_NO_SLOW = 262144 | |||
integer(C_INT), parameter :: FFTW_NO_FIXED_RADIX_LARGE_N = 524288 | integer(C_INT), parameter :: FFTW_NO_FIXED_RADIX_LARGE_N = 524288 | |||
integer(C_INT), parameter :: FFTW_ALLOW_PRUNING = 1048576 | integer(C_INT), parameter :: FFTW_ALLOW_PRUNING = 1048576 | |||
integer(C_INT), parameter :: FFTW_WISDOM_ONLY = 2097152 | ||||
type, bind(C) :: fftw_iodim | type, bind(C) :: fftw_iodim | |||
integer(C_INT) n, is, os | integer(C_INT) n, is, os | |||
end type fftw_iodim | end type fftw_iodim | |||
type, bind(C) :: fftw_iodim64 | type, bind(C) :: fftw_iodim64 | |||
integer(C_INTPTR_T) n, is, os | integer(C_INTPTR_T) n, is, os | |||
end type fftw_iodim64 | end type fftw_iodim64 | |||
interface | interface | |||
type(C_PTR) function fftw_plan_dft(rank,n,in,out,sign,flags) bind(C, na me='fftw_plan_dft') | type(C_PTR) function fftw_plan_dft(rank,n,in,out,sign,flags) bind(C, na me='fftw_plan_dft') | |||
End of changes. 2 change blocks. | ||||
1 lines changed or deleted | 1 lines changed or added | |||
fftw3.h | fftw3.h | |||
---|---|---|---|---|
skipping to change at line 359 | skipping to change at line 359 | |||
/* end of FFTW_DEFINE_API macro */ | /* end of FFTW_DEFINE_API macro */ | |||
FFTW_DEFINE_API(FFTW_MANGLE_DOUBLE, double, fftw_complex) | FFTW_DEFINE_API(FFTW_MANGLE_DOUBLE, double, fftw_complex) | |||
FFTW_DEFINE_API(FFTW_MANGLE_FLOAT, float, fftwf_complex) | FFTW_DEFINE_API(FFTW_MANGLE_FLOAT, float, fftwf_complex) | |||
FFTW_DEFINE_API(FFTW_MANGLE_LONG_DOUBLE, long double, fftwl_complex) | FFTW_DEFINE_API(FFTW_MANGLE_LONG_DOUBLE, long double, fftwl_complex) | |||
/* __float128 (quad precision) is a gcc extension on i386, x86_64, and ia64 | /* __float128 (quad precision) is a gcc extension on i386, x86_64, and ia64 | |||
for gcc >= 4.6 (compiled in FFTW with --enable-quad-precision) */ | for gcc >= 4.6 (compiled in FFTW with --enable-quad-precision) */ | |||
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) \ | #if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) \ | |||
&& !(defined(__ICC) || defined(__INTEL_COMPILER)) \ | ||||
&& (defined(__i386__) || defined(__x86_64__) || defined(__ia64__)) | && (defined(__i386__) || defined(__x86_64__) || defined(__ia64__)) | |||
# if !defined(FFTW_NO_Complex) && defined(_Complex_I) && defined(complex) && defined(I) | # if !defined(FFTW_NO_Complex) && defined(_Complex_I) && defined(complex) && defined(I) | |||
/* note: __float128 is a typedef, which is not supported with the _Complex | /* note: __float128 is a typedef, which is not supported with the _Complex | |||
keyword in gcc, so instead we use this ugly __attribute__ version. | keyword in gcc, so instead we use this ugly __attribute__ version. | |||
However, we can't simply pass the __attribute__ version to | However, we can't simply pass the __attribute__ version to | |||
FFTW_DEFINE_API because the __attribute__ confuses gcc in pointer | FFTW_DEFINE_API because the __attribute__ confuses gcc in pointer | |||
types. Hence redefining FFTW_DEFINE_COMPLEX. Ugh. */ | types. Hence redefining FFTW_DEFINE_COMPLEX. Ugh. */ | |||
# undef FFTW_DEFINE_COMPLEX | # undef FFTW_DEFINE_COMPLEX | |||
# define FFTW_DEFINE_COMPLEX(R, C) typedef _Complex float __attribute__( (mode(TC))) C | # define FFTW_DEFINE_COMPLEX(R, C) typedef _Complex float __attribute__( (mode(TC))) C | |||
# endif | # endif | |||
skipping to change at line 386 | skipping to change at line 387 | |||
/* documented flags */ | /* documented flags */ | |||
#define FFTW_MEASURE (0U) | #define FFTW_MEASURE (0U) | |||
#define FFTW_DESTROY_INPUT (1U << 0) | #define FFTW_DESTROY_INPUT (1U << 0) | |||
#define FFTW_UNALIGNED (1U << 1) | #define FFTW_UNALIGNED (1U << 1) | |||
#define FFTW_CONSERVE_MEMORY (1U << 2) | #define FFTW_CONSERVE_MEMORY (1U << 2) | |||
#define FFTW_EXHAUSTIVE (1U << 3) /* NO_EXHAUSTIVE is default */ | #define FFTW_EXHAUSTIVE (1U << 3) /* NO_EXHAUSTIVE is default */ | |||
#define FFTW_PRESERVE_INPUT (1U << 4) /* cancels FFTW_DESTROY_INPUT */ | #define FFTW_PRESERVE_INPUT (1U << 4) /* cancels FFTW_DESTROY_INPUT */ | |||
#define FFTW_PATIENT (1U << 5) /* IMPATIENT is default */ | #define FFTW_PATIENT (1U << 5) /* IMPATIENT is default */ | |||
#define FFTW_ESTIMATE (1U << 6) | #define FFTW_ESTIMATE (1U << 6) | |||
#define FFTW_WISDOM_ONLY (1U << 21) | ||||
/* undocumented beyond-guru flags */ | /* undocumented beyond-guru flags */ | |||
#define FFTW_ESTIMATE_PATIENT (1U << 7) | #define FFTW_ESTIMATE_PATIENT (1U << 7) | |||
#define FFTW_BELIEVE_PCOST (1U << 8) | #define FFTW_BELIEVE_PCOST (1U << 8) | |||
#define FFTW_NO_DFT_R2HC (1U << 9) | #define FFTW_NO_DFT_R2HC (1U << 9) | |||
#define FFTW_NO_NONTHREADED (1U << 10) | #define FFTW_NO_NONTHREADED (1U << 10) | |||
#define FFTW_NO_BUFFERING (1U << 11) | #define FFTW_NO_BUFFERING (1U << 11) | |||
#define FFTW_NO_INDIRECT_OP (1U << 12) | #define FFTW_NO_INDIRECT_OP (1U << 12) | |||
#define FFTW_ALLOW_LARGE_GENERIC (1U << 13) /* NO_LARGE_GENERIC is default */ | #define FFTW_ALLOW_LARGE_GENERIC (1U << 13) /* NO_LARGE_GENERIC is default */ | |||
#define FFTW_NO_RANK_SPLITS (1U << 14) | #define FFTW_NO_RANK_SPLITS (1U << 14) | |||
#define FFTW_NO_VRANK_SPLITS (1U << 15) | #define FFTW_NO_VRANK_SPLITS (1U << 15) | |||
#define FFTW_NO_VRECURSE (1U << 16) | #define FFTW_NO_VRECURSE (1U << 16) | |||
#define FFTW_NO_SIMD (1U << 17) | #define FFTW_NO_SIMD (1U << 17) | |||
#define FFTW_NO_SLOW (1U << 18) | #define FFTW_NO_SLOW (1U << 18) | |||
#define FFTW_NO_FIXED_RADIX_LARGE_N (1U << 19) | #define FFTW_NO_FIXED_RADIX_LARGE_N (1U << 19) | |||
#define FFTW_ALLOW_PRUNING (1U << 20) | #define FFTW_ALLOW_PRUNING (1U << 20) | |||
#define FFTW_WISDOM_ONLY (1U << 21) | ||||
#ifdef __cplusplus | #ifdef __cplusplus | |||
} /* extern "C" */ | } /* extern "C" */ | |||
#endif /* __cplusplus */ | #endif /* __cplusplus */ | |||
#endif /* FFTW3_H */ | #endif /* FFTW3_H */ | |||
End of changes. 3 change blocks. | ||||
1 lines changed or deleted | 2 lines changed or added | |||