Skip to content

Commit 1a71e4c

Browse files
committed
Fix all binops bugs
1 parent 599042f commit 1a71e4c

2 files changed

Lines changed: 11 additions & 9 deletions

File tree

python/cudf/cudf/core/column/column.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2440,7 +2440,9 @@ def __cuda_array_interface__(self) -> Mapping[str, Any]:
24402440
output = {
24412441
"shape": (len(self),),
24422442
"strides": (self.dtype.itemsize,),
2443-
"typestr": self.dtype.str,
2443+
"typestr": self.dtype.numpy_dtype.str
2444+
if not isinstance(self.dtype, np.dtype)
2445+
else self.dtype.str,
24442446
"data": (
24452447
data_buf.ptr + self.offset * self.dtype.itemsize,
24462448
False,

python/cudf/cudf/tests/dataframe/test_binops.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -382,12 +382,12 @@ def test_df_sr_binop(psr, colnames, binary_op):
382382
data = [[3.0, 2.0, 5.0], [3.0, None, 5.0], [6.0, 7.0, np.nan]]
383383
data = dict(zip(colnames, data, strict=True))
384384

385-
gsr = cudf.Series(psr).astype("float64")
385+
gsr = cudf.Series(psr).astype("Float64")
386386

387-
gdf = cudf.DataFrame(data)
388-
pdf = gdf.to_pandas(nullable=True)
387+
gdf = cudf.DataFrame(data).astype("Float64")
388+
pdf = gdf.to_pandas()
389389

390-
psr = gsr.to_pandas(nullable=True)
390+
psr = gsr.to_pandas()
391391

392392
try:
393393
expect = binary_op(pdf, psr)
@@ -399,12 +399,12 @@ def test_df_sr_binop(psr, colnames, binary_op):
399399
with pytest.raises(ValueError):
400400
binary_op(gsr, gdf)
401401
else:
402-
got = binary_op(gdf, gsr).to_pandas(nullable=True)
403-
assert_eq(expect, got, check_dtype=False, check_like=True)
402+
got = binary_op(gdf, gsr)
403+
assert_eq(expect, got)
404404

405405
expect = binary_op(psr, pdf)
406-
got = binary_op(gsr, gdf).to_pandas(nullable=True)
407-
assert_eq(expect, got, check_dtype=False, check_like=True)
406+
got = binary_op(gsr, gdf)
407+
assert_eq(expect, got)
408408

409409

410410
@pytest.mark.parametrize(

0 commit comments

Comments
 (0)