[Scipy-svn] r4386 - branches/refactor_fft/scipy/fftpack

[scipy-svn at scipy.org]

Author: cdavid
Date: 2008-05-24 11:29:04 -0500 (Sat, 24 May 2008)
New Revision: 4386

Modified:
   branches/refactor_fft/scipy/fftpack/__init__.py
   branches/refactor_fft/scipy/fftpack/common.py
Log:
Add functions to get name of used backend.

Modified: branches/refactor_fft/scipy/fftpack/__init__.py
===================================================================
--- branches/refactor_fft/scipy/fftpack/__init__.py	2008-05-24 15:55:28 UTC (rev 4385)
+++ branches/refactor_fft/scipy/fftpack/__init__.py	2008-05-24 16:29:04 UTC (rev 4386)
@@ -8,6 +8,7 @@
 from fftpack_version import fftpack_version as __version__
 
 from basic import *
+from common import backend, detailed_backend
 from pseudo_diffs import *
 from helper import *
 

Modified: branches/refactor_fft/scipy/fftpack/common.py
===================================================================
--- branches/refactor_fft/scipy/fftpack/common.py	2008-05-24 15:55:28 UTC (rev 4385)
+++ branches/refactor_fft/scipy/fftpack/common.py	2008-05-24 16:29:04 UTC (rev 4386)
@@ -12,14 +12,15 @@
 _DEF_BACKEND_NAME = "fftpack"
 
 __all__ = ["zfft", "drfft", "zfftnd", "zrfft", "init_convolution_kernel",
-           "convolve", "convolve_z", "destroy_convolve_cache"]
+           "convolve", "convolve_z", "destroy_convolve_cache", "backend",
+           "detailed_backend"]
 
 _FFT_FUNCNAME = ["zfft", "drfft", "zfftnd", "zrfft"]
-_CONVOLVE_FUNCNAME = ["init_convolution_kernel", 
+_CONVOLVE_FUNCNAME = ["init_convolution_kernel",
                       "convolve", "convolve_z", "destroy_convolve_cache"]
 
 # Dictionary of (name, callable)
-_FUNCS = dict([(name, None) for name in __all__])
+_FUNCS = dict([(name, None) for name in _FFT_FUNCNAME + _CONVOLVE_FUNCNAME])
 
 _FALLBACK = dict([(name, _DEF_BACKEND.__dict__[f]) for f in _FUNCS.keys()])
 
@@ -28,7 +29,7 @@
 
 def myimport(name):
     """Load a fft backend from its name.
-    
+
     Name should be fftw3, etc..."""
     mod = __import__("scipy.fftpack.backends", fromlist = [name])
     try:
@@ -92,15 +93,21 @@
                 _FUNCS[f] = _DEF_BACKEND.__dict__[f]
                 _BACK_PER_FUNC[f] = _DEF_BACKEND_NAME
     except ImportError, e:
+        name = _DEF_BACKEND_NAME
         # If cannot load backend, just use default backend (fftpack)
         for f in _FUNCS.keys():
             _FUNCS[f] = _DEF_BACKEND.__dict__[f]
             _BACK_PER_FUNC[f] = _DEF_BACKEND_NAME
 
-def show_backend():
+    return name
+
+def backend():
+    return _BACKEND_NAME
+
+def detailed_backend():
     return _BACK_PER_FUNC
 
-load_backend()
+_BACKEND_NAME = load_backend()
 
 zfft = _FUNCS["zfft"]
 drfft = _FUNCS["drfft"]