Working on tests

Author: mdboom

cuda_bindings/cuda/bindings/_nvml.pyx

@@ -27104,8 +27104,8 @@ cpdef object system_get_topology_gpu_set(unsigned int cpuNumber):
         __status__ = nvmlSystemGetTopologyGpuSet(cpuNumber, <unsigned int*>count, NULL)
     check_status_size(__status__)
     if count[0] == 0:
-        return view.array(shape=(1,), itemsize=sizeof(intptr_t), format="i", mode="c")[:0]
-    cdef view.array deviceArray = view.array(shape=(count[0],), itemsize=sizeof(intptr_t), format="i", mode="c")
+        return view.array(shape=(1,), itemsize=sizeof(intptr_t), format="P", mode="c")[:0]
+    cdef view.array deviceArray = view.array(shape=(count[0],), itemsize=sizeof(intptr_t), format="P", mode="c")
     with nogil:
         __status__ = nvmlSystemGetTopologyGpuSet(cpuNumber, <unsigned int*>count, <nvmlDevice_t *>deviceArray.data)
     check_status(__status__)
@@ -27144,8 +27144,8 @@ cpdef object unit_get_devices(intptr_t unit):
         __status__ = nvmlUnitGetDevices(<nvmlUnit_t *>unit, <unsigned int*>deviceCount, NULL)
     check_status_size(__status__)
     if deviceCount[0] == 0:
-        return view.array(shape=(1,), itemsize=sizeof(intptr_t), format="i", mode="c")[:0]
-    cdef view.array deviceArray = view.array(shape=(deviceCount[0],), itemsize=sizeof(intptr_t), format="i", mode="c")
+        return view.array(shape=(1,), itemsize=sizeof(intptr_t), format="P", mode="c")[:0]
+    cdef view.array deviceArray = view.array(shape=(deviceCount[0],), itemsize=sizeof(intptr_t), format="P", mode="c")
     with nogil:
         __status__ = nvmlUnitGetDevices(<nvmlUnit_t *>unit, <unsigned int*>deviceCount, <nvmlDevice_t *>deviceArray.data)
     check_status(__status__)
@@ -27172,8 +27172,8 @@ cpdef object device_get_topology_nearest_gpus(intptr_t device, unsigned int leve
         )
     check_status_size(__status__)
     if count[0] == 0:
-        return view.array(shape=(1,), itemsize=sizeof(intptr_t), format="i", mode="c")[:0]
-    cdef view.array deviceArray = view.array(shape=(deviceCount[0],), itemsize=sizeof(intptr_t), format="i", mode="c")
+        return view.array(shape=(1,), itemsize=sizeof(intptr_t), format="P", mode="c")[:0]
+    cdef view.array deviceArray = view.array(shape=(deviceCount[0],), itemsize=sizeof(intptr_t), format="P", mode="c")
     with nogil:
         __status__ = nvmlDeviceGetTopologyNearestGpus(
             <Device>device,
@@ -27837,9 +27837,9 @@ cpdef object device_get_gpu_instances(intptr_t device, unsigned int profile_id):
     check_status_size(__status__)
 
     if count[0] == 0:
-        view.array(shape=(1,), itemsize=sizeof(intptr_t), format="i", mode="c")[:0]
+        view.array(shape=(1,), itemsize=sizeof(intptr_t), format="P", mode="c")[:0]
 
-    cdef view.array gpuInstances = view.array(shape=(count[0],), itemsize=sizeof(intptr_t), format="i", mode="c")
+    cdef view.array gpuInstances = view.array(shape=(count[0],), itemsize=sizeof(intptr_t), format="P", mode="c")
     with nogil:
         __status__ = nvmlDeviceGetGpuInstances(<Device>device, profile_id, <nvmlGpuInstance_t *>gpuInstances.data, count)
     check_status(__status__)
@@ -27863,9 +27863,9 @@ cpdef object gpu_instance_get_compute_instances(intptr_t gpu_instance, unsigned
     check_status_size(__status__)
 
     if count[0] == 0:
-        view.array(shape=(1,), itemsize=sizeof(intptr_t), format="i", mode="c")[:0]
+        view.array(shape=(1,), itemsize=sizeof(intptr_t), format="P", mode="c")[:0]
 
-    cdef view.array computeInstances = view.array(shape=(count[0],), itemsize=sizeof(intptr_t), format="i", mode="c")
+    cdef view.array computeInstances = view.array(shape=(count[0],), itemsize=sizeof(intptr_t), format="P", mode="c")
     with nogil:
         __status__ = nvmlGpuInstanceGetComputeInstances(<GpuInstance>gpu_instance, profile_id, <nvmlComputeInstance_t *>computeInstances.data, count)
     check_status(__status__)

cuda_core/tests/system/test_system_device.py

@@ -247,6 +247,7 @@ def test_device_attributes():
         except system.NotSupportedError:
             skip_reasons.append(f"Device attributes not supported on '{device.name}'")
             continue
+        print("Attribute type:", type(attributes))
         assert isinstance(attributes, system.DeviceAttributes)
 
         assert isinstance(attributes.multiprocessor_count, int)
@@ -459,7 +460,7 @@ def test_get_inforom_version():
         # TODO: This is untested locally.
         try:
             timestamp, duration_us = inforom.bbx_flush_time
-        except system.NotSupportedError:
+        except (system.NotSupportedError, system.NotReadyError):
             pass
         else:
             assert isinstance(timestamp, int)