diff --git a/python/xorbits/_mars/tensor/__init__.py b/python/xorbits/_mars/tensor/__init__.py index e4c836301..ee9cd566b 100644 --- a/python/xorbits/_mars/tensor/__init__.py +++ b/python/xorbits/_mars/tensor/__init__.py @@ -304,6 +304,7 @@ from ..core import ExecutableTuple from numpy import __version__ as np_ver + if np_ver >= "2.0.0": from numpy.exceptions import AxisError else: diff --git a/python/xorbits/_mars/tensor/lib/index_tricks.py b/python/xorbits/_mars/tensor/lib/index_tricks.py index 0444b05ad..4b07ee99a 100644 --- a/python/xorbits/_mars/tensor/lib/index_tricks.py +++ b/python/xorbits/_mars/tensor/lib/index_tricks.py @@ -19,6 +19,7 @@ from numpy.core.numeric import ScalarType from numpy import __version__ as np_ver + if np_ver >= "2.0.0": from numpy.lib._index_tricks_impl import ndindex else: @@ -351,6 +352,7 @@ def __getitem__(self, key): # find_common_type is deprecated if np_ver >= "2.0.0": from numpy import result_type + final_dtype = result_type(arraytypes, scalartypes) else: from numpy.core.numerictypes import find_common_type diff --git a/python/xorbits/numpy/__init__.py b/python/xorbits/numpy/__init__.py index 64a1f49a5..a4f8d436d 100644 --- a/python/xorbits/numpy/__init__.py +++ b/python/xorbits/numpy/__init__.py @@ -16,6 +16,7 @@ from typing import Any, Callable, Dict, Optional from numpy import __version__ as np_ver + if np_ver >= "2.0.0": from numpy.exceptions import AxisError from numpy.lib._index_tricks_impl import ndindex diff --git a/python/xorbits/numpy/lib/index_tricks.py b/python/xorbits/numpy/lib/index_tricks.py index 5d1ad4a4b..c49994169 100644 --- a/python/xorbits/numpy/lib/index_tricks.py +++ b/python/xorbits/numpy/lib/index_tricks.py @@ -13,6 +13,7 @@ # limitations under the License. import numpy from numpy import __version__ as np_ver + if np_ver >= "2.0.0": from numpy.lib import _index_tricks_impl as index_tricks else: