Convert homogentable to array/vector/matrix

mllib-dal/src/main/java/com/intel/oneapi/dal/table/ColumnAccessor.java

@@ -0,0 +1,43 @@
+package com.intel.oneapi.dal.table;
+
+public class ColumnAccessor {
+    private long cObject;
+    private Common.ComputeDevice cDevice;
+
+    public ColumnAccessor(long cObject, Common.ComputeDevice device) {
+        this.cObject = cObject;
+        this.cDevice = device;
+    }
+
+    public double[] pullDouble(long columnIndex){
+        return this.cPullDouble(this.cObject, columnIndex, 0, -1, this.cDevice.ordinal());
+    }
+
+    public double[] pullDouble(long columnIndex, long rowStartIndex, long rowEndIndex){
+        return this.cPullDouble(this.cObject, columnIndex, rowStartIndex, rowEndIndex, this.cDevice.ordinal());
+    }
+
+    public float[] pullFloat(long columnIndex){
+        return this.cPullFloat(this.cObject, columnIndex, 0, -1, this.cDevice.ordinal());
+    }
+
+    public float[] pullFloat(long columnIndex, long rowStartIndex, long rowEndIndex){
+        return this.cPullFloat(this.cObject, columnIndex, rowStartIndex, rowEndIndex, this.cDevice.ordinal());
+    }
+
+    public int[] pullInt(long columnIndex){
+        return this.cPullInt(this.cObject, columnIndex, 0, -1, this.cDevice.ordinal());
+    }
+
+    public int[] pullInt(long columnIndex, long rowStartIndex, long rowEndIndex){
+        return this.cPullInt(this.cObject, columnIndex, rowStartIndex, rowEndIndex, this.cDevice.ordinal());
+    }
+
+    private native double[] cPullDouble(long cObject, long cColumnIndex,
+                                        long cRowStartIndex, long cRowEndIndex, int computeDeviceIndex);
+    private native int[] cPullInt(long cObject, long cColumnIndex, long cRowStartIndex,
+                                  long cRowEndIndex, int computeDeviceIndex);
+    private native float[] cPullFloat(long cObject, long cColumnIndex, long cRowStartIndex,
+                                      long cRowEndIndex, int computeDeviceIndex);
+
+}

mllib-dal/src/main/java/com/intel/oneapi/dal/table/Common.java

