Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions cuda_core/tests/test_memory.py
Original file line number Diff line number Diff line change
Expand Up @@ -1474,11 +1474,11 @@ def test_pinned_mr_numa_id_default_no_ipc(init_cuda):
device = Device()
skip_if_pinned_memory_unsupported(device)

mr = PinnedMemoryResource(PinnedMemoryResourceOptions())
mr = create_pinned_memory_resource_or_xfail(PinnedMemoryResourceOptions(), xfail_device=device)
assert mr.numa_id == -1
mr.close()

mr = PinnedMemoryResource(PinnedMemoryResourceOptions(ipc_enabled=False))
mr = create_pinned_memory_resource_or_xfail(PinnedMemoryResourceOptions(ipc_enabled=False), xfail_device=device)
assert mr.numa_id == -1
mr.close()

Expand All @@ -1497,7 +1497,9 @@ def test_pinned_mr_numa_id_default_with_ipc(init_cuda):
if expected_numa_id < 0:
pytest.skip("System does not support NUMA")

mr = PinnedMemoryResource(PinnedMemoryResourceOptions(ipc_enabled=True, max_size=POOL_SIZE))
mr = create_pinned_memory_resource_or_xfail(
PinnedMemoryResourceOptions(ipc_enabled=True, max_size=POOL_SIZE), xfail_device=device
)
assert mr.numa_id == expected_numa_id
mr.close()

Expand All @@ -1511,7 +1513,7 @@ def test_pinned_mr_numa_id_explicit(init_cuda):
if host_numa_id < 0:
pytest.skip("System does not support NUMA")

mr = PinnedMemoryResource(PinnedMemoryResourceOptions(numa_id=host_numa_id))
mr = create_pinned_memory_resource_or_xfail(PinnedMemoryResourceOptions(numa_id=host_numa_id), xfail_device=device)
assert mr.numa_id == host_numa_id
mr.close()

Expand All @@ -1520,7 +1522,10 @@ def test_pinned_mr_numa_id_explicit(init_cuda):
if not supports_ipc_mempool(device):
pytest.skip("Driver rejects IPC-enabled mempool creation on this platform")

mr = PinnedMemoryResource(PinnedMemoryResourceOptions(ipc_enabled=True, numa_id=host_numa_id, max_size=POOL_SIZE))
mr = create_pinned_memory_resource_or_xfail(
PinnedMemoryResourceOptions(ipc_enabled=True, numa_id=host_numa_id, max_size=POOL_SIZE),
xfail_device=device,
)
assert mr.numa_id == host_numa_id
mr.close()

Expand Down
Loading