[Scipy-svn] r3934 - trunk/scipy/splinalg/dsolve

[scipy-svn at scipy.org]

Author: rc
Date: 2008-02-13 02:52:06 -0600 (Wed, 13 Feb 2008)
New Revision: 3934

Modified:
   trunk/scipy/splinalg/dsolve/linsolve.py
Log:
use scikit umfpack, issue warning otherwise


Modified: trunk/scipy/splinalg/dsolve/linsolve.py
===================================================================
--- trunk/scipy/splinalg/dsolve/linsolve.py	2008-02-13 05:04:04 UTC (rev 3933)
+++ trunk/scipy/splinalg/dsolve/linsolve.py	2008-02-13 08:52:06 UTC (rev 3934)
@@ -6,12 +6,19 @@
 
 import _superlu
 
-import umfpack
-if hasattr( umfpack, 'UMFPACK_OK' ):
-    isUmfpack = True
+noScikit = False
+try:
+    import scikits.umfpack as umfpack
+except ImportError:
+    import umfpack
+    noScikit = True
 else:
-    del umfpack
-    isUmfpack = False
+    isUmfpack = hasattr( umfpack, 'UMFPACK_OK' )
+
+if isUmfpack and noScikit:
+    warn( 'scipy.splinalg.dsolve.umfpack will be removed,'
+          ' install scikits.umfpack instead', DeprecationWarning )
+
 useUmfpack = True