Changeset 1205

Show
Ignore:
Timestamp:
08/07/08 05:29:20 (4 months ago)
Author:
rc
Message:

fixed test_umfpack.py for the latest SVN, added README

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/umfpack/scikits/umfpack/__init__.py

    r1197 r1205  
    44 
    55__all__ = filter(lambda s:not s.startswith('_'),dir()) 
    6 from numpy.testing import Tester 
     6try: 
     7    from scipy.testing.pkgtester import Tester 
     8except: 
     9    from numpy.testing import Tester 
    710test = Tester().test 

  • trunk/umfpack/tests/test_umfpack.py

    r864 r1205  
    22# 
    33 
    4 """ Test functions for UMFPACK wrappers 
    5  
     4""" 
     5Test functions for UMFPACK solver. The solver is accessed via spsolve(), 
     6so the built-in SuperLU solver is tested too, in single precision. 
    67""" 
    78 
    …… 
    1112 
    1213import random 
    13 from scipy.testing import * 
     14from numpy.testing import * 
    1415 
    1516from scipy import rand, matrix, diag, eye 
    1617from scipy.sparse import csc_matrix, dok_matrix, spdiags, SparseEfficiencyWarning 
    17 from scipy.splinalg import linsolve 
     18 
     19import scipy 
     20try: 
     21    if scipy.version.version < '0.7.0.dev3861': 
     22        import scipy.linsolve as linsolve 
     23    else: 
     24        import scipy.sparse.linalg.dsolve.linsolve as linsolve 
     25except (ImportError, AttributeError): 
     26    raise ImportError( "Cannot import linsolve!" ) 
    1827 
    1928warnings.simplefilter('ignore',SparseEfficiencyWarning) 
    …… 
    5463        #print x 
    5564        #print "Error: ", a*x-b 
    56         assert_array_almost_equal(a*x, b) 
     65        # single precision: be more generous... 
     66        assert_array_almost_equal(a*x, b, decimal = 5) 
    5767 
    5868