Skip to content

Commit 6e790f7

Browse files
rwgkcursoragent
andcommitted
test: restore managed helper skip naming
Keep the established managed-memory test helper name so call sites stay readable, while documenting that Windows MCDM mempool OOM setup failures are xfailed rather than skipped. Co-authored-by: Cursor <[email protected]>
1 parent 20c8a7a commit 6e790f7

3 files changed

Lines changed: 21 additions & 19 deletions

File tree

‎cuda_core/tests/conftest.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,9 @@ def skip_if_managed_memory_unsupported(device):
7171
raise
7272

7373

74-
def create_managed_memory_resource_or_xfail(*args, xfail_device=None, **kwargs):
74+
def create_managed_memory_resource_or_skip(*args, xfail_device=None, **kwargs):
75+
# Keep the established "skip" helper name for call-site readability, even though
76+
# Windows MCDM mempool OOM setup failures are xfailed instead of skipped.
7577
try:
7678
return ManagedMemoryResource(*args, **kwargs)
7779
except CUDAError as e:

‎cuda_core/tests/test_memory.py‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
from helpers.buffers import DummyUnifiedMemoryResource, TrackingMR
2222

2323
from conftest import (
24-
create_managed_memory_resource_or_xfail,
24+
create_managed_memory_resource_or_skip,
2525
create_pinned_memory_resource_or_skip,
2626
skip_if_managed_memory_unsupported,
2727
skip_if_pinned_memory_unsupported,
@@ -618,7 +618,7 @@ def test_managed_memory_resource_buffer_dlpack_device_type():
618618
device = Device()
619619
device.set_current()
620620
skip_if_managed_memory_unsupported(device)
621-
mr = create_managed_memory_resource_or_xfail(ManagedMemoryResourceOptions(preferred_location=device.device_id))
621+
mr = create_managed_memory_resource_or_skip(ManagedMemoryResourceOptions(preferred_location=device.device_id))
622622
buf = mr.allocate(1024)
623623

624624
assert mr.is_managed
@@ -714,7 +714,7 @@ def test_managed_memory_resource_initialization(init_cuda):
714714

715715
device.set_current()
716716

717-
mr = create_managed_memory_resource_or_xfail()
717+
mr = create_managed_memory_resource_or_skip()
718718
assert mr.is_device_accessible
719719
assert mr.is_host_accessible
720720

@@ -1029,7 +1029,7 @@ def test_managed_memory_resource_with_options(init_cuda):
10291029

10301030
# Test basic pool creation
10311031
options = ManagedMemoryResourceOptions()
1032-
mr = create_managed_memory_resource_or_xfail(options)
1032+
mr = create_managed_memory_resource_or_skip(options)
10331033
assert mr.is_device_accessible
10341034
assert mr.is_host_accessible
10351035
assert not mr.is_ipc_enabled
@@ -1072,7 +1072,7 @@ def test_managed_memory_resource_preferred_location_default(init_cuda):
10721072
skip_if_managed_memory_unsupported(device)
10731073
device.set_current()
10741074

1075-
mr = create_managed_memory_resource_or_xfail()
1075+
mr = create_managed_memory_resource_or_skip()
10761076
assert mr.preferred_location is None
10771077

10781078

@@ -1084,15 +1084,15 @@ def test_managed_memory_resource_preferred_location_device(init_cuda):
10841084

10851085
# Legacy style
10861086
opts = ManagedMemoryResourceOptions(preferred_location=device.device_id)
1087-
mr = create_managed_memory_resource_or_xfail(opts)
1087+
mr = create_managed_memory_resource_or_skip(opts)
10881088
assert mr.preferred_location == ("device", device.device_id)
10891089

10901090
# Explicit style
10911091
opts = ManagedMemoryResourceOptions(
10921092
preferred_location=device.device_id,
10931093
preferred_location_type="device",
10941094
)
1095-
mr = create_managed_memory_resource_or_xfail(opts)
1095+
mr = create_managed_memory_resource_or_skip(opts)
10961096
assert mr.preferred_location == ("device", device.device_id)
10971097

10981098

@@ -1104,12 +1104,12 @@ def test_managed_memory_resource_preferred_location_host(init_cuda):
11041104

11051105
# Legacy style
11061106
opts = ManagedMemoryResourceOptions(preferred_location=-1)
1107-
mr = create_managed_memory_resource_or_xfail(opts)
1107+
mr = create_managed_memory_resource_or_skip(opts)
11081108
assert mr.preferred_location == ("host", None)
11091109

11101110
# Explicit style
11111111
opts = ManagedMemoryResourceOptions(preferred_location_type="host")
1112-
mr = create_managed_memory_resource_or_xfail(opts)
1112+
mr = create_managed_memory_resource_or_skip(opts)
11131113
assert mr.preferred_location == ("host", None)
11141114

11151115

@@ -1125,15 +1125,15 @@ def test_managed_memory_resource_preferred_location_host_numa(init_cuda):
11251125

11261126
# Auto-resolved from current device
11271127
opts = ManagedMemoryResourceOptions(preferred_location_type="host_numa")
1128-
mr = create_managed_memory_resource_or_xfail(opts)
1128+
mr = create_managed_memory_resource_or_skip(opts)
11291129
assert mr.preferred_location == ("host_numa", numa_id)
11301130

11311131
# Explicit NUMA node ID
11321132
opts = ManagedMemoryResourceOptions(
11331133
preferred_location=numa_id,
11341134
preferred_location_type="host_numa",
11351135
)
1136-
mr = create_managed_memory_resource_or_xfail(opts)
1136+
mr = create_managed_memory_resource_or_skip(opts)
11371137
assert mr.preferred_location == ("host_numa", numa_id)
11381138

11391139

@@ -1424,7 +1424,7 @@ def test_mempool_attributes(ipc_enabled, memory_resource_factory, property_name,
14241424
assert mr.is_ipc_enabled == ipc_enabled
14251425
elif MR is ManagedMemoryResource:
14261426
options = MRops()
1427-
mr = create_managed_memory_resource_or_xfail(options)
1427+
mr = create_managed_memory_resource_or_skip(options)
14281428
assert not mr.is_ipc_enabled
14291429

14301430
# Get the property value
@@ -1477,7 +1477,7 @@ def test_mempool_attributes_repr(memory_resource_factory):
14771477
elif MR is PinnedMemoryResource:
14781478
mr = MR(options={"max_size": 2048})
14791479
elif MR is ManagedMemoryResource:
1480-
mr = create_managed_memory_resource_or_xfail(options={})
1480+
mr = create_managed_memory_resource_or_skip(options={})
14811481

14821482
buffer1 = mr.allocate(64)
14831483
buffer2 = mr.allocate(64)
@@ -1514,7 +1514,7 @@ def test_mempool_attributes_ownership(memory_resource_factory):
15141514
elif MR is PinnedMemoryResource:
15151515
mr = MR({"max_size": POOL_SIZE})
15161516
elif MR is ManagedMemoryResource:
1517-
mr = create_managed_memory_resource_or_xfail({})
1517+
mr = create_managed_memory_resource_or_skip({})
15181518

15191519
attributes = mr.attributes
15201520
mr.close()
@@ -1585,7 +1585,7 @@ def test_memory_resource_alloc_zero_bytes(init_cuda, memory_resource_factory):
15851585
mr = create_pinned_memory_resource_or_skip(xfail_device=device)
15861586
elif MR is ManagedMemoryResource:
15871587
skip_if_managed_memory_unsupported(device)
1588-
mr = create_managed_memory_resource_or_xfail(MROps(preferred_location=device.device_id))
1588+
mr = create_managed_memory_resource_or_skip(MROps(preferred_location=device.device_id))
15891589
else:
15901590
assert MR is DeviceMemoryResource
15911591
mr = MR(device)

‎cuda_core/tests/test_tensor_map.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import numpy as np
55
import pytest
66

7-
from conftest import create_managed_memory_resource_or_xfail, skip_if_managed_memory_unsupported
7+
from conftest import create_managed_memory_resource_or_skip, skip_if_managed_memory_unsupported
88
from cuda.core import (
99
Device,
1010
ManagedMemoryResourceOptions,
@@ -403,7 +403,7 @@ def test_replace_address_accepts_managed_buffer_on_nonzero_device(self, init_cud
403403
data_type=TensorMapDataType.FLOAT32,
404404
)
405405

406-
mr = create_managed_memory_resource_or_xfail(ManagedMemoryResourceOptions(preferred_location=dev1.device_id))
406+
mr = create_managed_memory_resource_or_skip(ManagedMemoryResourceOptions(preferred_location=dev1.device_id))
407407
managed_buf = mr.allocate(1024 * 4)
408408

409409
desc.replace_address(managed_buf)
@@ -442,7 +442,7 @@ def test_from_tiled_accepts_managed_buffer_on_nonzero_device(self, init_cuda):
442442
skip_if_managed_memory_unsupported(dev1)
443443

444444
dev1.set_current()
445-
mr = create_managed_memory_resource_or_xfail(ManagedMemoryResourceOptions(preferred_location=dev1.device_id))
445+
mr = create_managed_memory_resource_or_skip(ManagedMemoryResourceOptions(preferred_location=dev1.device_id))
446446
managed_buf = mr.allocate(1024 * 4)
447447

448448
desc = _as_view(managed_buf).as_tensor_map(

0 commit comments

Comments
 (0)