[Scipy-svn] r2101 - trunk/Lib/linalg

[scipy-svn at scipy.org]

Author: cookedm
Date: 2006-07-14 04:05:30 -0500 (Fri, 14 Jul 2006)
New Revision: 2101

Modified:
   trunk/Lib/linalg/basic.py
   trunk/Lib/linalg/blas.py
   trunk/Lib/linalg/decomp.py
   trunk/Lib/linalg/flinalg.py
   trunk/Lib/linalg/iterative.py
   trunk/Lib/linalg/lapack.py
Log:
scipy.linalg: redo imports so python tests/test_* would work

Modified: trunk/Lib/linalg/basic.py
===================================================================
--- trunk/Lib/linalg/basic.py	2006-07-14 00:06:15 UTC (rev 2100)
+++ trunk/Lib/linalg/basic.py	2006-07-14 09:05:30 UTC (rev 2101)
@@ -20,7 +20,7 @@
 import numpy
 from numpy import asarray_chkfinite, outer, concatenate, reshape, single
 from numpy import matrix as Matrix
-import calc_lwork
+from scipy.linalg import calc_lwork
 
 class LinAlgError(Exception):
     pass

Modified: trunk/Lib/linalg/blas.py
===================================================================
--- trunk/Lib/linalg/blas.py	2006-07-14 00:06:15 UTC (rev 2100)
+++ trunk/Lib/linalg/blas.py	2006-07-14 09:05:30 UTC (rev 2101)
@@ -11,8 +11,8 @@
 # replaced with the available one. If none is available, exception
 # is raised at the first attempt to use the resources.
 
-import fblas
-import cblas
+from scipy.linalg import fblas
+from scipy.linalg import cblas
 if hasattr(cblas,'empty_module'):
     cblas = fblas
 elif hasattr(fblas,'empty_module'):

Modified: trunk/Lib/linalg/decomp.py
===================================================================
--- trunk/Lib/linalg/decomp.py	2006-07-14 00:06:15 UTC (rev 2100)
+++ trunk/Lib/linalg/decomp.py	2006-07-14 09:05:30 UTC (rev 2101)
@@ -20,7 +20,7 @@
 from lapack import get_lapack_funcs
 from blas import get_blas_funcs
 from flinalg import get_flinalg_funcs
-import calc_lwork
+from scipy.linalg import calc_lwork
 import numpy
 from numpy import array, asarray_chkfinite, asarray, diag, zeros, ones, \
         single, isfinite, inexact

Modified: trunk/Lib/linalg/flinalg.py
===================================================================
--- trunk/Lib/linalg/flinalg.py	2006-07-14 00:06:15 UTC (rev 2100)
+++ trunk/Lib/linalg/flinalg.py	2006-07-14 09:05:30 UTC (rev 2101)
@@ -12,9 +12,10 @@
 try:
     import _flinalg
 except ImportError:
-    from numpy.distutils.misc_util import PostponedException
-    _flinalg = PostponedException()
-    print _flinalg.__doc__
+    _flinalg = None
+#    from numpy.distutils.misc_util import PostponedException
+#    _flinalg = PostponedException()
+#    print _flinalg.__doc__
     has_column_major_storage = lambda a:0
 
 def has_column_major_storage(arr):

Modified: trunk/Lib/linalg/iterative.py
===================================================================
--- trunk/Lib/linalg/iterative.py	2006-07-14 00:06:15 UTC (rev 2100)
+++ trunk/Lib/linalg/iterative.py	2006-07-14 09:05:30 UTC (rev 2101)
@@ -10,7 +10,7 @@
 
 
 __all__ = ['bicg','bicgstab','cg','cgs','gmres','qmr']
-import _iterative
+from scipy.linalg import _iterative
 import numpy as sb
 
 try:

Modified: trunk/Lib/linalg/lapack.py
===================================================================
--- trunk/Lib/linalg/lapack.py	2006-07-14 00:06:15 UTC (rev 2100)
+++ trunk/Lib/linalg/lapack.py	2006-07-14 09:05:30 UTC (rev 2101)
@@ -14,8 +14,8 @@
 
 import numpy
 
-import flapack
-import clapack
+from scipy.linalg import flapack
+from scipy.linalg import clapack
 _use_force_clapack = 1
 if hasattr(clapack,'empty_module'):
     clapack = flapack