diff options
| author | Mark Wiebe <mwwiebe@gmail.com> | 2011-01-18 12:13:32 -0800 |
|---|---|---|
| committer | Mark Wiebe <mwwiebe@gmail.com> | 2011-01-18 12:13:32 -0800 |
| commit | ee06d183c407ea315b2eb3ef41ee422b0ea30251 (patch) | |
| tree | 63f342953c62be3ff4d991a6c2559c11d8233c53 /numpy/core/numeric.py | |
| parent | cce7e1fcfa49b2fe8e1b9c1530269fdcebade14b (diff) | |
| download | numpy-ee06d183c407ea315b2eb3ef41ee422b0ea30251.tar.gz | |
ENH: core: Start converting ufunc to new iterator, add PyArray_PromoteTypes
Diffstat (limited to 'numpy/core/numeric.py')
| -rw-r--r-- | numpy/core/numeric.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/numpy/core/numeric.py b/numpy/core/numeric.py index a65c62a08..4648f4bb0 100644 --- a/numpy/core/numeric.py +++ b/numpy/core/numeric.py @@ -3,7 +3,7 @@ __all__ = ['newaxis', 'ndarray', 'flatiter', 'newiter', 'nested_iters', 'ufunc', 'dtype', 'fromstring', 'fromfile', 'frombuffer', 'int_asbuffer', 'where', 'argwhere', 'concatenate', 'fastCopyAndTranspose', 'lexsort', - 'set_numeric_ops', 'can_cast', + 'set_numeric_ops', 'can_cast', 'promote_types', 'asarray', 'asanyarray', 'ascontiguousarray', 'asfortranarray', 'isfortran', 'empty_like', 'zeros_like', 'correlate', 'convolve', 'inner', 'dot', 'outer', 'vdot', @@ -212,6 +212,7 @@ concatenate = multiarray.concatenate fastCopyAndTranspose = multiarray._fastCopyAndTranspose set_numeric_ops = multiarray.set_numeric_ops can_cast = multiarray.can_cast +promote_types = multiarray.promote_types lexsort = multiarray.lexsort compare_chararrays = multiarray.compare_chararrays putmask = multiarray.putmask |