[patch] Re: more FFTW cleanup (round 2)
Nathan (Jasper) Myers
ncm at codesourcery.com
Thu Dec 22 02:06:55 UTC 2005
On Wed, Dec 21, 2005 at 08:34:56PM -0500, Jules Bergmann wrote:
> Jules Bergmann wrote:
> Can you take care of the csl_ ATLAS prefix
> too when taking out the -csl suffix.
Round 2.
Nathan Myers
ncm
Index: ChangeLog
===================================================================
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 22 Dec 2005 01:59:01 -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, install in $(libdir).
+ * 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 22 Dec 2005 01:59:01 -0000
@@ -405,8 +405,8 @@ if test "$enable_fftw3" != "no" ; then
if test "$with_fft" != "builtin"; then
if test -n "$with_fftw3_prefix"; then
- CPPFLAGS="$CPPFLAGS -I$with_fftw3_prefix/include"
- LIBS="$LIBS -L$with_fftw3_prefix/lib"
+ CPPFLAGS="-I$with_fftw3_prefix/include $CPPFLAGS"
+ LIBS="-L$with_fftw3_prefix/lib $LIBS"
fi
AC_MSG_CHECKING([for external FFTW3 library])
@@ -449,7 +449,6 @@ if test "$build_fftw3" != "no"; then
fftw3_configure="`(cd $srcdir/vendor/fftw; echo \"$PWD\")`"/configure
fftw3_opts="--disable-dependency-tracking --silent"
- fftw3_opts="$fftw3_opts --program-suffix=-csl"
fftw3_opts="$fftw3_opts --disable-fortran"
@@ -485,13 +484,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.a
+ ln -s ../../fftw3/.libs/libfftw3.a vendor/fftw/lib/libfftw3.a
+ ln -s ../../fftw3l/.libs/libfftw3l.a vendor/fftw/lib/libfftw3l.a
else
AC_MSG_RESULT([not found])
fi
@@ -512,7 +517,7 @@ if test "$build_fftw3" != "no"; then
my_abs_top_srcdir="$curdir/$srcdir"
fi
- FFTW3_LIBS="-lfftw3f-csl -lfftw3-csl -lfftw3l-csl"
+ FFTW3_LIBS="-lfftw3f -lfftw3 -lfftw3l"
AC_MSG_NOTICE([Will link with $FFTW3_LIBS.])
AC_SUBST(USE_BUILTIN_FFTW, 1)
@@ -1056,7 +1061,7 @@ if test "$with_lapack" != "no"; then
else
AC_MSG_RESULT([Cannot find vendor/atlas/configure after cd.])
fi
- $atlas_configure --with-libprefix=csl_
+ $atlas_configure
cd ../..
echo "==============================================================="
@@ -1082,7 +1087,7 @@ if test "$with_lapack" != "no"; then
# fail). Instead we add them to LATE_LIBS, which gets added to
# LIBS just before AC_OUTPUT.
- LATE_LIBS="-lcsl_lapack -lcsl_cblas -lcsl_f77blas -lcsl_atlas $use_g2c $LATE_LIBS"
+ LATE_LIBS="-llapack -lcblas -lf77blas -latlas $use_g2c $LATE_LIBS"
INT_CPPFLAGS="-I$my_abs_top_srcdir/vendor/atlas/include $INT_CPPFLAGS"
INT_LDFLAGS="-L$curdir/vendor/atlas/lib $INT_LDFLAGS"
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 22 Dec 2005 01:59:01 -0000
@@ -1001,7 +1036,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
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 22 Dec 2005 01:59:01 -0000
@@ -16,19 +16,19 @@ USE_BUILTIN_ATLAS := @USE_BUILTIN_ATLAS@
USE_BUILTIN_FFTW := @USE_BUILTIN_FFTW@
vendor_REF_LAPACK = vendor/lapack/lapack.a
-vendor_PRE_LAPACK = vendor/atlas/lib/libcsl_prelapack.a
-vendor_USE_LAPACK = vendor/atlas/lib/libcsl_lapack.a
+vendor_PRE_LAPACK = vendor/atlas/lib/libprelapack.a
+vendor_USE_LAPACK = vendor/atlas/lib/liblapack.a
vendor_ATLAS_LIBS := \
- vendor/atlas/lib/libcsl_atlas.a \
- vendor/atlas/lib/libcsl_cblas.a \
- vendor/atlas/lib/libcsl_f77blas.a \
+ vendor/atlas/lib/libatlas.a \
+ vendor/atlas/lib/libcblas.a \
+ vendor/atlas/lib/libf77blas.a \
$(vendor_PRE_LAPACK)
vendor_LIBS := \
- vendor/atlas/lib/libcsl_atlas.a \
- vendor/atlas/lib/libcsl_cblas.a \
- vendor/atlas/lib/libcsl_f77blas.a \
+ vendor/atlas/lib/libatlas.a \
+ vendor/atlas/lib/libcblas.a \
+ vendor/atlas/lib/libf77blas.a \
$(vendor_USE_LAPACK)
@@ -64,52 +64,51 @@ install::
@echo "Installing ATLAS (see atlas.install.log)"
# @$(MAKE) -C vendor/atlas installinstall > atlas.install.log 2>&1
$(INSTALL) -d $(libdir)/atlas
- $(INSTALL_DATA) vendor/atlas/lib/libcsl_atlas.a $(libdir)/atlas
- $(INSTALL_DATA) vendor/atlas/lib/libcsl_cblas.a $(libdir)/atlas
- $(INSTALL_DATA) vendor/atlas/lib/libcsl_f77blas.a $(libdir)/atlas
- $(INSTALL_DATA) vendor/atlas/lib/libcsl_lapack.a $(libdir)/atlas
+ $(INSTALL_DATA) vendor/atlas/lib/libatlas.a $(libdir)
+ $(INSTALL_DATA) vendor/atlas/lib/libcblas.a $(libdir)
+ $(INSTALL_DATA) vendor/atlas/lib/libf77blas.a $(libdir)
+ $(INSTALL_DATA) vendor/atlas/lib/liblapack.a $(libdir)
$(INSTALL) -d $(includedir)/atlas
- $(INSTALL_DATA) $(srcdir)/vendor/atlas/include/cblas.h $(includedir)/atlas
+ $(INSTALL_DATA) $(srcdir)/vendor/atlas/include/cblas.h $(includedir)
endif
ifdef USE_BUILTIN_FFTW
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
+
+ # note: configure script constructs vendor/fftw/ symlinks used here.
install::
- @echo "Installing FFTW (fftw.install.log)"
- $(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
+ @echo "Installing FFTW"
+ $(INSTALL) -d $(libdir)
+ $(INSTALL_DATA) vendor/fftw/lib/libfftw3f.a $(libdir)
+ $(INSTALL_DATA) vendor/fftw/lib/libfftw3.a $(libdir)
+ $(INSTALL_DATA) vendor/fftw/lib/libfftw3l.a $(libdir)
$(INSTALL) -d $(includedir)
$(INSTALL_DATA) $(srcdir)/vendor/fftw/api/fftw3.h $(includedir)
endif
More information about the vsipl++
mailing list