Skip to content

Commit

Permalink
Add assert_column_memory_* (#9882)
Browse files Browse the repository at this point in the history
This PR refactors `test_index.py::test_index_copy_deep` and adds test utility function `assert_column_memory_eq` and `assert_column_memory_ne`, which tests if two cudf columns possess (or not possess) the same piece of memory.

Authors:
  - Michael Wang (https://github.com/isVoid)

Approvers:
  - Ashwin Srinath (https://github.com/shwina)

URL: #9882
  • Loading branch information
isVoid authored Mar 8, 2022
1 parent e9876cf commit 555fb63
Show file tree
Hide file tree
Showing 3 changed files with 95 additions and 56 deletions.
29 changes: 29 additions & 0 deletions python/cudf/cudf/testing/_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -333,6 +333,35 @@ def xfail_param(param, **kwargs):
return pytest.param(param, marks=pytest.mark.xfail(**kwargs))


def assert_column_memory_eq(
lhs: cudf.core.column.ColumnBase, rhs: cudf.core.column.ColumnBase
):
"""Assert the memory location and size of `lhs` and `rhs` are equivalent.
Both data pointer and mask pointer are checked. Also recursively check for
children to the same contarints. Also fails check if the number of children
mismatches at any level.
"""
assert lhs.base_data_ptr == rhs.base_data_ptr
assert lhs.base_mask_ptr == rhs.base_mask_ptr
assert lhs.base_size == rhs.base_size
assert lhs.offset == rhs.offset
assert lhs.size == rhs.size
assert len(lhs.base_children) == len(rhs.base_children)
for lhs_child, rhs_child in zip(lhs.base_children, rhs.base_children):
assert_column_memory_eq(lhs_child, rhs_child)


def assert_column_memory_ne(
lhs: cudf.core.column.ColumnBase, rhs: cudf.core.column.ColumnBase
):
try:
assert_column_memory_eq(lhs, rhs)
except AssertionError:
return
raise AssertionError("lhs and rhs holds the same memory.")


parametrize_numeric_dtypes_pairwise = pytest.mark.parametrize(
"left_dtype,right_dtype",
list(itertools.combinations_with_replacement(NUMERIC_TYPES, 2)),
Expand Down
60 changes: 6 additions & 54 deletions python/cudf/cudf/tests/test_index.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
SIGNED_INTEGER_TYPES,
SIGNED_TYPES,
UNSIGNED_TYPES,
assert_column_memory_eq,
assert_column_memory_ne,
assert_eq,
assert_exceptions_equal,
)
Expand Down Expand Up @@ -391,62 +393,12 @@ def test_index_copy_category(name, dtype, deep=True):
],
)
def test_index_copy_deep(idx, deep):
"""Test if deep copy creates a new instance for device data.
The general criterion is to compare `Buffer.ptr` between two data objects.
Specifically for:
- CategoricalIndex, this applies to both `.codes` and `.categories`
- StringIndex, to every element in `._base_children`
- Others, to `.base_data`
No test is defined for RangeIndex.
"""
"""Test if deep copy creates a new instance for device data."""
idx_copy = idx.copy(deep=deep)
same_ref = not deep
if isinstance(idx, cudf.CategoricalIndex):
assert (
idx._values.codes.base_data.ptr
== idx_copy._values.codes.base_data.ptr
) == same_ref
if isinstance(
idx._values.categories, cudf.core.column.string.StringColumn
):
children = idx._values.categories._base_children
copy_children = idx_copy._values.categories._base_children
assert all(
[
(
children[i].base_data.ptr
== copy_children[i].base_data.ptr
)
== same_ref
for i in range(len(children))
]
)
elif isinstance(
idx._values.categories, cudf.core.column.numerical.NumericalColumn
):
assert (
idx._values.categories.base_data.ptr
== idx_copy._values.categories.base_data.ptr
) == same_ref
elif isinstance(idx, cudf.StringIndex):
children = idx._values._base_children
copy_children = idx_copy._values._base_children
assert all(
[
(
(
children[i].base_data.ptr
== copy_children[i].base_data.ptr
)
== same_ref
)
for i in range(len(children))
]
)
if not deep:
assert_column_memory_eq(idx._values, idx_copy._values)
else:
assert (
idx._values.base_data.ptr == idx_copy._values.base_data.ptr
) == same_ref
assert_column_memory_ne(idx._values, idx_copy._values)


@pytest.mark.parametrize("idx", [[1, None, 3, None, 5]])
Expand Down
62 changes: 60 additions & 2 deletions python/cudf/cudf/tests/test_testing.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
# Copyright (c) 2020, NVIDIA CORPORATION.
# Copyright (c) 2020-2022, NVIDIA CORPORATION.

import numpy as np
import pandas as pd
import pyarrow as pa
import pytest

import cudf
Expand All @@ -11,10 +12,28 @@
assert_index_equal,
assert_series_equal,
)
from cudf.testing._utils import NUMERIC_TYPES, OTHER_TYPES, assert_eq
from cudf.testing._utils import (
NUMERIC_TYPES,
OTHER_TYPES,
assert_column_memory_eq,
assert_column_memory_ne,
assert_eq,
)
from cudf.testing.testing import assert_column_equal


@pytest.fixture(
params=[
pa.array([*range(10)]),
pa.array(["hello", "world", "rapids", "AI"]),
pa.array([[1, 2, 3], [4, 5], [6], [], [7]]),
pa.array([{"f0": "hello", "f1": 42}, {"f0": "world", "f1": 3}]),
]
)
def arrow_arrays(request):
return request.param


@pytest.mark.parametrize("rdata", [[1, 2, 5], [1, 2, 6], [1, 2, 5, 6]])
@pytest.mark.parametrize("exact", ["equiv", True, False])
@pytest.mark.parametrize("check_names", [True, False])
Expand Down Expand Up @@ -369,3 +388,42 @@ def test_basic_scalar_equality(left, right):
def test_basic_scalar_inequality(left, right):
with pytest.raises(AssertionError, match=r".*not (almost )?equal.*"):
assert_eq(left, right)


def test_assert_column_memory_basic(arrow_arrays):
left = cudf.core.column.ColumnBase.from_arrow(arrow_arrays)
right = cudf.core.column.ColumnBase.from_arrow(arrow_arrays)

with pytest.raises(AssertionError):
assert_column_memory_eq(left, right)
assert_column_memory_ne(left, right)


def test_assert_column_memory_slice(arrow_arrays):
col = cudf.core.column.ColumnBase.from_arrow(arrow_arrays)
left = col[0:1]
right = col[1:2]

with pytest.raises(AssertionError):
assert_column_memory_eq(left, right)
assert_column_memory_ne(left, right)

with pytest.raises(AssertionError):
assert_column_memory_eq(left, col)
assert_column_memory_ne(left, col)

with pytest.raises(AssertionError):
assert_column_memory_eq(right, col)
assert_column_memory_ne(right, col)


def test_assert_column_memory_basic_same(arrow_arrays):
data = cudf.core.column.ColumnBase.from_arrow(arrow_arrays)
buf = cudf.core.buffer.Buffer(data=data.base_data, owner=data)

left = cudf.core.column.build_column(buf, dtype=np.int32)
right = cudf.core.column.build_column(buf, dtype=np.int32)

assert_column_memory_eq(left, right)
with pytest.raises(AssertionError):
assert_column_memory_ne(left, right)

0 comments on commit 555fb63

Please sign in to comment.