[GPU] Add convertToSyclHomogen for row merged table for kmeans and pca (

#159) * Add convertToSyclHomogen for row merged table * Add convertToSyclHomogen for pca
oap-project · Dec 15, 2021 · 559ff5d · 559ff5d
1 parent 0d80960
commit 559ff5d
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 2 deletions.
diff --git a/mllib-dal/src/main/native/KMeansDALImpl.cpp b/mllib-dal/src/main/native/KMeansDALImpl.cpp
@@ -28,6 +28,7 @@
 using namespace std;
 using namespace daal;
 using namespace daal::algorithms;
+using namespace daal::services;
 
 typedef double algorithmFPType; /* Algorithm floating-point type */
 
@@ -262,8 +263,18 @@ Java_com_intel_oap_mllib_clustering_KMeansDALImpl_cKMeansDALComputeWithInitCente
         daal::services::Environment::getInstance()->setDefaultExecutionContext(
             ctx);
 
+        using daal::data_management::internal::convertToSyclHomogen;
+
+        Status st;
+        NumericTablePtr pSyclHomogen = convertToSyclHomogen<algorithmFPType>(*pData, st);
+        if (!st.ok()) {
+            std::cout << "Failed to convert row merged table to SYCL homogen one"
+                      << std::endl;
+            return 0L;
+        }
+
         ret = doKMeansDALComputeWithInitCenters(
-            env, obj, rankId, comm, pData, centroids, cluster_num, tolerance,
+            env, obj, rankId, comm, pSyclHomogen, centroids, cluster_num, tolerance,
             iteration_num, executor_num, resultObj);
 
         env->ReleaseIntArrayElements(gpu_idx_array, gpu_indices, 0);

diff --git a/mllib-dal/src/main/native/PCADALImpl.cpp b/mllib-dal/src/main/native/PCADALImpl.cpp
@@ -28,6 +28,7 @@
 using namespace std;
 using namespace daal;
 using namespace daal::algorithms;
+using namespace daal::services;
 
 typedef double algorithmFPType; /* Algorithm floating-point type */
 
@@ -195,7 +196,17 @@ Java_com_intel_oap_mllib_feature_PCADALImpl_cPCATrainDAL(
         daal::services::Environment::getInstance()->setDefaultExecutionContext(
             ctx);
 
-        doPCADALCompute(env, obj, rankId, comm, pData, nBlocks, resultObj);
+        using daal::data_management::internal::convertToSyclHomogen;
+
+        Status st;
+        NumericTablePtr pSyclHomogen = convertToSyclHomogen<algorithmFPType>(*pData, st);
+        if (!st.ok()) {
+            std::cout << "Failed to convert row merged table to SYCL homogen one"
+                      << std::endl;
+            return 0L;
+        }
+
+        doPCADALCompute(env, obj, rankId, comm, pSyclHomogen, nBlocks, resultObj);
 
         env->ReleaseIntArrayElements(gpu_idx_array, gpu_indices, 0);
     } else