diff options
| author | Mark Wiebe <mwwiebe@gmail.com> | 2011-01-23 14:01:36 -0800 |
|---|---|---|
| committer | Mark Wiebe <mwwiebe@gmail.com> | 2011-01-23 14:01:36 -0800 |
| commit | a41de3adf9dbbff9d9f2f50fe0ac59d6eabd43cf (patch) | |
| tree | 13a7a0fd04ed91adbd7408a61bd425fa08267fae /numpy/core/numeric.py | |
| parent | 27987d2b52a176e8f187a01f9f597271402c7e78 (diff) | |
| download | numpy-a41de3adf9dbbff9d9f2f50fe0ac59d6eabd43cf.tar.gz | |
ENH: core: Start einsum function, add copyright notices to files
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 8609fbc4b..8cdb18435 100644 --- a/numpy/core/numeric.py +++ b/numpy/core/numeric.py @@ -6,7 +6,7 @@ __all__ = ['newaxis', 'ndarray', 'flatiter', 'newiter', 'nested_iters', 'ufunc', 'can_cast', 'promote_types', 'min_scalar_type', 'result_type', 'asarray', 'asanyarray', 'ascontiguousarray', 'asfortranarray', 'isfortran', 'empty_like', 'zeros_like', - 'correlate', 'convolve', 'inner', 'dot', 'outer', 'vdot', + 'correlate', 'convolve', 'inner', 'dot', 'einsum', 'outer', 'vdot', 'alterdot', 'restoredot', 'roll', 'rollaxis', 'cross', 'tensordot', 'array2string', 'get_printoptions', 'set_printoptions', 'array_repr', 'array_str', 'set_string_function', @@ -218,6 +218,7 @@ result_type = multiarray.result_type lexsort = multiarray.lexsort compare_chararrays = multiarray.compare_chararrays putmask = multiarray.putmask +einsum = multiarray.einsum def asarray(a, dtype=None, order=None): """ |