diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2016-09-28 11:38:35 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-28 11:38:35 -0500 |
| commit | 86c780d1c60473b594db7a241419167ebc3df687 (patch) | |
| tree | 847d715b74930c56f3993d5a56af5b5ad172eda6 /numpy/core/numeric.py | |
| parent | 7ccf0e08917d27bc0eba34013c1822b00a66ca6d (diff) | |
| parent | 4c788f4e7f6f5af6b1c3cda98388768912349b46 (diff) | |
| download | numpy-86c780d1c60473b594db7a241419167ebc3df687.tar.gz | |
Merge pull request #5488 from dgasmith/opt_einsum
ENH: add `contract`: optimizing numpy's einsum expression
Diffstat (limited to 'numpy/core/numeric.py')
| -rw-r--r-- | numpy/core/numeric.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/numpy/core/numeric.py b/numpy/core/numeric.py index 81d9d3697..82f7b081f 100644 --- a/numpy/core/numeric.py +++ b/numpy/core/numeric.py @@ -12,7 +12,7 @@ from .multiarray import ( _fastCopyAndTranspose as fastCopyAndTranspose, ALLOW_THREADS, BUFSIZE, CLIP, MAXDIMS, MAY_SHARE_BOUNDS, MAY_SHARE_EXACT, RAISE, WRAP, arange, array, broadcast, can_cast, compare_chararrays, - concatenate, copyto, count_nonzero, dot, dtype, einsum, empty, + concatenate, copyto, count_nonzero, dot, dtype, empty, empty_like, flatiter, frombuffer, fromfile, fromiter, fromstring, inner, int_asbuffer, lexsort, matmul, may_share_memory, min_scalar_type, ndarray, nditer, nested_iters, promote_types, @@ -53,7 +53,7 @@ __all__ = [ 'min_scalar_type', 'result_type', 'asarray', 'asanyarray', 'ascontiguousarray', 'asfortranarray', 'isfortran', 'empty_like', 'zeros_like', 'ones_like', 'correlate', 'convolve', 'inner', 'dot', - 'einsum', 'outer', 'vdot', 'alterdot', 'restoredot', 'roll', + 'outer', 'vdot', 'alterdot', 'restoredot', 'roll', 'rollaxis', 'moveaxis', 'cross', 'tensordot', 'array2string', 'get_printoptions', 'set_printoptions', 'array_repr', 'array_str', 'set_string_function', 'little_endian', 'require', 'fromiter', |