[PATCH] FFT off by default; clean signal-window.cpp

Nathan (Jasper) Myers ncm at codesourcery.com
Tue Sep 20 15:53:29 UTC 2005


This small cleanup is not yet applied, pending Jules's opinion.  

Note that running "configure" with no arguments still looks for and 
enables MPICH on my machine.  I don't know if that is wanted, or if
we should also try to turn off any MPI-dependent library components.

Nathan Myers
ncm

Index: ChangeLog
===================================================================
RCS file: /home/cvs/Repository/vpp/ChangeLog,v
retrieving revision 1.265
diff -u -p -r1.265 ChangeLog
--- ChangeLog	20 Sep 2005 12:38:56 -0000	1.265
+++ ChangeLog	20 Sep 2005 15:50:06 -0000
@@ -1,3 +1,10 @@
+2005-09-20  Nathan Myers  <ncm at codesourcery.com>
+
+	* configure.ac: turn off all FFT libraries by default. 
+	* src/vsip/signal-window.cpp: remove unused local variable.
+	* src/vsip/impl/signal-fft.hpp: move definition of member scale_
+	  outside #if to allow compilation with no FFT engines defined.
+
 2005-09-19  Don McCoy  <don at codesourcery.com>
 	
 	Implemented functions from [signal.windows]
Index: configure.ac
===================================================================
RCS file: /home/cvs/Repository/vpp/configure.ac,v
retrieving revision 1.39
diff -u -p -r1.39 configure.ac
--- configure.ac	20 Sep 2005 00:46:29 -0000	1.39
+++ configure.ac	20 Sep 2005 15:50:06 -0000
@@ -210,10 +210,10 @@ elif test "$with_fft" = "fftw2-generic";
   enable_fftw2_float="yes"
 elif test "$with_fft" = "ipp"; then
   enable_ipp_fft="yes"
-elif test "$chose_fft" != "yes"; then
-  enable_fftw3="probe"
-  enable_fftw2="probe"
-  enable_ipp_fft="probe"
+elif test "$chose_fft" != "yes"; then :
+#  enable_fftw3="probe"
+#  enable_fftw2="probe"
+#  enable_ipp_fft="probe"
 else
   AC_MSG_ERROR([Argument to --with-fft= must be one of fftw3, fftw2-float,
                 fftw2-double, fftw2-generic, or ipp.])
Index: src/vsip/signal-window.cpp
===================================================================
RCS file: /home/cvs/Repository/vpp/src/vsip/signal-window.cpp,v
retrieving revision 1.1
diff -u -p -r1.1 signal-window.cpp
--- src/vsip/signal-window.cpp	20 Sep 2005 12:38:57 -0000	1.1
+++ src/vsip/signal-window.cpp	20 Sep 2005 15:50:06 -0000
@@ -33,7 +33,6 @@ blackman(length_type len) VSIP_THROW((st
 
   Vector<scalar_f> v(len);
 
-  length_type n =  0;
   scalar_f temp1 = 2 * M_PI / (len - 1);
   scalar_f temp2 = 2 * temp1;
 
Index: src/vsip/impl/signal-fft.hpp
===================================================================
RCS file: /home/cvs/Repository/vpp/src/vsip/impl/signal-fft.hpp,v
retrieving revision 1.24
diff -u -p -r1.24 signal-fft.hpp
--- src/vsip/impl/signal-fft.hpp	19 Sep 2005 03:39:54 -0000	1.24
+++ src/vsip/impl/signal-fft.hpp	20 Sep 2005 15:50:06 -0000
@@ -66,11 +66,6 @@ struct Fft_core : impl::Ref_count<impl::
     , plan_from_to_(0)
     {}
 
-  // if any of the above functions applies the scale itself, it must
-  // set this->scale_ back to 1 so the caller will know not to repeat it.
-
-  typename impl::Scalar_of<outT>::type  scale_;
-
   void*  plan_in_place_;
   void*  plan_from_to_;
 
@@ -88,6 +83,11 @@ struct Fft_core : impl::Ref_count<impl::
 # endif
 
 #endif
+
+  // if any of the above functions applies the scale itself, it must
+  // set this->scale_ back to 1 so the caller will know not to repeat it.
+
+  typename impl::Scalar_of<outT>::type  scale_;
 };
 
 // 



More information about the vsipl++ mailing list