[ML-335] Fix issues (#337)

* split CI script to python and scala Signed-off-by: minmingzhu <minming.zhu@intel.com> * fixed issues Signed-off-by: minmingzhu <minming.zhu@intel.com> * update ci-tests.yml Signed-off-by: minmingzhu <minming.zhu@intel.com> * update service.cpp Signed-off-by: minmingzhu <minming.zhu@intel.com> * update service.cpp code style Signed-off-by: minmingzhu <minming.zhu@intel.com> --------- Signed-off-by: minmingzhu <minming.zhu@intel.com>
oap-project · Jul 28, 2023 · 3d71e21 · 3d71e21
1 parent c80ad75
commit 3d71e21
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 8 deletions.
diff --git a/mllib-dal/src/main/java/com/intel/oap/mllib/feature/PCAResult.java b/mllib-dal/src/main/java/com/intel/oap/mllib/feature/PCAResult.java
@@ -20,11 +20,21 @@ public class PCAResult {
   public long pcNumericTable;
   public long explainedVarianceNumericTable;
 
+  public long getExplainedVarianceNumericTable() {
+    return explainedVarianceNumericTable;
+  }
+
+  public void setExplainedVarianceNumericTable(long explainedVarianceNumericTable) {
+    this.explainedVarianceNumericTable = explainedVarianceNumericTable;
+  }
+
   public long getPcNumericTable() {
     return pcNumericTable;
   }
 
   public void setPcNumericTable(long pcNumericTable) {
     this.pcNumericTable = pcNumericTable;
   }
+
+
 }
diff --git a/mllib-dal/src/main/native/OneCCL.cpp b/mllib-dal/src/main/native/OneCCL.cpp
@@ -147,7 +147,7 @@ static int fill_local_host_ip() {
             continue;
         if (strstr(ifa->ifa_name, iface_name) == NULL) {
             family = ifa->ifa_addr->sa_family;
-            if (family == AF_INET) {
+            if (family == AF_INET || family == AF_INET6) {
                 memset(local_ip, 0, CCL_IP_LEN);
                 int res = getnameinfo(
                     ifa->ifa_addr,
@@ -161,6 +161,11 @@ static int fill_local_host_ip() {
                     return -1;
                 }
                 local_host_ips.push_back(local_ip);
+            } else {
+                std::cerr
+                    << "OneCCL (native): can't find interface to get host IP"
+                    << std::endl;
+                return -1;
             }
         }
     }

diff --git a/mllib-dal/src/main/native/service.cpp b/mllib-dal/src/main/native/service.cpp
@@ -410,9 +410,9 @@ void printNumericTable(NumericTable *dataTable, const char *message = "",
                                    nPrintedRows, nCols, message, interval);
         dataTable->releaseBlockOfRows(block);
     } else {
-        try {
-            PackedArrayNumericTableIface *packedTable =
-                dynamic_cast<PackedArrayNumericTableIface *>(dataTable);
+        PackedArrayNumericTableIface *packedTable =
+            dynamic_cast<PackedArrayNumericTableIface *>(dataTable);
+        if (packedTable) {
             packedTable->getPackedArray(readOnly, block);
             if (isLower(layout)) {
                 printLowerArray<DAAL_DATA_TYPE>(
@@ -423,10 +423,9 @@ void printNumericTable(NumericTable *dataTable, const char *message = "",
                                                 nCols, message, interval);
             }
             packedTable->releasePackedArray(block);
-        } catch (const std::bad_cast &e) {
-            std::cout
-                << "Dynamic cast to PackedArrayNumericTableIface* failed: "
-                << e.what() << std::endl;
+        } else {
+            std::cout << "Dynamic cast to PackedArrayNumericTableIface* failed."
+                      << std::endl;
         }
     }
 }