diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2018-05-14 11:03:27 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-14 11:03:27 -0600 |
| commit | 32ac36eae7060a1e0246448b7ed2e3d72d49b780 (patch) | |
| tree | d3bb85f7e99ec15fa7ca295a24bbfb085a1a63b6 /numpy/matrixlib/tests | |
| parent | 671ba6e9fc4f4d199bed3ad7671c009f91a1565b (diff) | |
| parent | 5469af202699bd30c78789f2fb04d3c10c105614 (diff) | |
| download | numpy-32ac36eae7060a1e0246448b7ed2e3d72d49b780.tar.gz | |
Merge pull request #10985 from mhvk/linalg-move-matrix-power
MAINT, ENH: Move matrix_power to linalg and allow higher dimensions.
Diffstat (limited to 'numpy/matrixlib/tests')
| -rw-r--r-- | numpy/matrixlib/tests/test_defmatrix.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/numpy/matrixlib/tests/test_defmatrix.py b/numpy/matrixlib/tests/test_defmatrix.py index a02a05c09..d160490b3 100644 --- a/numpy/matrixlib/tests/test_defmatrix.py +++ b/numpy/matrixlib/tests/test_defmatrix.py @@ -13,7 +13,7 @@ from numpy.testing import ( assert_, assert_equal, assert_almost_equal, assert_array_equal, assert_array_almost_equal, assert_raises ) -from numpy.matrixlib.defmatrix import matrix_power +from numpy.linalg import matrix_power from numpy.matrixlib import mat class TestCtor(object): |