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;
+
+    public ColumnAccessor(long cObject) {
+        this.cObject = cObject;
+    }
+
+    public double[] pullDouble(long columnIndex, Common.ComputeDevice device){
+        return this.cPullDouble(this.cObject, columnIndex, 0, -1, device.ordinal());
+    }
+
+    public double[] pullDouble(long columnIndex, long rowStartIndex, long rowEndIndex, Common.ComputeDevice device){
+        return this.cPullDouble(this.cObject, columnIndex, rowStartIndex, rowEndIndex, device.ordinal());
+    }
+
+    private native double[] cPullDouble(long cObject, long cColumnIndex,
+                                        long cRowStartIndex, long cRowEndIndex, int computeDeviceIndex);
+
+    public float[] pullFloat(long columnIndex, Common.ComputeDevice device){
+        return this.cPullFloat(this.cObject, columnIndex, 0, -1, device.ordinal());
+    }
+
+    public float[] pullFloat(long columnIndex, long rowStartIndex, long rowEndIndex, Common.ComputeDevice device){
+        return this.cPullFloat(this.cObject, columnIndex, rowStartIndex, rowEndIndex, device.ordinal());
+    }
+
+    private native float[] cPullFloat(long cObject, long cColumnIndex, long cRowStartIndex,
+                                      long cRowEndIndex, int computeDeviceIndex);
+
+    public int[] pullInt(long columnIndex, Common.ComputeDevice device){
+        return this.cPullInt(this.cObject, columnIndex, 0, -1, device.ordinal());
+    }
+
+    public int[] pullInt(long columnIndex, long rowStartIndex, long rowEndIndex, Common.ComputeDevice device){
+        return this.cPullInt(this.cObject, columnIndex, rowStartIndex, rowEndIndex, device.ordinal());
+    }
+
+    private native int[] cPullInt(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,7 +12,7 @@ public class HomogenTableImpl implements HomogenTableIface {
             e.printStackTrace();
         }
     }
