Change which uuid API is "default"

Author: mdboom

cuda_core/cuda/core/system/_device.pyx

@@ -133,19 +133,20 @@ cdef class Device:
         board serial identifier.
 
         In the upstream NVML C++ API, the UUID includes a ``gpu-`` or ``mig-``
-        prefix.  If you want that prefix, use the `uuid_with_prefix` property.
+        prefix.  If you a `uuid` without that prefix (for example, to interact
+        with CUDA), use the `uuid_without_prefix` property.
         """
-        # NVML UUIDs have a `GPU-` or `MIG-` prefix.  We remove that here.
-        return nvml.device_get_uuid(self._handle)[4:]
+        return nvml.device_get_uuid(self._handle)
 
     @property
-    def uuid_with_prefix(self) -> str:
+    def uuid_without_prefix(self) -> str:
         """
         Retrieves the globally unique immutable UUID associated with this
         device, as a 5 part hexadecimal string, that augments the immutable,
         board serial identifier.
         """
-        return nvml.device_get_uuid(self._handle)
+        # NVML UUIDs have a `GPU-` or `MIG-` prefix.  We remove that here.
+        return nvml.device_get_uuid(self._handle)[4:]
 
     @property
     def pci_bus_id(self) -> str:
@@ -272,7 +273,7 @@ cdef class Device:
         # search all the devices for one with a matching UUID.
 
         for cuda_device in CudaDevice.get_all_devices():
-            if cuda_device.uuid == self.uuid:
+            if cuda_device.uuid == self.uuid_without_prefix:
                 return cuda_device
 
         raise RuntimeError("No corresponding CUDA device found for this NVML device.")

cuda_core/tests/system/test_system_device.py

@@ -57,7 +57,7 @@ def test_to_cuda_device():
         cuda_device = device.to_cuda_device()
 
         assert isinstance(cuda_device, CudaDevice)
-        assert cuda_device.uuid == device.uuid
+        assert cuda_device.uuid == device.uuid_without_prefix
 
         # Technically, this test will only work with PCI devices, but are there
         # non-PCI devices we need to support?
@@ -227,9 +227,9 @@ def test_device_serial():
         assert len(serial) > 0
 
 
-def test_device_uuid():
+def test_device_uuid_without_prefix():
     for device in system.Device.get_all_devices():
-        uuid = device.uuid
+        uuid = device.uuid_without_prefix
         assert isinstance(uuid, str)
 
         # Expands to GPU-8hex-4hex-4hex-4hex-12hex, where 8hex means 8 consecutive
@@ -750,9 +750,9 @@ def test_mig():
                     assert isinstance(mig_device, system.Device)
 
 
-def test_uuid_with_prefix():
+def test_uuid():
     for device in system.Device.get_all_devices():
-        uuid_with_prefix = device.uuid_with_prefix
-        assert isinstance(uuid_with_prefix, str)
-        assert uuid_with_prefix.startswith(("GPU-", "MIG-"))
-        assert uuid_with_prefix[4:] == device.uuid
+        uuid = device.uuid
+        assert isinstance(uuid, str)
+        assert uuid.startswith(("GPU-", "MIG-"))
+        assert uuid == device.uuid