[Scipy-svn] r2298 - in trunk/Lib: . linsolve

scipy-svn at scipy.org scipy-svn at scipy.org
Wed Oct 25 05:12:38 CDT 2006


Author: oliphant
Date: 2006-10-25 05:12:34 -0500 (Wed, 25 Oct 2006)
New Revision: 2298

Modified:
   trunk/Lib/__init__.py
   trunk/Lib/linsolve/linsolve.py
Log:
Fix scipy test and reset error mode to ignore for scipy.

Modified: trunk/Lib/__init__.py
===================================================================
--- trunk/Lib/__init__.py	2006-10-25 08:15:21 UTC (rev 2297)
+++ trunk/Lib/__init__.py	2006-10-25 10:12:34 UTC (rev 2298)
@@ -33,6 +33,7 @@
 from numpy import *
 from numpy.random import rand, randn
 from numpy.lib.scimath import *
+_num.seterr(all='ignore')
 
 __all__ += ['oldnumeric']+_num.__all__
 

Modified: trunk/Lib/linsolve/linsolve.py
===================================================================
--- trunk/Lib/linsolve/linsolve.py	2006-10-25 08:15:21 UTC (rev 2297)
+++ trunk/Lib/linsolve/linsolve.py	2006-10-25 10:12:34 UTC (rev 2298)
@@ -1,5 +1,6 @@
 from scipy.sparse import isspmatrix_csc, isspmatrix_csr, isspmatrix, spdiags
 import _superlu
+from numpy import asarray
 
 import umfpack
 if hasattr( umfpack, 'UMFPACK_OK' ):
@@ -71,8 +72,7 @@
             index0 = mat.colind
         ftype, lastel, data, index1 = mat.ftype, mat.nnz, mat.data, mat.indptr
         gssv = eval('_superlu.' + ftype + 'gssv')
-        print "data-ftype: %s compared to data %s" % (ftype, data.dtype.char)
-        print "Calling _superlu.%sgssv" % ftype
+        b = asarray(b, dtype=data.dtype)
         return gssv(N, lastel, data, index0, index1, b, csc, permc_spec)[0]
 
 def splu(A, permc_spec=2, diag_pivot_thresh=1.0,



More information about the Scipy-svn mailing list