Added CLDevice.getPartitionMaxSubDevices(), fixed (?) getPartitionProperties(), skip tests that can't succeed

Author: ochafik

Core/src/main/velocity/com/nativelibs4java/opencl/CLDevice.java

@@ -727,15 +727,27 @@ public static long getValue(EnumSet<PartitionType> set) {
             return EnumValues.getValue(set);
         }
 
-        public static EnumSet<PartitionType> getEnumSet(long v) {
-            return EnumValues.getEnumSet(v, PartitionType.class);
+        public static PartitionType getEnum(long v) {
+            return EnumValues.getEnum(v, PartitionType.class);
         }
     }
 
-	/** TODO */
     @InfoName("CL_DEVICE_PARTITION_PROPERTIES")
     public EnumSet<PartitionType> getPartitionProperties() {
-        return PartitionType.getEnumSet(infos.getIntOrLong(getEntity(), CL_DEVICE_PARTITION_PROPERTIES));
+        EnumSet<PartitionType> ret = EnumSet.noneOf(PartitionType.class);
+        Pointer<?> ptr = infos.getPointer(getEntity(), CL_DEVICE_PARTITION_PROPERTIES);;
+        if (ptr != null) {
+            Pointer<SizeT> props = ptr.as(SizeT.class);
+            for (long i = 0, n = props.getValidElements(); i < n; i++) {
+                ret.add(PartitionType.getEnum(props.getSizeTAtIndex(i)));
+            }
+        }
+        return ret;
+    }
+
+    @InfoName("CL_DEVICE_PARTITION_MAX_SUB_DEVICES")
+    public int getPartitionMaxSubDevices() {
+        return infos.getInt(getEntity(), CL_DEVICE_PARTITION_MAX_SUB_DEVICES);
     }
 
 	/** TODO */

Core/src/test/java/com/nativelibs4java/opencl/DeviceTest.java

@@ -14,44 +14,61 @@
 
 import org.junit.*;
 
-import com.nativelibs4java.test.MiscTestUtils;
 import com.nativelibs4java.util.NIOUtils;
 import org.bridj.*;
 import java.nio.ByteOrder;
 import static org.bridj.Pointer.*;
 import java.nio.ByteOrder;
-import java.util.List;
+import java.util.*;
+import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
 /**
  *
  * @author ochafik
  */
-public class DeviceTest extends AbstractCommon {
+@RunWith(Parameterized.class)
+public class DeviceTest {
+    private final CLDevice device;
+
     public DeviceTest(CLDevice device) {
-        super(device);
+        this.device = device;
+
+        System.out.println(device);
+        System.out.println("\tmax sub-devices: " + device.getPartitionMaxSubDevices());
+        System.out.println("\tpartition properties: " + device.getPartitionProperties());
     }
 
     @Parameterized.Parameters
     public static List<Object[]> getDeviceParameters() {
-        return AbstractCommon.getDeviceParameters();
+        List<Object[]> ret = new ArrayList<Object[]>();
+        for (CLPlatform platform : JavaCL.listPlatforms()) {
+            for (CLDevice device : platform.listAllDevices(true)) {
+                ret.add(new Object[] { device });
+            }
+        }
+        return ret;
     }
-    @Ignore
+
     @Test
     public void testSplitEqually() {
+        if (!device.getPartitionProperties().contains(CLDevice.PartitionType.Equally)) return;
+
         int computeUnits = device.getMaxComputeUnits();
         System.out.println("computeUnits = " + computeUnits);
-        int subComputeUnits = 1;//computeUnits / 2;
+        int subComputeUnits = computeUnits / 2;
 
         CLDevice[] subDevices = device.createSubDevicesEqually(subComputeUnits);
         for (CLDevice subDevice : subDevices) {
             assertEquals(subComputeUnits, subDevice.getMaxComputeUnits());
             checkParent(device, subDevice);
         }
     }
-    @Ignore
+
     @Test
     public void testSplitByCounts() {
+        if (!device.getPartitionProperties().contains(CLDevice.PartitionType.ByCounts)) return;
+
         long[] counts = new long[] { 2, 4, 8 };
         CLDevice[] subDevices = device.createSubDevicesByCounts(counts);
         assertEquals(counts.length, subDevices.length);
@@ -63,9 +80,11 @@ public void testSplitByCounts() {
             i++;
         }
     }
-    @Ignore
+
     @Test
     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) {
@@ -76,7 +95,7 @@ public void testSplitByAffinity() {
     private void checkParent(CLDevice parent, CLDevice child) {
         assertSame(device, child.getParent());
         // Force a get info CL_DEVICE_PARENT_DEVICE.
-        assertSame(device, new CLDevice(platform, null, child.getEntity(), false).getParent());
+        assertSame(device, new CLDevice(device.getPlatform(), null, child.getEntity(), false).getParent());
     }
 
 }