Skip to content

Commit

Permalink
Merge branch 'branch-25.02' into branch-25.04-merge-branch-25.02
Browse files Browse the repository at this point in the history
  • Loading branch information
vyasr committed Mar 1, 2025
2 parents 83a29ce + 09ebf31 commit d6285fc
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion python/cudf/cudf/core/subword_tokenizer.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ def _cast_to_appropriate_type(ar, cast_type):
elif cast_type == "tf":
from tensorflow.experimental.dlpack import from_dlpack

return from_dlpack(ar.astype(np.dtype(np.int32)).toDlpack())
return from_dlpack(ar.astype(np.dtype(np.int32)).__dlpack__())


class SubwordTokenizer:
Expand Down
6 changes: 3 additions & 3 deletions python/cudf/cudf/tests/test_dlpack.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2019-2024, NVIDIA CORPORATION.
# Copyright (c) 2019-2025, NVIDIA CORPORATION.

import itertools
from contextlib import ExitStack as does_not_raise
Expand Down Expand Up @@ -140,7 +140,7 @@ def test_to_dlpack_cupy_2d(data_2d):
def test_from_dlpack_cupy_1d(data_1d):
cupy_array = cupy.array(data_1d)
cupy_host_array = cupy_array.get()
dlt = cupy_array.toDlpack()
dlt = cupy_array.__dlpack__()

gs = cudf.from_dlpack(dlt)
cudf_host_array = gs.to_numpy(na_value=np.nan)
Expand All @@ -151,7 +151,7 @@ def test_from_dlpack_cupy_1d(data_1d):
def test_from_dlpack_cupy_2d(data_2d):
cupy_array = cupy.array(data_2d, order="F")
cupy_host_array = cupy_array.get().flatten()
dlt = cupy_array.toDlpack()
dlt = cupy_array.__dlpack__()

gdf = cudf.from_dlpack(dlt)
cudf_host_array = np.array(gdf.to_pandas()).flatten()
Expand Down

0 comments on commit d6285fc

Please sign in to comment.