update

Signed-off-by: minmingzhu <minming.zhu@intel.com>
oap-project · Aug 4, 2023 · 5ebacc4 · 5ebacc4
1 parent e1b6867
commit 5ebacc4
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/mllib-dal/src/main/native/OneDAL.cpp b/mllib-dal/src/main/native/OneDAL.cpp
@@ -27,7 +27,7 @@ using namespace daal::data_management;
 extern bool daal_check_is_intel_cpu();
 
 // Define a global native array
-typedef std::shared_ptr<double[]> NativeArrayPtr;
+typedef std::shared_ptr<float[]> NativeArrayPtr;
 std::mutex g_amtx;
 std::vector<NativeArrayPtr> g_NativeArrayPtrVector;
 
@@ -172,14 +172,14 @@ Java_com_intel_oap_mllib_OneDAL_00024_cNewCSRNumericTableDouble(
  * Method:    cNewDoubleArray
  * Signature: (J)J
  */
-JNIEXPORT jlong JNICALL Java_com_intel_oap_mllib_OneDAL_00024_cNewDoubleArray(
-    JNIEnv *env, jobject, jlong size) {
-    std::cout << "create new native array size : " << size << std::endl;
-    NativeArrayPtr arrayPtr(new double[size],
-                            [](double *ptr) { delete[] ptr; });
-    saveArrayPtrToVector(arrayPtr);
-    return (jlong)arrayPtr.get();
-}
+//JNIEXPORT jlong JNICALL Java_com_intel_oap_mllib_OneDAL_00024_cNewDoubleArray(
+//    JNIEnv *env, jobject, jlong size) {
+//    std::cout << "create new native array size : " << size << std::endl;
+//    NativeArrayPtr arrayPtr(new double[size],
+//                            [](double *ptr) { delete[] ptr; });
+//    saveArrayPtrToVector(arrayPtr);
+//    return (jlong)arrayPtr.get();
+//}
 
 /*
  * Class:     com_intel_oap_mllib_OneDAL__
@@ -201,11 +201,11 @@ JNIEXPORT jlong JNICALL Java_com_intel_oap_mllib_OneDAL_00024_cNewFloatArray(
  * Signature: (J[DJ)V
  */
 JNIEXPORT void JNICALL Java_com_intel_oap_mllib_OneDAL_00024_cCopyArrayToNative(
-    JNIEnv *env, jobject, jlong nativeArrayPtr, jdoubleArray sourceArray,
+    JNIEnv *env, jobject, jlong nativeArrayPtr, jfloatArray sourceArray,
     jlong index) {
-    double *nativeArray = reinterpret_cast<double *>(nativeArrayPtr);
+    float *nativeArray = reinterpret_cast<float *>(nativeArrayPtr);
     jsize sourceLength = env->GetArrayLength(sourceArray);
-    jdouble *source = static_cast<jdouble *>(
+    jfloat *source = static_cast<jfloat *>(
         env->GetPrimitiveArrayCritical(sourceArray, NULL));
     std::copy(source, source + sourceLength, nativeArray + index);
     env->ReleasePrimitiveArrayCritical(sourceArray, source, 0);

diff --git a/mllib-dal/src/main/native/oneapi/dal/HomogenTableImpl.cpp b/mllib-dal/src/main/native/oneapi/dal/HomogenTableImpl.cpp
@@ -342,7 +342,7 @@ JNIEXPORT jlong JNICALL Java_com_intel_oneapi_dal_table_HomogenTableImpl_dPtrIni
 JNIEXPORT jlong JNICALL Java_com_intel_oneapi_dal_table_HomogenTableImpl_fPtrInit(
     JNIEnv *env, jobject, jlong cRowCount, jlong cColCount, jlong dataPtr, jint cLayout, jint computeDeviceOrdinal) {
     printf("HomogenTable dPtrInit\n");
-    double *fData = reinterpret_cast<float *>(dataPtr);
+    float *fData = reinterpret_cast<float *>(dataPtr);
     if (fData == NULL) {
        std::cout << "Error: unable to obtain critical array" << std::endl;
        exit(-1);
@@ -360,8 +360,8 @@ JNIEXPORT jlong JNICALL Java_com_intel_oneapi_dal_table_HomogenTableImpl_fPtrIni
        case ComputeDevice::cpu:
        case ComputeDevice::gpu:{
            auto queue = getQueue(device);
-           auto data = sycl::malloc_shared<double>(cRowCount * cColCount, queue);
-           queue.memcpy(data, fData, sizeof(double) * cRowCount * cColCount).wait();
+           auto data = sycl::malloc_shared<float>(cRowCount * cColCount, queue);
+           queue.memcpy(data, fData, sizeof(float) * cRowCount * cColCount).wait();
            tablePtr = std::make_shared<homogen_table>(queue, data, cRowCount, cColCount,
                                                       detail::make_default_delete<const float>(queue),
                                                       dependencies, getDataLayout(cLayout));