Changed from scipy to numpy

svn path=/trunk/matplotlib/; revision=1932

Author: teoliphant

CHANGELOG

@@ -1,3 +1,5 @@
+2006-1-4 Changed to support numpy (new name for scipy_core) - TEO
+
 2006-1-4 Added Mark's scaled axes patch for shared axis
 
 2005-12-28 Added Chris Barker's build_wxagg patch - JDH

INSTALL

@@ -66,7 +66,7 @@ COMPILING
 WINDOWS
 
   If you don't already have python installed, you may want to consider
-  using the enthought edition of python, which has scipy, Numeric, and
+  using the enthought edition of python, which has (old) scipy, Numeric, and
   wxpython, plus a lot of other goodies, preinstalled -
   http://www.enthought.com/python .  With the enthought edition of
   python + matplotlib installer, the following backends should work

lib/matplotlib/__init__.py

@@ -461,9 +461,9 @@ def validate_numerix(s):
     sl = s.lower()
     if sl=='numeric': return 'Numeric'
     elif sl=='numarray': return 'numarray'
-    elif sl=='scipy': return 'scipy'
+    elif sl=='numpy': return 'numpy'
     else:
-        raise ValueError('Numerix must be Numeric, numarray, or scipy')
+        raise ValueError('Numerix must be Numeric, numarray, or numpy')
 
 def validate_toolbar(s):
     """

lib/matplotlib/_contour.py

@@ -12,7 +12,7 @@
     except ImportError:
         numerix._import_fail_message("_contour", "_nc")
         raise
-else:                 # Must be scipy
+else:                 # Must be numpy
     try:
         from matplotlib._ns_cntr import *
     except ImportError:

lib/matplotlib/_image.py

@@ -12,7 +12,7 @@
     except ImportError:
         numerix._import_fail_message("_image", "_nc")
         raise
-else:                 # Must be scipy
+else:                 # Must be numpy
     try:
         from matplotlib._ns_image import *
     except ImportError:

lib/matplotlib/_transforms.py

@@ -12,7 +12,7 @@
     except ImportError:
         numerix._import_fail_message("_transforms", "_nc")
         raise
-else:                 # Must be scipy
+else:                 # Must be numpy
     try:
         from matplotlib._ns_transforms import *
     except ImportError:

lib/matplotlib/colors.py

@@ -518,7 +518,7 @@ def __call__(self, X, alpha=1.0):
         rgba = take(self._lut, xa)
         if vtype == 'scalar':
             rgba = tuple(rgba[0,:])
-        #print rgba[0,1:10,:]       # Now the same for scipy, numeric...
+        #print rgba[0,1:10,:]       # Now the same for numpy, numeric...
         return rgba
 
     def set_bad(self, color = 'k', alpha = 0.0):

lib/matplotlib/enthought/util/__init__.py

@@ -34,6 +34,6 @@ def test(level=1,verbosity=1):
 
 # returns a test suite for use elsewhere 
 def test_suite(level=1):
-    import scipy_test.testing
+    import numpy.testing
     import matplotlib.enthought.util    
-    return scipy_test.testing.harvest_test_suites(enthought.util,level=level)
+    return numpy.testing.harvest_test_suites(enthought.util,level=level)

lib/matplotlib/numerix/__init__.py

@@ -27,7 +27,7 @@
 for a in sys.argv:
     if a in ["--Numeric", "--numeric", "--NUMERIC",
              "--Numarray", "--numarray", "--NUMARRAY",
-             "--SciPy", "--scipy", "--SCIPY", "--Scipy",
+             "--NumPy", "--numpy", "--NUMPY", "--Numpy",
              ]:
         which = a[2:], "command line"
         break
@@ -44,8 +44,8 @@
     which = "numeric", "defaulted"
 
 which = which[0].strip().lower(), which[1]
-if which[0] not in ["numeric", "numarray", "scipy"]:
-    raise ValueError("numerix selector must be either 'Numeric', 'numarray', or 'scipy' but the value obtained from the %s was '%s'." % (which[1], which[0]))
+if which[0] not in ["numeric", "numarray", "numpy"]:
+    raise ValueError("numerix selector must be either 'Numeric', 'numarray', or 'numpy' but the value obtained from the %s was '%s'." % (which[1], which[0]))
 
 if which[0] == "numarray":
     #from na_imports import *
@@ -62,17 +62,17 @@
     from Matrix import Matrix
     import Numeric
     version = 'Numeric %s'%Numeric.__version__
-elif which[0] == "scipy":
-    import scipy
-    from scipy import *
+elif which[0] == "numpy":
+    import numpy
+    from numpy import *
     from _sp_imports import nx, infinity
     from _sp_imports import UInt8, UInt16, UInt32
     Matrix = matrix
-    version = 'scipy' # Don't know how to get scipy version
+    version = 'numpy %s' % numpy.__version__
 else:
     raise RuntimeError("invalid numerix selector")
 
-# Some changes are only applicable to the new scipy:
+# Some changes are only applicable to the new numpy:
 if (which[0] == 'numarray' or
     which[0] == 'numeric'):
     def typecode(a):
@@ -86,16 +86,16 @@ def itemsize(a):
 
 else:
     # We've already checked for a valid numerix selector,
-    # so assume scipy.
+    # so assume numpy.
     def typecode(a):
         return a.dtypechar
     def iscontiguous(a):
-        return a.flags['CONTIGUOUS']
+        return a.flags.contiguous
     def byteswapped(a):
         return a.byteswap()
     def itemsize(a):
         return a.itemsize
-    # resize function is already defined by scipy
+    # resize function is already defined by numpy 
     # Fix typecode->dtype
     def fixkwargs(kwargs):
         if 'typecode' in kwargs:
@@ -104,13 +104,13 @@ def fixkwargs(kwargs):
             kwargs['dtype'] = val
     def array(*args, **kwargs):
         fixkwargs(kwargs)
-        return scipy.array(*args, **kwargs)
+        return numpy.array(*args, **kwargs)
     def zeros(*args, **kwargs):
         fixkwargs(kwargs)
-        return scipy.zeros(*args, **kwargs)
+        return numpy.zeros(*args, **kwargs)
     def ones(*args, **kwargs):
         fixkwargs(kwargs)
-        return scipy.ones(*args, **kwargs)
+        return numpy.ones(*args, **kwargs)
 
 
 verbose.report('numerix %s'%version)

lib/matplotlib/numerix/_sp_imports.py

@@ -1,5 +1,4 @@
-# Not sure why all the equivalences don't exist ...
-from scipy import Int8, UInt8, \
+from numpy import Int8, UInt8, \
      Int16, UInt16, \
      Int32, UInt32, \
      Float32, Float64, \
@@ -21,5 +20,5 @@ class _TypeNamespace:
 
 nx = _TypeNamespace()
 
-from scipy import inf, infty, Infinity
+from numpy import inf, infty, Infinity
 infinity = Infinity

lib/matplotlib/numerix/fft/__init__.py

@@ -4,7 +4,7 @@
     from numarray.fft import *
 elif which[0] == "numeric":
     from FFT import *
-elif which[0] == "scipy":
-    from scipy.corefft import *
+elif which[0] == "numpy":
+    from numpy.dft import *
 else:
     raise RuntimeError("invalid numerix selector")

lib/matplotlib/numerix/linear_algebra/__init__.py

@@ -4,7 +4,7 @@
     from numarray.linear_algebra import *
 elif which[0] == "numeric":
     from LinearAlgebra import *
-elif which[0] == "scipy":
-    from scipy.corelinalg import *
+elif which[0] == "numpy":
+    from numpy.linalg import *
 else:
     raise RuntimeError("invalid numerix selector")

lib/matplotlib/numerix/ma/__init__.py

@@ -4,7 +4,7 @@
     from numarray.ma import *
 elif which[0] == "numeric":
     from MA import *
-elif which[0] == "scipy":
-    from scipy.base.ma import *
+elif which[0] == "numpy":
+    from numpy.core.ma import *
 else:
     raise RuntimeError("invalid numerix selector")

lib/matplotlib/numerix/mlab/__init__.py

@@ -4,8 +4,8 @@
     from numarray.linear_algebra.mlab import *
 elif which[0] == "numeric":
     from MLab import *
-elif which[0] == "scipy":
-    from scipy.base.mlab import *
+elif which[0] == "numpy":
+    from numpy.lib.mlab import *
 else:
     raise RuntimeError("invalid numerix selector")
 

lib/matplotlib/numerix/random_array/__init__.py

@@ -4,7 +4,7 @@
     from numarray.random_array import *
 elif which[0] == "numeric":
     from RandomArray import *
-elif which[0] == "scipy":
-    from scipy.random import *
+elif which[0] == "numpy":
+    from numpy.random import *
 else:
     raise RuntimeError("invalid numerix selector")

setup.py

@@ -137,14 +137,13 @@
 except ImportError:
     pass
 try:
-     import scipy
-     if hasattr(scipy,'__core_version__'):
-         NUMERIX.append('scipy')
+     import numpy
+     NUMERIX.append('numpy')
 except ImportError:
      pass
 
 if not NUMERIX:
-    raise RuntimeError("You must install the new scipy, Numeric, numarray, or both to build matplotlib")
+    raise RuntimeError("You must install one or more of numpy, Numeric, and numarray to build matplotlib")
 
 
 rc['numerix'] = NUMERIX[-1]
@@ -280,7 +279,7 @@ def add_dateutil():
 
 # packagers: set rc['numerix'] and rc['backend'] here to override the auto
 # defaults, eg
-#rc['numerix'] = scipy
+#rc['numerix'] = numpy
 #rc['backend'] = GTKAgg
 template = file('matplotlibrc.template').read()
 file('matplotlibrc', 'w').write(template%rc)

setupext.py

@@ -115,10 +115,10 @@ def getoutput(s):
     ret =  os.popen(s).read().strip()
     return ret
 
-def add_scipy_flags(module):
-    "Add the modules flags to build extensions which use scipy"
-    import scipy
-    module.include_dirs.append(scipy.get_scipy_include())
+def add_numpy_flags(module):
+    "Add the modules flags to build extensions which use numpy"
+    import numpy 
+    module.include_dirs.append(numpy.get_numpy_include())
 
 def add_agg_flags(module):
     'Add the module flags to build extensions which use agg'
@@ -592,7 +592,7 @@ def build_agg(ext_modules, packages, numerix):
         add_agg_flags(module)
         add_ft2font_flags(module)
         ext_modules.append(module)    
-    if 'scipy' in numerix: # Build for scipy
+    if 'numpy' in numerix: # Build for numpy
         deps = ['%s/src/%s'%(AGG_VERSION, name) for name in agg]
         deps.extend(('src/_image.cpp', 'src/ft2font.cpp', 'src/mplutils.cpp'))
         deps.extend(glob.glob('CXX/*.cxx'))
@@ -606,7 +606,7 @@ def build_agg(ext_modules, packages, numerix):
             include_dirs=numeric_inc_dirs,
             )
 
-        add_scipy_flags(module)
+        add_numpy_flags(module)
         module.extra_compile_args.append('-DSCIPY=1')
 
         add_agg_flags(module)
@@ -658,7 +658,7 @@ def build_image(ext_modules, packages, numerix):
         add_agg_flags(module)
         ext_modules.append(module)
 
-    if 'scipy' in numerix: # Build for scipy
+    if 'numpy' in numerix: # Build for numpy
         temp_copy('src/_image.cpp', 'src/_ns_image.cpp')
         deps = ['src/_ns_image.cpp', 'src/mplutils.cpp'] 
         deps.extend(['%s/src/%s'%(AGG_VERSION,name) for name in agg])
@@ -671,7 +671,7 @@ def build_image(ext_modules, packages, numerix):
             include_dirs=numeric_inc_dirs,
             )
 
-        add_scipy_flags(module)
+        add_numpy_flags(module)
         module.extra_compile_args.append('-DSCIPY=1')
         add_agg_flags(module)
         ext_modules.append(module)
@@ -735,7 +735,7 @@ def build_transforms(ext_modules, packages, numerix):
         add_base_flags(module)
         ext_modules.append(module)
 
-    if 'scipy' in numerix:  # Build for scipy
+    if 'numpy' in numerix:  # Build for numpy
         cxx = glob.glob('CXX/*.cxx')
         cxx.extend(glob.glob('CXX/*.c'))
         temp_copy("src/_transforms.cpp","src/_ns_transforms.cpp")
@@ -747,7 +747,7 @@ def build_transforms(ext_modules, packages, numerix):
                              )
 
 
-        add_scipy_flags(module)
+        add_numpy_flags(module)
         module.extra_compile_args.append("-DSCIPY=1")
         add_base_flags(module)
         ext_modules.append(module)
@@ -794,15 +794,15 @@ def build_contour(ext_modules, packages, numerix):
         module.extra_compile_args.append('-DNUMERIC=1')
         add_base_flags(module)
         ext_modules.append(module)
-    if 'scipy' in numerix: # Build for scipy
+    if 'numpy' in numerix: # Build for numpy
         temp_copy('src/cntr.c', 'src/_ns_cntr.c')
         module = Extension(
             'matplotlib._ns_cntr',
             [ 'src/_ns_cntr.c'],
             #libraries = ['stdc++'],
             include_dirs=numeric_inc_dirs,
             )
-        add_scipy_flags(module)
+        add_numpy_flags(module)
         module.extra_compile_args.append('-DSCIPY=1')
         add_base_flags(module)
         ext_modules.append(module)
@@ -842,7 +842,7 @@ def build_gdk(ext_modules, packages, numerix):
         add_pygtk_flags(module)        
         ext_modules.append(module)
 
-    if 'scipy' in numerix:# Build for scipy
+    if 'numpy' in numerix:# Build for numpy 
         temp_copy('src/_backend_gdk.c', 'src/_ns_backend_gdk.c')
         module = Extension(
             'matplotlib.backends._ns_backend_gdk',
@@ -851,7 +851,7 @@ def build_gdk(ext_modules, packages, numerix):
             include_dirs=numeric_inc_dirs,            
             )
 
-        add_scipy_flags(module)
+        add_numpy_flags(module)
         module.extra_compile_args.append('-DSCIPY=1')
         add_base_flags(module)
         add_pygtk_flags(module)        

src/_backend_agg.cpp

@@ -30,7 +30,7 @@
 #ifdef NUMERIC
 #include "Numeric/arrayobject.h"
 #else
-#include "scipy/arrayobject.h"
+#include "numpy/arrayobject.h"
 #endif
 #endif
 

src/_backend_gdk.c

@@ -9,7 +9,7 @@
 #ifdef NUMERIC
 #include "Numeric/arrayobject.h"
 #else
-#include "scipy/arrayobject.h"
+#include "numpy/arrayobject.h"
 #endif
 #endif
 

src/_image.cpp

@@ -12,7 +12,7 @@
 #ifdef NUMERIC
 #include "Numeric/arrayobject.h"
 #else
-#include "scipy/arrayobject.h"
+#include "numpy/arrayobject.h"
 #endif
 #endif
 

src/_transforms.cpp

@@ -9,7 +9,7 @@
 #   ifdef NUMERIC
 #       include "Numeric/arrayobject.h"
 #   else
-#       include "scipy/arrayobject.h"
+#       include "numpy/arrayobject.h"
 #   endif
 #endif
 

src/cntr.c

@@ -25,7 +25,7 @@
 #ifdef NUMERIC
 #include "Numeric/arrayobject.h"
 #else
-#include "scipy/arrayobject.h"
+#include "numpy/arrayobject.h"
 #endif
 #endif