From f7e327bd72bd56230a1821fc085d0286ea4b9ada13e4ca5393ce7c20494bacb1 Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Tue, 29 Nov 2011 17:39:19 +0000 Subject: [PATCH 1/5] OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/fftw3?expand=0&rev=22 --- fftw3.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/fftw3.spec b/fftw3.spec index b050bba..30b6995 100644 --- a/fftw3.spec +++ b/fftw3.spec @@ -128,6 +128,7 @@ data, and of arbitrary input size. Summary: Discrete Fourier Transform (DFT) C subroutine library Group: Development/Libraries/C and C++ Requires: fftw3-devel = %{version} +Requires: libfftw3_mpi3 Requires: glibc-devel Requires: libfftw3_mpi3 = %{version} Requires: openmpi-devel From 479fa475366520a1bbfc35b4e122a61c58073b6544c3668d9c7012432bda5ab0 Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Thu, 1 Dec 2011 12:01:20 +0000 Subject: [PATCH 2/5] OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/fftw3?expand=0&rev=23 --- fftw3.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fftw3.spec b/fftw3.spec index 30b6995..d932ae8 100644 --- a/fftw3.spec +++ b/fftw3.spec @@ -43,7 +43,7 @@ data, and of arbitrary input size. %package devel Summary: Include Files and Libraries mandatory for Development Group: Development/Libraries/C and C++ -Requires: fftw3 = %{version} +Requires: libfftw3-3 = %{version} Requires: glibc-devel Provides: fftw-devel From cd8db07f07d32375c7c924f432be3832391be3fb92e38f8be6a4f72c2ee302c8 Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Thu, 1 Dec 2011 12:17:32 +0000 Subject: [PATCH 3/5] OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/fftw3?expand=0&rev=24 --- fftw3.spec | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/fftw3.spec b/fftw3.spec index d932ae8..8ac4124 100644 --- a/fftw3.spec +++ b/fftw3.spec @@ -26,11 +26,11 @@ BuildRequires: openmpi-devel %endif Version: 3.3 Release: 0 -License: GPLv2+ +License: GPL-2.0+ Summary: Discrete Fourier Transform (DFT) C Subroutine Library Url: http://www.fftw.org Group: Productivity/Scientific/Math -Source: http://www.fftw.org/fftw-3.3.tar.gz +Source: http://www.fftw.org/fftw-%{version}.tar.gz Source1: %{name}-rpmlintrc BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires(pre): %install_info_prereq @@ -43,7 +43,7 @@ data, and of arbitrary input size. %package devel Summary: Include Files and Libraries mandatory for Development Group: Development/Libraries/C and C++ -Requires: libfftw3-3 = %{version} +Requires: libfftw3-3 = %{version}-%{release} Requires: glibc-devel Provides: fftw-devel @@ -56,7 +56,7 @@ Summary: Discrete Fourier Transform (DFT) C Subroutine Library Group: System/Libraries # Remove Prov/Obs when appropriate; were added 2011-Nov-21 (post-openSUSE-12.1) Provides: fftw3 = %{version}-%{release} -Obsoletes: fftw3 < %{version}-%{release} +Obsoletes: fftw3 < 3.3 %description -n libfftw3-3 FFTW is a C subroutine library for computing the Discrete Fourier @@ -68,7 +68,7 @@ Summary: Discrete Fourier Transform (DFT) C subroutine library Group: Productivity/Scientific/Math # libfftw3_threads.so does not have a DT_NEEDED entry for fftw symbols, since it # may be used with either libfftw3.so or libfftw3f.so. Hence, manual Requires. -Requires: libfftw3-3 = %{version} +#Requires: libfftw3-3 = %%{version} %description -n libfftw3_threads3 FFTW is a C subroutine library for computing the Discrete Fourier @@ -78,9 +78,9 @@ data, and of arbitrary input size. %package threads-devel Summary: Discrete Fourier Transform (DFT) C subroutine library Group: Development/Libraries/C and C++ -Requires: fftw3-devel = %{version} +Requires: fftw3-devel = %{version}-%{release} Requires: glibc-devel -Requires: libfftw3_threads3 = %{version} +Requires: libfftw3_threads3 = %{version}-%{release} %description threads-devel FFTW is a C subroutine library for computing the Discrete Fourier @@ -91,7 +91,7 @@ data, and of arbitrary input size. Summary: Discrete Fourier Transform (DFT) C subroutine library Group: Productivity/Scientific/Math # Same as libfftw3_threads.so: manual Requires for fftw3 main lib -Requires: libfftw3-3 = %{version} +#Requires: libfftw3-3 = %%{version} %description -n libfftw3_omp3 FFTW is a C subroutine library for computing the Discrete Fourier @@ -101,9 +101,9 @@ data, and of arbitrary input size. %package openmp-devel Summary: Discrete Fourier Transform (DFT) C subroutine library Group: Development/Libraries/C and C++ -Requires: fftw3-devel = %{version} +Requires: fftw3-devel = %{version}-%{release} Requires: glibc-devel -Requires: libfftw3_omp3 = %{version} +Requires: libfftw3_omp3 = %{version}-%{release} %description openmp-devel FFTW is a C subroutine library for computing the Discrete Fourier @@ -116,8 +116,8 @@ data, and of arbitrary input size. Summary: Discrete Fourier Transform (DFT) C subroutine library Group: Productivity/Scientific/Math # Same as libfftw3_threads.so: manual Requires for fftw3 main lib -Requires: libfftw3-3 = %{version} -Requires: openmpi +#Requires: libfftw3-3 = %%{version} +#Requires: openmpi %description -n libfftw3_mpi3 FFTW is a C subroutine library for computing the Discrete Fourier @@ -128,9 +128,8 @@ data, and of arbitrary input size. Summary: Discrete Fourier Transform (DFT) C subroutine library Group: Development/Libraries/C and C++ Requires: fftw3-devel = %{version} -Requires: libfftw3_mpi3 Requires: glibc-devel -Requires: libfftw3_mpi3 = %{version} +Requires: libfftw3_mpi3 = %{version}-%{release} Requires: openmpi-devel %description mpi-devel From 99ec1266eb2a5d234c005dd7416f2ad7db911e3e1a050b1c72f8d83f7784ac56 Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Thu, 1 Dec 2011 12:50:14 +0000 Subject: [PATCH 4/5] OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/fftw3?expand=0&rev=25 --- fftw3.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/fftw3.spec b/fftw3.spec index 8ac4124..79e52d7 100644 --- a/fftw3.spec +++ b/fftw3.spec @@ -66,6 +66,8 @@ data, and of arbitrary input size. %package -n libfftw3_threads3 Summary: Discrete Fourier Transform (DFT) C subroutine library Group: Productivity/Scientific/Math +Provides: fftw3-threads = %{version}-%{release} +Obsoletes: fftw3-threads < 3.3 # libfftw3_threads.so does not have a DT_NEEDED entry for fftw symbols, since it # may be used with either libfftw3.so or libfftw3f.so. Hence, manual Requires. #Requires: libfftw3-3 = %%{version} @@ -90,6 +92,8 @@ data, and of arbitrary input size. %package -n libfftw3_omp3 Summary: Discrete Fourier Transform (DFT) C subroutine library Group: Productivity/Scientific/Math +Provides: fftw3-openmp = %{version}-%{release} +Obsoletes: fftw3-openmp < 3.3 # Same as libfftw3_threads.so: manual Requires for fftw3 main lib #Requires: libfftw3-3 = %%{version} @@ -115,6 +119,8 @@ data, and of arbitrary input size. %package -n libfftw3_mpi3 Summary: Discrete Fourier Transform (DFT) C subroutine library Group: Productivity/Scientific/Math +Provides: fftw3-mpi = %{version}-%{release} +Obsoletes: fftw3-mpi < 3.3 # Same as libfftw3_threads.so: manual Requires for fftw3 main lib #Requires: libfftw3-3 = %%{version} #Requires: openmpi @@ -140,8 +146,6 @@ data, and of arbitrary input size. %prep %setup -q -n fftw-%{version} -# %patch -# autoreconf --force --install %build %configure --enable-shared --enable-threads --enable-openmp \ @@ -177,7 +181,7 @@ make %{?_smp_mflags} # remove unneeded files rm -f %{buildroot}%{_libdir}/lib*.*a -# gzip -9nf %{buildroot}%{_infodir}/*.info* +# gzip -9nf %%{buildroot}%%{_infodir}/*.info* rm -f %{buildroot}%{_infodir}/dir # remove Makefiles in doc directory at last From ebf7a8a0d77dbe3f2502eb02d8171dd7bb38dc9e00cf921660eb612166145aad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Wed, 7 Mar 2012 13:57:08 +0000 Subject: [PATCH 5/5] Accepting request 108376 from home:cowsandmilk:branches:multimedia:libs update to fftw 3.3.1 OBS-URL: https://build.opensuse.org/request/show/108376 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/fftw3?expand=0&rev=28 --- 1_man_macro.patch | 22 ++++++++++++++++++++++ fftw-3.3.1.tar.gz | 3 +++ fftw-3.3.tar.gz | 3 --- fftw3.changes | 30 ++++++++++++++++++++++++++++++ fftw3.spec | 25 ++++++++++++++++++------- 5 files changed, 73 insertions(+), 10 deletions(-) create mode 100644 1_man_macro.patch create mode 100644 fftw-3.3.1.tar.gz delete mode 100644 fftw-3.3.tar.gz diff --git a/1_man_macro.patch b/1_man_macro.patch new file mode 100644 index 0000000..aec85f1 --- /dev/null +++ b/1_man_macro.patch @@ -0,0 +1,22 @@ +--- tools/fftw_wisdom.1.in.orig 2012-03-06 05:13:17.206776451 -0500 ++++ tools/fftw_wisdom.1.in 2012-03-06 05:13:36.249716254 -0500 +@@ -24,7 +24,7 @@ + [\fIOPTION\fR]... [\fISIZE\fR]... + .SH DESCRIPTION + .PP +-." Add any additional description here ++.\" Add any additional description here + .I fftw@PREC_SUFFIX@-wisdom + is a utility to generate FFTW + .B wisdom +--- tools/fftw-wisdom-to-conf.1.orig 2012-03-06 05:15:51.265301506 -0500 ++++ tools/fftw-wisdom-to-conf.1 2012-03-06 05:16:03.991269669 -0500 +@@ -23,7 +23,7 @@ + \fBfftw-wisdom-to-conf\fR [< \fIINPUT\fR] [> \fIOUTPUT\fR] + .SH DESCRIPTION + .PP +-." Add any additional description here ++.\" Add any additional description here + .I fftw-wisdom-to-conf + is a utility to generate C + .B configuration diff --git a/fftw-3.3.1.tar.gz b/fftw-3.3.1.tar.gz new file mode 100644 index 0000000..871d274 --- /dev/null +++ b/fftw-3.3.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c77fc5cda6ce868857aa565cb9b0df0d7a4fcf388ce5c6d482acd80e2452b739 +size 4039988 diff --git a/fftw-3.3.tar.gz b/fftw-3.3.tar.gz deleted file mode 100644 index 94a88a5..0000000 --- a/fftw-3.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d25a98521a13933e678ce19319d03ddc915826764e1e59abd12d172c239b6aea -size 3965713 diff --git a/fftw3.changes b/fftw3.changes index ced7718..76631f7 100644 --- a/fftw3.changes +++ b/fftw3.changes @@ -1,3 +1,33 @@ +------------------------------------------------------------------- +Tue Mar 6 14:16:22 UTC 2012 - dhall@wustl.edu + +- delete INSTALL file + +------------------------------------------------------------------- +Tue Mar 6 10:35:15 UTC 2012 - dhall@wustl.edu + +- patch macros in man files + +------------------------------------------------------------------- +Tue Mar 6 00:32:24 UTC 2012 - dhall@wustl.edu + +- add use of neon extensions on ARM + +------------------------------------------------------------------- +Tue Mar 6 00:12:32 UTC 2012 - dhall@wustl.edu + +- updated to version 3.3.1 + * Reduced planning time in estimate mode for sizes with large prime factors. + * Added AVX autodetection under Visual Studio. Thanks Carsten Steger for submitting + the necessary code. + * Modern Fortran interface now uses a separate fftw3l.f03 interface file for the + long double interface, which is not supported by some Fortran compilers. Provided + new fftw3q.f03 interface file to access the quadruple-precision FFTW routines + with recent versions of gcc/gfortran. + * Added support for the NEON extensions to the ARM ISA. + * MPI code now compiles even if mpicc is a C++ compiler; thanks to Kyle Spyksma for + the bug report. + ------------------------------------------------------------------- Mon Nov 28 13:33:44 UTC 2011 - idoenmez@suse.de diff --git a/fftw3.spec b/fftw3.spec index 79e52d7..b99a2fc 100644 --- a/fftw3.spec +++ b/fftw3.spec @@ -1,7 +1,7 @@ # # spec file for package fftw3 # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,10 +21,10 @@ Name: fftw3 BuildRequires: fdupes BuildRequires: gcc-fortran BuildRequires: pkgconfig -%ifnarch s390 s390x +%ifnarch s390 s390x %arm BuildRequires: openmpi-devel %endif -Version: 3.3 +Version: 3.3.1 Release: 0 License: GPL-2.0+ Summary: Discrete Fourier Transform (DFT) C Subroutine Library @@ -32,6 +32,7 @@ Url: http://www.fftw.org Group: Productivity/Scientific/Math Source: http://www.fftw.org/fftw-%{version}.tar.gz Source1: %{name}-rpmlintrc +Patch0: 1_man_macro.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires(pre): %install_info_prereq @@ -114,7 +115,7 @@ FFTW is a C subroutine library for computing the Discrete Fourier Transform (DFT) in one or more dimensions, of both real and complex data, and of arbitrary input size. -%ifnarch s390 s390x +%ifnarch s390 s390x %arm %package -n libfftw3_mpi3 Summary: Discrete Fourier Transform (DFT) C subroutine library @@ -146,14 +147,18 @@ data, and of arbitrary input size. %prep %setup -q -n fftw-%{version} +%patch0 %build %configure --enable-shared --enable-threads --enable-openmp \ -%ifnarch s390 s390x +%ifnarch s390 s390x %arm --enable-mpi \ %endif %ifarch %ix86 x86_64 --enable-sse2 \ +%endif +%ifarch %arm + --enable-neon \ %endif --disable-static make %{?_smp_mflags} @@ -167,11 +172,14 @@ rm -f %{buildroot}%{_libdir}/lib*.*a # hack to also compile/install single-precision version: make distclean %configure --enable-shared --enable-threads --enable-float --enable-openmp \ -%ifnarch s390 s390x +%ifnarch s390 s390x %arm --enable-mpi \ %endif %ifarch %ix86 x86_64 --enable-sse \ +%endif +%ifarch %arm + --enable-neon \ %endif --disable-static @@ -221,11 +229,13 @@ find doc -name 'Makefile*' | xargs rm %files devel %defattr(-,root,root) -%doc AUTHORS CONVENTIONS COPYING COPYRIGHT ChangeLog INSTALL NEWS README TODO +%doc AUTHORS CONVENTIONS COPYING COPYRIGHT ChangeLog NEWS README TODO %doc doc/* %doc %{_mandir}/man?/* %{_infodir}/*.info* %{_includedir}/fftw3.* +%{_includedir}/fftw3q.f03 +%{_includedir}/fftw3l.f03 %{_libdir}/libfftw3.so %{_libdir}/libfftw3f.so %{_libdir}/pkgconfig/*.pc @@ -263,6 +273,7 @@ find doc -name 'Makefile*' | xargs rm %{_libdir}/libfftw3_mpi.so %{_libdir}/libfftw3f_mpi.so %{_includedir}/fftw3-mpi.* +%{_includedir}/fftw3l-mpi.f03 %endif %changelog