fix numpy2

xorbitsai · Oct 13, 2024 · aa62f9f · aa62f9f
1 parent b3317ae
commit aa62f9f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/.github/workflows/python.yaml b/.github/workflows/python.yaml
@@ -75,12 +75,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
+        os: ["windows-latest"]
+        python-version: ["3.9"]
+        module: ["xorbits"]      
         # os: ["ubuntu-latest", "macos-13", "windows-latest"]
         # python-version: ["3.9", "3.10", "3.11"]
         # module: ["xorbits", "xorbits/numpy", "xorbits/pandas"]
-        os: ["windows-latest"]
-        python-version: ["3.9"]
-        module: ["xorbits"]
         exclude:
           - { os: macos-13, python-version: 3.10}
           - { os: macos-13, python-version: 3.9}
@@ -95,13 +95,13 @@ jobs:
           # - { os: ubuntu-20.04, module: hadoop, python-version: 3.9 }
           # - { os: ubuntu-latest, module: vineyard, python-version: 3.11 }
           # - { os: ubuntu-latest, module: external-storage, python-version: 3.11 }
-          # always test compatibility with the latest version
-          # - { os: ubuntu-latest, module: compatibility, python-version: 3.9 }
+          # # always test compatibility with the latest version
+          # # - { os: ubuntu-latest, module: compatibility, python-version: 3.9 }
           # - { os: ubuntu-latest, module: doc-build, python-version: 3.9 }
           # - { os: self-hosted, module: gpu, python-version: 3.11}
           # - { os: ubuntu-latest, module: jax, python-version: 3.9 }
-          # a self-hosted runner which needs computing resources, activate when necessary
-          # - { os: juicefs-ci, module: kubernetes-juicefs, python-version: 3.9 }
+          # # a self-hosted runner which needs computing resources, activate when necessary
+          # # - { os: juicefs-ci, module: kubernetes-juicefs, python-version: 3.9 }
           # - { os: ubuntu-latest, module: slurm, python-version: 3.9 }
           # - { os: ubuntu-latest, module: datasets, python-version: 3.9 }
           # - { os: ubuntu-latest, module: kubernetes, python-version: 3.11 }

diff --git a/python/xorbits/_mars/core/operand/core.py b/python/xorbits/_mars/core/operand/core.py
@@ -19,8 +19,13 @@
 import numpy as np
 from xoscar.metrics import Metrics
 
+from ....utils import is_numpy_2
+
 try:
-    from numpy.core._exceptions import UFuncTypeError
+    if is_numpy_2:
+        from numpy._core._exceptions import UFuncTypeError
+    else:
+        from numpy.core._exceptions import UFuncTypeError
 except ImportError:  # pragma: no cover
     UFuncTypeError = None