@@ -30,7 +30,7 @@ public enum ComputeDevice {
         public static ComputeDevice get(int ordinal) {
             return values[ordinal];
         }
-        public static int getOrdinalByName(String key){
+        public static ComputeDevice getOrdinalByName(String key){
             ComputeDevice device = null;
             switch (key.toUpperCase()){
                 case "HOST":
@@ -43,7 +43,7 @@ public static int getOrdinalByName(String key){
                     device = GPU;
                     break;
             }
-            return device.ordinal();
+            return device;
         }
     }
 }

mllib-dal/src/main/java/com/intel/oneapi/dal/table/HomogenTable.java

@@ -11,23 +11,20 @@ public HomogenTable(long cTable){
     public HomogenTable(long rowCount,
                         long colCount,
                         int[] data,
-                        int deviceIndex){
+                        Common.ComputeDevice device){
         super();
         // default
         Common.DataLayout dataLayout = Common.DataLayout.ROW_MAJOR;
-        Common.ComputeDevice device = Common.ComputeDevice.get(deviceIndex);
         impl = new HomogenTableImpl(rowCount, colCount, data,
                 dataLayout, device);
     }
 
     public HomogenTable(long rowCount,
                         long colCount,
                         int[] data,
-                        int layoutindex,
-                        int deviceIndex){
+                        Common.DataLayout dataLayout,
+                        Common.ComputeDevice device){
         super();
-        Common.DataLayout dataLayout = Common.DataLayout.get(layoutindex);
-        Common.ComputeDevice device = Common.ComputeDevice.get(deviceIndex);
         impl = new HomogenTableImpl(rowCount, colCount, data,
                 dataLayout, device);
 
@@ -36,75 +33,65 @@ public HomogenTable(long rowCount,
     public HomogenTable(long rowCount,
                         long colCount,
                         long[] data,
-                        int deviceIndex){
+                        Common.ComputeDevice device){
         super();
         // default
         Common.DataLayout dataLayout = Common.DataLayout.ROW_MAJOR;
-        Common.ComputeDevice device = Common.ComputeDevice.get(deviceIndex);
         impl = new HomogenTableImpl(rowCount, colCount, data,
                 dataLayout, device);
     }
 
     public HomogenTable(long rowCount,
                         long colCount,
                         long[] data,
-                        int layoutIndex,
-                        int deviceIndex){
+                        Common.DataLayout dataLayout,
+                        Common.ComputeDevice device){
         super();
-        Common.DataLayout dataLayout = Common.DataLayout.get(layoutIndex);
-        Common.ComputeDevice device = Common.ComputeDevice.get(deviceIndex);
         impl = new HomogenTableImpl(rowCount, colCount, data,
                 dataLayout, device);
     }
 
     public HomogenTable(long rowCount,
                         long colCount,
                         float[] data,
-                        int deviceIndex){
+                        Common.ComputeDevice device){
         super();
         // default
         Common.DataLayout dataLayout = Common.DataLayout.ROW_MAJOR;
-        Common.ComputeDevice device = Common.ComputeDevice.get(deviceIndex);
         impl = new HomogenTableImpl(rowCount, colCount, data,
                 dataLayout, device);
     }
 
     public HomogenTable(long rowCount,
                         long colCount,
                         float[] data,
-                        int layoutIndex,
-                        int deviceIndex){
+                        Common.DataLayout dataLayout,
+                        Common.ComputeDevice device){
         super();
-        Common.DataLayout dataLayout = Common.DataLayout.get(layoutIndex);
-        Common.ComputeDevice device = Common.ComputeDevice.get(deviceIndex);
         impl = new HomogenTableImpl(rowCount, colCount, data,
                 dataLayout, device);
     }
 
     public HomogenTable(long rowCount,
                         long colCount,
                         double[] data,
-                        int deviceIndex){
+                        Common.ComputeDevice device){
         super();
         // default
         Common.DataLayout dataLayout = Common.DataLayout.ROW_MAJOR;
-        Common.ComputeDevice device = Common.ComputeDevice.get(deviceIndex);
         impl = new HomogenTableImpl(rowCount, colCount, data,
                 dataLayout, device);
     }
 
     public HomogenTable(long rowCount,
                         long colCount,
                         double[] data,
-                        int layoutIndex,
-                        int deviceIndex){
+                        Common.DataLayout dataLayout,
+                        Common.ComputeDevice device){
         super();
-        Common.DataLayout dataLayout = Common.DataLayout.get(layoutIndex);
-        Common.ComputeDevice device = Common.ComputeDevice.get(deviceIndex);
         impl = new HomogenTableImpl(rowCount, colCount, data,
                 dataLayout, device);
     }
-
     @Override
     public Long getColumnCount() {
         return impl.getColumnCount();
@@ -150,4 +137,8 @@ public  long[] getLongData() {
     public  double[] getDoubleData() {
         return  impl.getDoubleData();
     }
+
+    public long getcObejct() {
+        return impl.getcObject();
+    }
 }

mllib-dal/src/main/java/com/intel/oneapi/dal/table/HomogenTableImpl.java

@@ -12,8 +12,9 @@ public class HomogenTableImpl implements HomogenTableIface {
             e.printStackTrace();
         }
     }
-    private transient long cObject;
+    private long cObject;
     private TableMetadata metadata;
+    private Common.ComputeDevice device;
 
     protected HomogenTableImpl() {
         super();
@@ -28,17 +29,17 @@ public HomogenTableImpl(long rowCount,
                             int[] data,
                             Common.DataLayout dataLayout,
                             Common.ComputeDevice computeDevice) {
-        this.cObject = iInit(rowCount, colCount, data, dataLayout.ordinal(), computeDevice.ordinal());
-        System.out.println(" HomogenTableImpl object : " + this.cObject);
-
+        this.device = computeDevice;
+        this.cObject = iInit(rowCount, colCount, data, dataLayout.ordinal(), this.device.ordinal());
     }
 
     public HomogenTableImpl(long rowCount,
                             long colCount,
                             float[] data,
                             Common.DataLayout dataLayout,
                             Common.ComputeDevice computeDevice) {
-        this.cObject = fInit(rowCount, colCount, data, dataLayout.ordinal(), computeDevice.ordinal());
+        this.device = computeDevice;
+        this.cObject = fInit(rowCount, colCount, data, dataLayout.ordinal(), this.device.ordinal());
 
     }
 
@@ -47,7 +48,8 @@ public HomogenTableImpl(long rowCount,
                             long[] data,
                             Common.DataLayout dataLayout,
                             Common.ComputeDevice computeDevice) {
-        this.cObject = lInit(rowCount, colCount, data, dataLayout.ordinal(), computeDevice.ordinal());
+        this.device = computeDevice;
+        this.cObject = lInit(rowCount, colCount, data, dataLayout.ordinal(), this.device.ordinal());
 
     }
 
@@ -56,125 +58,119 @@ public HomogenTableImpl(long rowCount,
                             double[] data,
                             Common.DataLayout dataLayout,
                             Common.ComputeDevice computeDevice) {
-        this.cObject = dInit(rowCount, colCount, data, dataLayout.ordinal(), computeDevice.ordinal());
+        this.device = computeDevice;
+        this.cObject = dInit(rowCount, colCount, data, dataLayout.ordinal(), this.device.ordinal());
 
     }
 
-
-    private native long iInit(long rowCount,
-                                long colCount,
-                                int[] data,
-                                int  dataLayoutIndex,
-                                int computeDeviceIndex);
-
-    private native long fInit(long rowCount,
-                                long colCount,
-                                float[] data,
-                                int dataLayoutIndex,
-                                int computeDeviceIndex);
-
-    private native long dInit(long rowCount,
-                                long colCount,
-                                double[] data,
-                                int dataLayoutIndex,
-                                int computeDeviceIndex);
-
-    private native long lInit(long rowCount,
-                                long colCount,
-                                long[] data,
-                                int dataLayoutIndex,
-                                int computeDeviceIndex);
-
     @Override
     public long getColumnCount() {
         return cGetColumnCount(this.cObject);
     }
 
-    private native long cGetColumnCount(long cObject);
-
     @Override
     public long getRowCount() {
         return cGetRowCount(this.cObject);
     }
 
-    private native long cGetRowCount(long cObject);
 
     @Override
     public long getKind() {
         return this.cGetKind(this.cObject);
     }
 
-    private native long cGetKind(long cObject);
-
     @Override
     public Common.DataLayout getDataLayout() {
+
         return Common.DataLayout.get(cGetDataLayout(this.cObject));
     }
 
-    private native int cGetDataLayout(long cObject);
-
     @Override
     public TableMetadata getMetaData() {
         long cMetadata = cGetMetaData(this.cObject);
         this.metadata = new TableMetadata(cMetadata);
         return this.metadata;
     }
 
-    private native long cGetMetaData(long cObject);
-
     @Override
     public long getPullRowsIface() {
         return 0;
     }
 
-    private native long cGetPullRowsIface(long cObject);
 
     @Override
-    public long getPullColumnIface() {
-        return 0;
+    public ColumnAccessor getPullColumnIface() {
+        ColumnAccessor accessor = new ColumnAccessor(cGetPullColumnIface(this.cObject), this.device);
+        return accessor;
     }
 
-    private native long cGetPullColumnIface(long cObject);
-
     @Override
     public long getPullCSRBlockIface() {
         return 0;
     }
 
-    private native long cGetPullCSRBlockIface(long cObject);
-
     @Override
     public boolean hasData() {
         return this.getColumnCount() > 0 && this.getRowCount() > 0;
     }
 
-
     @Override
     public int[] getIntData() {
         return this.cGetIntData(this.cObject);
     }
 
-    private native int[] cGetIntData(long cObject);
-
     @Override
     public long[] getLongData() {
         return this.cGetLongData(this.cObject);
     }
 
-    private native long[] cGetLongData(long cObject);
-
     @Override
     public float[] getFloatData() {
         return this.cGetFloatData(this.cObject);
     }
 
-    private native float[] cGetFloatData(long cObject);
-
-
     @Override
     public double[] getDoubleData() {
         return cGetDoubleData(this.cObject);
     }
 
+    public long getcObject(){
+        return this.cObject;
+    }
+
+    private native long iInit(long rowCount,
+                              long colCount,
+                              int[] data,
+                              int  dataLayoutIndex,
+                              int computeDeviceIndex);
+
+    private native long fInit(long rowCount,
+                              long colCount,
+                              float[] data,
+                              int dataLayoutIndex,
+                              int computeDeviceIndex);
+
+    private native long dInit(long rowCount,
+                              long colCount,
+                              double[] data,
+                              int dataLayoutIndex,
+                              int computeDeviceIndex);
+
+    private native long lInit(long rowCount,
+                              long colCount,
+                              long[] data,
+                              int dataLayoutIndex,
+                              int computeDeviceIndex);
+    private native long cGetColumnCount(long cObject);
+    private native long cGetRowCount(long cObject);
+    private native long cGetKind(long cObject);
+    private native int cGetDataLayout(long cObject);
+    private native long cGetMetaData(long cObject);
+    private native long cGetPullRowsIface(long cObject);
+    private native long cGetPullColumnIface(long cObject);
+    private native long cGetPullCSRBlockIface(long cObject);
+    private native int[] cGetIntData(long cObject);
+    private native long[] cGetLongData(long cObject);
+    private native float[] cGetFloatData(long cObject);
     private native double[] cGetDoubleData(long cObject);
 }