Merge branch 'main' into chore/asv

python/xorbits/_mars/dataframe/core.py

@@ -954,6 +954,16 @@ def __str__(self):
     def __repr__(self):
         return self._to_str(representation=True)
 
+    def _to_arr(self):
+        if len(self._executed_sessions) == 0:  # pragma: no cover
+            raise NotImplementedError
+
+        data = self.fetch(session=self._executed_sessions[-1])
+        return np.asarray(data)
+
+    def __array__(self):
+        return self._to_arr()
+
     def _to_mars_tensor(self, dtype=None, order="K", extract_multi_index=False):
         tensor = self.to_tensor(extract_multi_index=extract_multi_index)
         dtype = dtype if dtype is not None else tensor.dtype
@@ -1414,6 +1424,16 @@ def __str__(self):
     def __repr__(self):
         return self._to_str(representation=False)
 
+    def _to_arr(self):
+        if len(self._executed_sessions) == 0:  # pragma: no cover
+            raise NotImplementedError
+
+        data = self.fetch(session=self._executed_sessions[-1])
+        return np.asarray(data)
+
+    def __array__(self):
+        return self._to_arr()
+
     @property
     def dtype(self):
         return getattr(self, "_dtype", None) or getattr(self.op, "dtype", None)

python/xorbits/_mars/dataframe/tests/test_core.py

@@ -442,3 +442,27 @@ def test_mars_tensor_magic(setup):
     np.testing.assert_array_equal(expected, actual)
     with pytest.raises(ValueError, match="could not convert string to float"):
         DataFrame(expected).__mars_tensor__(dtype="float64").execute()
+
+
+def test_series_and_index_array(setup):
+    data = np.random.rand(10)
+    series = Series(data).execute()
+
+    array = np.array(series)
+    np.testing.assert_array_equal(array, data)
+
+    df = pd.DataFrame({"a": [1, 2], "b": ["foo", "bar"]})
+    xdf = DataFrame(df)
+    index = xdf.index.execute()
+    np.testing.assert_array_equal(np.array(df.index), np.array(index))
+
+    arrays = [
+        ["bar", "bar", "baz", "baz", "foo", "foo", "qux", "qux"],
+        ["one", "two", "one", "two", "one", "two", "one", "two"],
+    ]
+    tuples = list(zip(*arrays))
+    index = pd.MultiIndex.from_tuples(tuples, names=["first", "second"])
+    s = pd.Series(np.random.randn(8), index=index)
+    xs = Series(s).index.execute()
+
+    np.testing.assert_array_equal(np.array(s.index), np.array(xs))