Skip to content

Commit

Permalink
Merge pull request #17907 from rapidsai/branch-25.02
Browse files Browse the repository at this point in the history
Forward-merge branch-25.02 into branch-25.04
  • Loading branch information
GPUtester authored Feb 3, 2025
2 parents ddd9a69 + d4bda07 commit 3840125
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 1 deletion.
3 changes: 2 additions & 1 deletion python/cudf/cudf/pandas/_wrappers/numpy.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# SPDX-FileCopyrightText: Copyright (c) 2023-2024, NVIDIA CORPORATION & AFFILIATES.
# SPDX-FileCopyrightText: Copyright (c) 2023-2025, NVIDIA CORPORATION & AFFILIATES.
# All rights reserved.
# SPDX-License-Identifier: Apache-2.0

Expand Down Expand Up @@ -149,6 +149,7 @@ def ndarray__array_ufunc__(self, ufunc, method, *inputs, **kwargs):
# Special wrapping to handle scalar values
"_fsproxy_wrap": classmethod(wrap_ndarray),
"base": _FastSlowAttribute("base", private=True),
"data": _FastSlowAttribute("data", private=True),
},
)

Expand Down
9 changes: 9 additions & 0 deletions python/cudf/cudf_pandas_tests/test_cudf_pandas.py
Original file line number Diff line number Diff line change
Expand Up @@ -1927,3 +1927,12 @@ def test_series_dtype_property():
expected = np.dtype(s)
actual = np.dtype(xs)
assert expected == actual


def test_numpy_data_access():
s = pd.Series([1, 2, 3])
xs = xpd.Series([1, 2, 3])
expected = s.values.data
actual = xs.values.data

assert type(expected) is type(actual)

0 comments on commit 3840125

Please sign in to comment.