Use DeviceMemoryResourceOptions throughout tests.

Author: Andy-Jost

cuda_core/tests/memory_ipc/conftest.py

@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 import pytest
-from cuda.core.experimental import Device, DeviceMemoryResource
+from cuda.core.experimental import Device, DeviceMemoryResource, DeviceMemoryResourceOptions
 
 POOL_SIZE = 2097152
 
@@ -27,6 +27,7 @@ def device():
 
 @pytest.fixture
 def ipc_memory_resource(device):
-    mr = DeviceMemoryResource(device, dict(max_size=POOL_SIZE, ipc_enabled=True))
+    options = DeviceMemoryResourceOptions(max_size=POOL_SIZE, ipc_enabled=True)
+    mr = DeviceMemoryResource(device, options=options)
     assert mr.is_ipc_enabled
     return mr

cuda_core/tests/memory_ipc/test_errors.py

@@ -4,7 +4,7 @@
 import multiprocessing
 import re
 
-from cuda.core.experimental import Buffer, Device, DeviceMemoryResource
+from cuda.core.experimental import Buffer, Device, DeviceMemoryResource, DeviceMemoryResourceOptions
 from cuda.core.experimental._utils.cuda_utils import CUDAError
 
 CHILD_TIMEOUT_SEC = 4
@@ -71,7 +71,8 @@ class TestImportWrongMR(ChildErrorHarness):
     """Error when importing a buffer from the wrong memory resource."""
 
     def PARENT_ACTION(self, queue):
-        mr2 = DeviceMemoryResource(self.device, dict(max_size=POOL_SIZE, ipc_enabled=True))
+        options = DeviceMemoryResourceOptions(max_size=POOL_SIZE, ipc_enabled=True)
+        mr2 = DeviceMemoryResource(self.device, options=options)
         buffer = mr2.allocate(NBYTES)
         queue.put([self.mr, buffer.get_ipc_descriptor()])  # Note: mr does not own this buffer
 
