ENH: Fix import error if np>=2.0 (xorbitsai#787)

.github/workflows/build-wheel.yaml

@@ -25,10 +25,22 @@ jobs:
  include:
  - os: ubuntu-latest
  arch: aarch64
- requires-python: ">=3.9,<3.12"
+ requires-python: ">=3.9,<3.10"
+ - os: ubuntu-latest
+ arch: aarch64
+ requires-python: ">=3.10,<3.11"
+ - os: ubuntu-latest
+ arch: aarch64
+ requires-python: ">=3.11,<3.12"
+ - os: macos-latest
+ arch: arm64
+ requires-python: ">=3.9,<3.10"
+ - os: macos-latest
+ arch: arm64
+ requires-python: ">=3.10,<3.11"
  - os: macos-latest
  arch: arm64
- requires-python: ">=3.9,<3.12"
+ requires-python: ">=3.11,<3.12"
 
  steps:
  - uses: actions/checkout@v3
@@ -62,7 +74,7 @@ jobs:
  CIBW_BEFORE_BUILD_MACOS: pip install -r CI/requirements-wheel.txt && cd python && python setup.py build_web && git reset --hard HEAD
  CIBW_BEFORE_BUILD_WINDOWS: pip install -r CI/requirements-wheel.txt && cd python && python setup.py build_web && git reset --hard HEAD
  CIBW_TEST_COMMAND: pytest {project}/CI/test_basic_execution.py
- CIBW_TEST_REQUIRES: pytest requests "setuptools<64" "numpy<2.0.0"
+ CIBW_TEST_REQUIRES: pytest requests
  CIBW_BUILD_VERBOSITY: 1
  with:
  package-dir: ./python/

CI/requirements-wheel.txt

@@ -5,7 +5,7 @@ pandas==1.4.0; python_version>='3.9' and python_version<'3.10' and platform_mach
 pandas==1.3.4; python_version>='3.10' and python_version<'3.11' and platform_machine!='arm64'
 pandas==1.4.0; python_version>='3.10' and python_version<'3.11' and platform_machine=='arm64'
 pandas==1.5.1; python_version>='3.11' and python_version<'3.12'
-pandas>=2.1.1; python_version>'3.11'
+pandas>=2.1.1; python_version>='3.12'
 
 packaging
 numpy<2.0.0
@@ -16,10 +16,10 @@ scipy==1.7.3; python_version>='3.9' and python_version<'3.10' and platform_machi
 scipy==1.7.2; python_version>='3.10' and python_version<'3.11' and platform_machine!='arm64'
 scipy==1.7.3; python_version>='3.10' and python_version<'3.11' and platform_machine=='arm64'
 scipy==1.9.2; python_version>='3.11' and python_version<'3.12'
-scipy>=1.11.2; python_version>'3.11'
+scipy>=1.11.2; python_version>='3.12'
 
 # see: https://github.com/cython/cython/commit/afc00fc3ba5d43c67151c0039847a526e7b627a5
-cython==0.29.33
+cython>=0.29.33
 requests>=2.4.0
 cloudpickle>=1.5.0
 xoscar>=0.0.3

CI/test_basic_execution.py

@@ -8,7 +8,9 @@
 
 def test_basic_cases():
  with warnings.catch_warnings():
- warnings.simplefilter("error")
+ # TODO: change warnings.simplefilter("error") to "module"
+ # "error" help us find the deprecated APIs
+ warnings.simplefilter("module")
  import xorbits
  import xorbits.pandas as pd
  import xorbits.numpy as np

python/pyproject.toml

@@ -10,13 +10,13 @@ requires = [
  "pandas==1.3.4; python_version>='3.10' and python_version<'3.11' and platform_machine!='arm64'",
  "pandas==1.4.0; python_version>='3.10' and python_version<'3.11' and platform_machine=='arm64'",
  "pandas==1.5.1; python_version>='3.11' and python_version<'3.12'",
- "pandas>=2.1.1; python_version>'3.11'",
+ "pandas>=2.1.1; python_version>='3.12'",
  "scipy==1.5.4; python_version>='3.9' and python_version<'3.10' and platform_machine!='arm64'",
  "scipy==1.7.3; python_version>='3.9' and python_version<'3.10' and platform_machine=='arm64'",
  "scipy==1.7.2; python_version>='3.10' and python_version<'3.11' and platform_machine!='arm64'",
  "scipy==1.7.3; python_version>='3.10' and python_version<'3.11' and platform_machine=='arm64'",
  "scipy==1.9.2; python_version>='3.11' and python_version<'3.12'",
- "scipy>=1.11.2; python_version>'3.11'",
+ "scipy>=1.11.2; python_version>='3.12'",
  "cython>=0.29.33",
  "requests>=2.4.0",
  "cloudpickle>=2.2.1; python_version>='3.11'",

python/xorbits/_mars/dataframe/missing/tests/test_missing.py

@@ -232,7 +232,7 @@ def test_isna(setup):
  assert isna(None) == pd.isna(None)
  assert isna(md.NA) == pd.isna(pd.NA)
  assert isna(md.NaT) == pd.isna(pd.NaT)
- assert isna(mt.NaN) == pd.isna(np.NaN)
+ assert isna(mt.nan) == pd.isna(np.nan)
  assert isna(type) == pd.isna(type)
 
  # multi index
@@ -315,7 +315,7 @@ def test_notna(setup):
  assert notna(None) == pd.notna(None)
  assert notna(md.NA) == pd.notna(pd.NA)
  assert notna(md.NaT) == pd.notna(pd.NaT)
- assert notna(mt.NaN) == pd.notna(np.NaN)
+ assert notna(mt.nan) == pd.notna(np.nan)
  assert notna(type) == pd.notna(type)
 
  # multi index

python/xorbits/_mars/serialization/serializables/field_type.py

@@ -60,7 +60,7 @@ class PrimitiveType(Enum):
  PrimitiveType.float32: (float, np.float32),
  PrimitiveType.float64: (float, np.float64),
  PrimitiveType.bytes: (bytes, np.bytes_),
- PrimitiveType.string: (str, np.unicode_),
+ PrimitiveType.string: (str, np.str_),
  PrimitiveType.complex64: (complex, np.complex64),
  PrimitiveType.complex128: (complex, np.complex128),
 }

python/xorbits/_mars/tensor/__init__.py

@@ -14,7 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
 from .datasource import (
  tensor,
  array,
@@ -304,16 +303,18 @@
 # noinspection PyUnresolvedReferences
 from ..core import ExecutableTuple
 
+from numpy import __version__ as np_ver
+
+if np_ver >= "2.0.0":
+ from numpy.exceptions import AxisError
+else:
+ from numpy import AxisError
+
 # noinspection PyUnresolvedReferences
 from numpy import (
  newaxis,
- AxisError,
  inf,
- Inf,
- NINF,
  nan,
- NAN,
- NaN,
  pi,
  e,
  errstate,
@@ -337,10 +338,9 @@
  flexible,
  int_ as int,
  bool_ as bool,
- float_ as float,
- cfloat,
+ float64 as float,
  bytes_,
- unicode_,
+ str_,
  void,
  object_ as object,
  intc,

python/xorbits/_mars/tensor/arithmetic/isfinite.py

@@ -89,8 +89,6 @@ def isfinite(x, out=None, where=None, **kwargs):
  False
  >>> mt.isfinite(mt.inf).execute()
  False
- >>> mt.isfinite(mt.NINF).execute()
- False
  >>> mt.isfinite([mt.log(-1.).execute(),1.,mt.log(0).execute()]).execute()
  array([False, True, False])
 

python/xorbits/_mars/tensor/arithmetic/isinf.py

@@ -86,8 +86,6 @@ def isinf(x, out=None, where=None, **kwargs):
  True
  >>> mt.isinf(mt.nan).execute()
  False
- >>> mt.isinf(mt.NINF).execute()
- True
  >>> mt.isinf([mt.inf, -mt.inf, 1.0, mt.nan]).execute()
  array([ True, True, False, False])
 

python/xorbits/_mars/tensor/lib/index_tricks.py

@@ -16,9 +16,13 @@
 import math
 
 import numpy as np
+from numpy import __version__ as np_ver
 from numpy.core.numeric import ScalarType
-from numpy.core.numerictypes import find_common_type
-from numpy.lib.index_tricks import ndindex
+
+if np_ver >= "2.0.0":
+ from numpy.lib._index_tricks_impl import ndindex
+else:
+ from numpy.lib.index_tricks import ndindex
 
 from .. import datasource as _nx
 from ..base import ndim
@@ -344,7 +348,15 @@ def __getitem__(self, key):
  arraytypes.append(newobj.dtype)
 
  # Ensure that scalars won't up-cast unless warranted
- final_dtype = find_common_type(arraytypes, scalartypes)
+ # 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
+
+ final_dtype = find_common_type(arraytypes, scalartypes)
  if final_dtype is not None:
  for k in scalars:
  objs[k] = objs[k].astype(final_dtype)

python/xorbits/_mars/tensor/reduction/nanmax.py

@@ -111,8 +111,6 @@ def nanmax(a, axis=None, out=None, keepdims=None, combine_size=None):
 
  When positive infinity and negative infinity are present:
 
- >>> mt.nanmax([1, 2, mt.nan, mt.NINF]).execute()
- 2.0
  >>> mt.nanmax([1, 2, mt.nan, mt.inf]).execute()
  inf
 

python/xorbits/_mars/tensor/reduction/nanmin.py

@@ -113,7 +113,7 @@ def nanmin(a, axis=None, out=None, keepdims=None, combine_size=None):
 
  >>> mt.nanmin([1, 2, mt.nan, mt.inf]).execute()
  1.0
- >>> mt.nanmin([1, 2, mt.nan, mt.NINF]).execute()
+ >>> mt.nanmin([1, 2, mt.nan, -mt.inf]).execute()
  -inf
 
  """

python/xorbits/_mars/tensor/reduction/nansum.py

@@ -113,7 +113,7 @@ def nansum(a, axis=None, dtype=None, out=None, keepdims=None, combine_size=None)
  array([ 2., 1.])
  >>> mt.nansum([1, mt.nan, mt.inf]).execute()
  inf
- >>> mt.nansum([1, mt.nan, mt.NINF]).execute()
+ >>> mt.nansum([1, mt.nan, -mt.inf]).execute()
  -inf
  >>> mt.nansum([1, mt.nan, mt.inf, -mt.inf]).execute() # both +/- infinity present
  nan

python/xorbits/core/adapter.py

@@ -136,8 +136,8 @@ def register_converter(from_cls_list: List[Type]):
 
  def decorate(cls: Type):
  for from_cls in from_cls_list:
- assert from_cls not in _MARS_CLS_TO_CONVERTER
- _MARS_CLS_TO_CONVERTER[from_cls] = cls
+ if from_cls not in _MARS_CLS_TO_CONVERTER:
+  _MARS_CLS_TO_CONVERTER[from_cls] = cls
  return cls
 
  return decorate

python/xorbits/numpy/__init__.py

@@ -15,15 +15,18 @@
 import inspect
 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
+else:
+ from numpy import AxisError
+ from numpy.lib.index_tricks import ndindex
+
 from numpy import (
- NAN,
- NINF,
- AxisError,
- Inf,
- NaN,
  bool_,
  bytes_,
- cfloat,
  character,
  complex64,
  complex128,
@@ -38,7 +41,6 @@
  float16,
  float32,
  float64,
- float_,
  floating,
  generic,
  inexact,
@@ -57,17 +59,16 @@
  object_,
  pi,
  signedinteger,
+ str_,
  timedelta64,
  uint,
  uint8,
  uint16,
  uint32,
  uint64,
- unicode_,
  unsignedinteger,
  void,
 )
-from numpy.lib.index_tricks import ndindex
 
 from ..core.utils.fallback import unimplemented_func
 

python/xorbits/numpy/lib/index_tricks.py

@@ -12,6 +12,12 @@
 # See the License for the specific language governing permissions and
 # 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:
+ from numpy.lib import index_tricks
 
 from ...core.adapter import (
  MarsCClass,
@@ -30,7 +36,7 @@ def __init__(self):
  super().__init__(MarsCClass())
 
 
-attach_module_callable_docstring(CClass, numpy, numpy.lib.index_tricks.CClass)
+attach_module_callable_docstring(CClass, numpy, index_tricks.CClass)
 c_ = CClass()
 
 
@@ -40,7 +46,7 @@ def __init__(self):
  super().__init__(MarsRClass())
 
 
-attach_module_callable_docstring(RClass, numpy, numpy.lib.index_tricks.RClass)
+attach_module_callable_docstring(RClass, numpy, index_tricks.RClass)
 r_ = RClass()
 
 
@@ -50,7 +56,7 @@ def __init__(self):
  super().__init__(MarsOGridClass())
 
 
-attach_module_callable_docstring(OGridClass, numpy, numpy.lib.index_tricks.OGridClass)
+attach_module_callable_docstring(OGridClass, numpy, index_tricks.OGridClass)
 ogrid = OGridClass()
 
 
@@ -60,5 +66,5 @@ def __init__(self):
  super().__init__(MarsMGridClass())
 
 
-attach_module_callable_docstring(MGridClass, numpy, numpy.lib.index_tricks.MGridClass)
+attach_module_callable_docstring(MGridClass, numpy, index_tricks.MGridClass)
 mgrid = MGridClass()