avoid nope in CLDevice.getPartitionAffinityDomain()

ochafik · ochafik · commit 56cf9586dd86 · 2015-03-20T10:55:42.000Z
diff --git a/Core/src/main/velocity/com/nativelibs4java/opencl/CLDevice.java b/Core/src/main/velocity/com/nativelibs4java/opencl/CLDevice.java
@@ -790,7 +790,7 @@ public long getReferenceCount() {
      */
     public AffinityDomain getPartitionAffinityDomain() {
         Pointer<?> memory = infos.getMemory(getEntity(), CL_DEVICE_PARTITION_TYPE);
-        long type = memory.getSizeT();
+        long type = memory == null ? 0 : memory.getSizeT();
         if (type != CL_DEVICE_PARTITION_BY_AFFINITY_DOMAIN) {
         	return null;
         }
diff --git a/Core/src/test/java/com/nativelibs4java/opencl/DeviceTest.java b/Core/src/test/java/com/nativelibs4java/opencl/DeviceTest.java
@@ -88,10 +88,13 @@ public void testSplitByCounts() {
     public void testSplitByAffinity() {
         if (!device.getPartitionProperties().contains(CLDevice.PartitionType.ByAffinityDomain)) return;
 
-        CLDevice[] subDevices = device.createSubDevicesByAffinity(CLDevice.AffinityDomain.NextPartitionable);
-        assertTrue(subDevices.length > 1);
-        for (CLDevice subDevice : subDevices) {
-            checkParent(device, subDevice);
+        for (CLDevice.AffinityDomain domain : device.getPartitionAffinityDomains()) {
+          CLDevice[] subDevices = device.createSubDevicesByAffinity(domain);
+          assertTrue(subDevices.length > 1);
+          for (CLDevice subDevice : subDevices) {
+              checkParent(device, subDevice);
+              assertEquals(domain, subDevice.getPartitionAffinityDomain());
+          }
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -790,7 +790,7 @@ public long getReferenceCount() {`
`790`	`790`	`*/`
`791`	`791`	`public AffinityDomain getPartitionAffinityDomain() {`
`792`	`792`	`Pointer<?> memory = infos.getMemory(getEntity(), CL_DEVICE_PARTITION_TYPE);`
`793`		`- long type = memory.getSizeT();`
	`793`	`+ long type = memory == null ? 0 : memory.getSizeT();`
`794`	`794`	`if (type != CL_DEVICE_PARTITION_BY_AFFINITY_DOMAIN) {`
`795`	`795`	`return null;`
`796`	`796`	`}`