@@ -124,7 +125,8 @@ class TestDanglingBuffer(ChildErrorHarness):
     """
 
     def PARENT_ACTION(self, queue):
-        mr2 = DeviceMemoryResource(self.device, dict(max_size=POOL_SIZE, ipc_enabled=True))
+        options = DeviceMemoryResourceOptions(max_size=POOL_SIZE, ipc_enabled=True)
+        mr2 = DeviceMemoryResource(self.device, options=options)
         self.buffer = mr2.allocate(NBYTES)
         queue.put(self.buffer)  # Note: mr2 not sent
 

cuda_core/tests/memory_ipc/test_send_buffers.py

@@ -4,7 +4,7 @@
 import multiprocessing
 from itertools import cycle
 
-from cuda.core.experimental import Device, DeviceMemoryResource
+from cuda.core.experimental import Device, DeviceMemoryResource, DeviceMemoryResourceOptions
 from utility import IPCBufferTestHelper
 
 CHILD_TIMEOUT_SEC = 4
@@ -41,9 +41,8 @@ def test_ipc_send_buffers(device, ipc_memory_resource):
 def test_ipc_send_buffers_multi(device, ipc_memory_resource):
     """Test passing buffers sourced from multiple memory resources."""
     # Set up several IPC-enabled memory pools.
-    mrs = [ipc_memory_resource] + [
-        DeviceMemoryResource(device, dict(max_size=POOL_SIZE, ipc_enabled=True)) for _ in range(NMRS - 1)
-    ]
+    options = DeviceMemoryResourceOptions(max_size=POOL_SIZE, ipc_enabled=True)
+    mrs = [ipc_memory_resource] + [DeviceMemoryResource(device, options=options) for _ in range(NMRS - 1)]
 
     # Allocate and fill memory.
     buffers = [mr.allocate(NBYTES) for mr, _ in zip(cycle(mrs), range(NTASKS))]

cuda_core/tests/memory_ipc/test_workerpool.py

@@ -4,7 +4,7 @@
 import multiprocessing
 from itertools import cycle
 
-from cuda.core.experimental import Buffer, Device, DeviceMemoryResource
+from cuda.core.experimental import Buffer, Device, DeviceMemoryResource, DeviceMemoryResourceOptions
 from utility import IPCBufferTestHelper
 
 CHILD_TIMEOUT_SEC = 4
@@ -43,9 +43,8 @@ def test_ipc_workerpool(self, device, ipc_memory_resource):
 
     def test_ipc_workerpool_multi_mr(self, device, ipc_memory_resource):
         """Test IPC with a worker pool using multiple memory resources."""
-        mrs = [ipc_memory_resource] + [
-            DeviceMemoryResource(device, dict(max_size=POOL_SIZE, ipc_enabled=True)) for _ in range(NMRS - 1)
-        ]
+        options = DeviceMemoryResourceOptions(max_size=POOL_SIZE, ipc_enabled=True)
+        mrs = [ipc_memory_resource] + [DeviceMemoryResource(device, options=options) for _ in range(NMRS - 1)]
         buffers = [mr.allocate(NBYTES) for mr, _ in zip(cycle(mrs), range(NTASKS))]
         with multiprocessing.Pool(processes=NWORKERS, initializer=self.init_worker, initargs=(mrs,)) as pool:
             pool.starmap(
@@ -88,9 +87,8 @@ def test_ipc_workerpool(self, device, ipc_memory_resource):
 
     def test_ipc_workerpool_multi_mr(self, device, ipc_memory_resource):
         """Test IPC with a worker pool using multiple memory resources."""
-        mrs = [ipc_memory_resource] + [
-            DeviceMemoryResource(device, dict(max_size=POOL_SIZE, ipc_enabled=True)) for _ in range(NMRS - 1)
-        ]
+        options = DeviceMemoryResourceOptions(max_size=POOL_SIZE, ipc_enabled=True)
+        mrs = [ipc_memory_resource] + [DeviceMemoryResource(device, options=options) for _ in range(NMRS - 1)]
         buffers = [mr.allocate(NBYTES) for mr, _ in zip(cycle(mrs), range(NTASKS))]
         with multiprocessing.Pool(processes=NWORKERS, initializer=self.init_worker, initargs=(mrs,)) as pool:
             pool.map(self.process_buffer, buffers)

cuda_core/tests/test_memory.py

@@ -10,7 +10,7 @@
 import platform
 
 import pytest
-from cuda.core.experimental import Buffer, Device, DeviceMemoryResource, MemoryResource
+from cuda.core.experimental import Buffer, Device, DeviceMemoryResource, DeviceMemoryResourceOptions, MemoryResource
 from cuda.core.experimental._memory import DLDeviceType, IPCBufferDescriptor
 from cuda.core.experimental._utils.cuda_utils import handle_return
 
@@ -304,7 +304,8 @@ def test_mempool(mempool_device):
     device = mempool_device
 
     # Test basic pool creation
-    mr = DeviceMemoryResource(device, dict(max_size=POOL_SIZE, ipc_enabled=False))
+    options = DeviceMemoryResourceOptions(max_size=POOL_SIZE, ipc_enabled=False)
+    mr = DeviceMemoryResource(device, options=options)
     assert mr.device_id == device.device_id
     assert mr.is_device_accessible
     assert not mr.is_host_accessible
@@ -379,7 +380,8 @@ def test_mempool_attributes(ipc_enabled, mempool_device, property_name, expected
     if platform.system() == "Windows":
         return  # IPC not implemented for Windows
 
-    mr = DeviceMemoryResource(device, dict(max_size=POOL_SIZE, ipc_enabled=ipc_enabled))
+    options = DeviceMemoryResourceOptions(max_size=POOL_SIZE, ipc_enabled=ipc_enabled)
+    mr = DeviceMemoryResource(device, options=options)
     assert mr.is_ipc_enabled == ipc_enabled
 
     # Get the property value