[patch] more FFTW cleanup
Nathan (Jasper) Myers
ncm at codesourcery.com
Wed Dec 21 22:40:23 UTC 2005
This is another (non-minimal) try at making "make clean" clear out
fftw libs. It also fixes a typo in tests/fft.cpp that we hadn't
tripped on yet. Tested on sethra.
OK to commit?
Before I do, though, I wonder: should we really be $(INSTALL)ing
the libraries in $(libdir)/atlas and $(libdir)/fftw? Shouldn't
they just go in $(libdir)?
BTW, /usr/local/tools/vpp-1.0/bin/qmtest on sethra doesn't work
for me. I had to use /home/jules/local/x86_64/bin/qmtest.
Nathan Myers
ncm
===================================================================
RCS file: /home/cvs/Repository/vpp/ChangeLog,v
retrieving revision 1.346
diff -u -p -r1.346 ChangeLog
--- ChangeLog 21 Dec 2005 18:26:37 -0000 1.346
+++ ChangeLog 21 Dec 2005 22:27:08 -0000
@@ -1,6 +1,12 @@
+2005-12-21 Nathan Myers <ncm at codesourcery.com>
+
+ * configure.ac, vendor/GNUmakefile.inc.in: fix "make clean"
+ for fftw libs, other cleanup.
+ * tests/fft.cpp: typo; test with double if float not supported.
+
2005-12-21 Jules Bergmann <jules at codesourcery.com>
- * configure.ac: Done build builtin FFTW3 when asked to use another
+ * configure.ac: Don't build builtin FFTW3 when asked to use another
FFT library than FFTW3.
2005-12-21 Nathan Myers <ncm at codesourcery.com>
Index: configure.ac
===================================================================
RCS file: /home/cvs/Repository/vpp/configure.ac,v
retrieving revision 1.62
diff -u -p -r1.62 configure.ac
--- configure.ac 21 Dec 2005 18:26:38 -0000 1.62
+++ configure.ac 21 Dec 2005 22:27:08 -0000
@@ -485,13 +485,19 @@ if test "$build_fftw3" != "no"; then
echo "==============================================================="
rm -rf vendor/fftw
- mkdir -p vendor/fftw/lib
+ mkdir -p vendor/fftw/
+ echo \
+"Warning: this directory is deleted and rebuilt by the configure script.
+There are no regular files here, only symlinks (except this one)." \
+ > vendor/fftw/README
+ mkdir -p vendor/fftw/include
fftw3_src_prefix="`(cd $srcdir/vendor/fftw; echo \"$PWD\")`"
- ln -s "$fftw3_src_prefix"/api vendor/fftw/include
- # these don't refer to anything yet, but will when built:
- ln -s ../../fftw3f/libfftw3f-csl.a vendor/fftw/lib/libfftw3f-csl.a
- ln -s ../../fftw3/libfftw3-csl.a vendor/fftw/lib/libfftw3-csl.a
- ln -s ../../fftw3l/libfftw3l-csl.a vendor/fftw/lib/libfftw3l-csl.a
+ ln -s "$fftw3_src_prefix"/api/fftw3.h vendor/fftw/include/fftw3.h
+ mkdir -p vendor/fftw/lib
+ # these don't refer to anything yet.
+ ln -s ../../fftw3f/.libs/libfftw3f.a vendor/fftw/lib/libfftw3f-csl.a
+ ln -s ../../fftw3/.libs/libfftw3.a vendor/fftw/lib/libfftw3-csl.a
+ ln -s ../../fftw3l/.libs/libfftw3l.a vendor/fftw/lib/libfftw3l-csl.a
else
AC_MSG_RESULT([not found])
fi
Index: vendor/GNUmakefile.inc.in
===================================================================
RCS file: /home/cvs/Repository/vpp/vendor/GNUmakefile.inc.in,v
retrieving revision 1.4
diff -u -p -r1.4 GNUmakefile.inc.in
--- vendor/GNUmakefile.inc.in 21 Dec 2005 14:52:43 -0000 1.4
+++ vendor/GNUmakefile.inc.in 21 Dec 2005 22:27:08 -0000
@@ -74,42 +74,41 @@ endif
ifdef USE_BUILTIN_FFTW
+# note: configure script constructs vendor/fftw/ symlinks.
+
vendor_FFTW_LIBS := \
- vendor/fftw3f/libfftw3f-csl.a \
- vendor/fftw3/libfftw3-csl.a \
- vendor/fftw3l/libfftw3l-csl.a \
+ vendor/fftw3f/.libs/libfftw3f.a \
+ vendor/fftw3/.libs/libfftw3.a \
+ vendor/fftw3l/.libs/libfftw3l.a
all:: $(vendor_FFTW_LIBS)
libs:: $(vendor_FFTW_LIBS)
-vendor/fftw3f/libfftw3f-csl.a:
- @echo "Building FFTW float (fftw-f.build.log)"
+vendor/fftw3f/.libs/libfftw3f.a:
+ @echo "Building FFTW float (see fftw-f.build.log)"
@$(MAKE) -C vendor/fftw3f > fftw-f.build.log 2>&1
- mv vendor/fftw3f/.libs/libfftw3f.a vendor/fftw3f/libfftw3f-csl.a
-vendor/fftw3/libfftw3-csl.a:
- @echo "Building FFTW double (fftw-d.build.log)"
+vendor/fftw3/.libs/libfftw3.a:
+ @echo "Building FFTW double (see fftw-d.build.log)"
@$(MAKE) -C vendor/fftw3 > fftw-d.build.log 2>&1
- mv vendor/fftw3/.libs/libfftw3.a vendor/fftw3/libfftw3-csl.a
-vendor/fftw3l/libfftw3l-csl.a:
- @echo "Building FFTW double (fftw-l.build.log)"
+vendor/fftw3l/.libs/libfftw3l.a:
+ @echo "Building FFTW double (see fftw-l.build.log)"
@$(MAKE) -C vendor/fftw3l > fftw-l.build.log 2>&1
- mv vendor/fftw3l/.libs/libfftw3l.a vendor/fftw3l/libfftw3l-csl.a
clean::
- @echo "Cleaning FFTW (fftw.clean.log)"
+ @echo "Cleaning FFTW (see fftw.clean.log)"
@$(MAKE) -C vendor/fftw3f clean > fftw.clean.log 2>&1
- @$(MAKE) -C vendor/fftw3 clean >> fftw.clean.log 2>&1
- @$(MAKE) -C vendor/fftw3l clean >> fftw.clean.log 2>&1
+ @$(MAKE) -C vendor/fftw3 clean >> fftw.clean.log 2>&1
+ @$(MAKE) -C vendor/fftw3l clean >> fftw.clean.log 2>&1
install::
- @echo "Installing FFTW (fftw.install.log)"
+ @echo "Installing FFTW"
$(INSTALL) -d $(libdir)/fftw3
- $(INSTALL_DATA) vendor/fftw3f/libfftw3f-csl.a $(libdir)/fftw3
- $(INSTALL_DATA) vendor/fftw3/libfftw3-csl.a $(libdir)/fftw3
- $(INSTALL_DATA) vendor/fftw3l/libfftw3l-csl.a $(libdir)/fftw3
+ $(INSTALL_DATA) vendor/fftw/lib/libfftw3f-csl.a $(libdir)/fftw3
+ $(INSTALL_DATA) vendor/fftw/lib/libfftw3-csl.a $(libdir)/fftw3
+ $(INSTALL_DATA) vendor/fftw/lib/libfftw3l-csl.a $(libdir)/fftw3
$(INSTALL) -d $(includedir)
$(INSTALL_DATA) $(srcdir)/vendor/fftw/api/fftw3.h $(includedir)
endif
Index: tests/fft.cpp
===================================================================
RCS file: /home/cvs/Repository/vpp/tests/fft.cpp,v
retrieving revision 1.9
diff -u -p -r1.9 fft.cpp
--- tests/fft.cpp 20 Dec 2005 12:48:40 -0000 1.9
+++ tests/fft.cpp 21 Dec 2005 22:27:08 -0000
@@ -1001,7 +1001,7 @@ main()
#if defined(VSIP_IMPL_FFT_USE_FLOAT)
# define SCALAR float
-#elif defined(VSIP_IMPL_FFT_USE_FLOAT)
+#elif defined(VSIP_IMPL_FFT_USE_DOUBLE)
# define SCALAR double
#endif
More information about the vsipl++
mailing list