-    private transient long cObject;
+    private long cObject;
     private TableMetadata metadata;
 
     protected HomogenTableImpl() {
@@ -130,8 +130,10 @@ public long getPullRowsIface() {
     private native long cGetPullRowsIface(long cObject);
 
     @Override
-    public long getPullColumnIface() {
-        return 0;
+    public ColumnAccessor getPullColumnIface() {
+        ColumnAccessor accessor = new ColumnAccessor(cGetPullColumnIface(this.cObject));
+
+        return accessor;
     }
 
     private native long cGetPullColumnIface(long cObject);
@@ -177,4 +179,8 @@ public double[] getDoubleData() {
     }
 
     private native double[] cGetDoubleData(long cObject);
+
+    public long getcObject(){
+        return this.cObject;
+    }
 }

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

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

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

@@ -6,7 +6,7 @@
 import java.util.ArrayList;
 
 public class SimpleMetadataImpl implements TableMetadataImpl{
-    private transient long cObject;
+    private long cObject;
     private ArrayList dtypes;
     private ArrayList ftypes;
     static {

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

@@ -2,7 +2,7 @@
 
 import java.io.Serializable;
 
-public abstract class Table implements Serializable {
+public abstract class Table {
     public Table() {}
     protected abstract Long getColumnCount();
     protected abstract Long getRowCount();

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

@@ -8,7 +8,7 @@ public interface TableIface {
    Common.DataLayout getDataLayout();
    TableMetadata getMetaData();
    long getPullRowsIface();
-   long getPullColumnIface();
+   ColumnAccessor getPullColumnIface();
    long getPullCSRBlockIface();
    boolean hasData();
 }

mllib-dal/src/main/native/GPU.cpp

@@ -6,11 +6,25 @@
 
 static std::mutex mtx;
 static std::vector<std::shared_ptr<sycl::queue>> cVector;
-sycl::queue *getQue() {
+
+static void setVector(std::shared_ptr<sycl::queue> *ptr) {
+    mtx.lock();
+    cVector.push_back(*ptr);
+    mtx.unlock();
+}
+
+static sycl::queue *getQue(const sycl::device device) {
+    mtx.lock();
     if (!cVector.empty()) {
         return cVector[0].get();
+    } else {
+        sycl::queue *queue = new sycl::queue(device);
+        std::shared_ptr<sycl::queue> *queuePtr =
+            new std::shared_ptr<sycl::queue>(queue);
+        setVector(queuePtr);
+        return cVector[0].get();
     }
-    return NULL;
+    mtx.unlock();
 }
 
 static std::vector<sycl::device> get_gpus() {
@@ -72,35 +86,22 @@ sycl::device getAssignedGPU(ccl::communicator &comm, int size, int rankId,
     return rank_gpu;
 }
 
-static void setVector(std::shared_ptr<sycl::queue> *ptr) {
-    mtx.lock();
-    cVector.push_back(*ptr);
-    mtx.unlock();
-}
-
 sycl::queue *getQueue(const compute_device device) {
     std::cout << "Get Queue" << std::endl;
-    std::shared_ptr<sycl::queue> *queuePtr;
-    sycl::queue *queue;
+
     switch (device) {
     case compute_device::gpu: {
         std::cout << "selector GPU" << std::endl;
         auto device_gpu = sycl::gpu_selector{}.select_device();
-        queue = new sycl::queue(device_gpu);
-        queuePtr = new std::shared_ptr<sycl::queue>(queue);
-        setVector(queuePtr);
-        return getQue();
+        return getQue(device_gpu);
     }
     case compute_device::cpu: {
         std::cout << "selector CPU" << std::endl;
         auto device_cpu = sycl::cpu_selector{}.select_device();
-        queue = new sycl::queue(device_cpu);
-        queuePtr = new std::shared_ptr<sycl::queue>(queue);
-        setVector(queuePtr);
-        return getQue();
+        return getQue(device_cpu);
     }
     default: {
-        return getQue();
+        return NULL;
     }
     }
 }

mllib-dal/src/main/native/Makefile

@@ -61,7 +61,6 @@ LIBS_COMMON := -L$(CCL_ROOT)/lib/cpu_gpu_dpcpp -lccl \
         -L$(TBBROOT)/lib/intel64/gcc4.8 -ltbb -ltbbmalloc \
         -L$(I_MPI_ROOT)
 
-
 ifeq ($(PLATFORM_PROFILE),CPU_ONLY_PROFILE)
   LIBS := $(LIBS_COMMON)
 else ifeq ($(PLATFORM_PROFILE),CPU_GPU_PROFILE)
@@ -78,7 +77,9 @@ CPP_SRCS += \
   ./CorrelationDALImpl.cpp \
   ./SummarizerDALImpl.cpp \
   ./oneapi/dal/HomogenTableImpl.cpp \
-  ./oneapi/dal/SimpleMetadataImpl.cpp
+  ./oneapi/dal/SimpleMetadataImpl.cpp \
+  ./oneapi/dal/ColumnAccessorImpl.cpp \
+  ./oneapi/dal/RowAccessorImpl.cpp
 
 
 OBJS += \
@@ -91,8 +92,9 @@ OBJS += \
   ./CorrelationDALImpl.o \
   ./SummarizerDALImpl.o \
   ./oneapi/dal/HomogenTableImpl.o \
-  ./oneapi/dal/SimpleMetadataImpl.o
-
+  ./oneapi/dal/SimpleMetadataImpl.o \
+  ./oneapi/dal/ColumnAccessorImpl.o  \
+  ./oneapi/dal/RowAccessorImpl.o
 
 DEFINES=-D$(PLATFORM_PROFILE)
 

mllib-dal/src/main/native/build-jni.sh

@@ -39,5 +39,7 @@ javah -d $WORK_DIR/javah -classpath "$WORK_DIR/../../../target/classes:$DAAL_JAR
     com.intel.oap.mllib.stat.CorrelationDALImpl \
     com.intel.oap.mllib.stat.SummarizerDALImpl \
     com.intel.oneapi.dal.table.HomogenTableImpl \
-    com.intel.oneapi.dal.table.SimpleMetadataImpl
-
+    com.intel.oneapi.dal.table.SimpleMetadataImpl \
+    com.intel.oneapi.dal.table.ColumnAccessor \
+    com.intel.oneapi.dal.table.RowAccessor
+