Adding some features in fftw, that I think they should work fine in linux at least.

(higher speed, multithread).
I also fixed the namings about single/double floats.

svn path=/nixpkgs/trunk/; revision=22402
This commit is contained in:
Lluís Batlle i Rossell 2010-06-24 16:43:42 +00:00
parent ba1f6982fd
commit b9e7a56c77

View file

@ -1,23 +1,31 @@
args : with args; {fetchurl, stdenv, builderDefs, stringsWithDeps, singlePrecision ? false}:
let localDefs = builderDefs.passthru.function { let localDefs = builderDefs.passthru.function {
src = src =
fetchurl { fetchurl {
url = ftp://ftp.fftw.org/pub/fftw/fftw-3.2.1.tar.gz; url = ftp://ftp.fftw.org/pub/fftw/fftw-3.2.2.tar.gz;
sha256 = "1x8jww3vflrgzjrpnnsk0020bkd9aqmfga8y31v10cqd02l46sh7"; sha256 = "13vnglardq413q2518zi4a8pam3znydrz28m9w09kss9xrjsx9va";
}; };
buildInputs = []; buildInputs = [];
configureFlags = ["--enable-shared"] configureFlags = ["--enable-shared" "--enable-openmp"]
++ (if args.singlePrecision then [ /*"--enable-single" */] else ["--enable-float"]); # some distros seem to be shipping both versions within the same package?
# some distros seem to be shipping both versions within the same package? # why does --enable-float still result in ..3f.so instead of ..3.so?
# why does --enable-single still result in ..3f.so instead of ..3.so? ++ (if singlePrecision then [ "--enable-single" ] else [ ])
}; # I think all i686 has sse
in with localDefs; ++ (if (stdenv.isi686 || stdenv.isx86_64) && singlePrecision then [ "--enable-sse" ] else [ ])
# I think all x86_64 has sse2
++ (if stdenv.isx86_64 && ! singlePrecision then [ "--enable-sse2" ] else [ ]);
};
in with localDefs;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "fftw-3.2.1" + ( if args.singlePrecision then "-single" else "-float" ); name = "fftw-3.2.2" + ( if singlePrecision then "-single" else "-double" );
builder = writeScript "fftw-3.2.1-builder" builder = writeScript "fftw-3.2.1-builder"
(textClosure localDefs [doConfigure doMakeInstall doForceShare]); (textClosure localDefs [doConfigure doMakeInstall doForceShare]);
meta = { meta = {
description = "Fastest Fourier Transform in the West library"; description = "Fastest Fourier Transform in the West library";
inherit src; };
}; passthru = {
# Allow instantiating "-A fftw.src"
inherit src;
};
} }