From 1c0933b4c6c4f1b1ccac2f01bc881bef6ec251ea Mon Sep 17 00:00:00 2001
From: Samir Nasibli <samir.nasibli@intel.com>
Date: Mon, 30 Sep 2024 07:39:45 -0700
Subject: [PATCH] minor updates

---
 .../datatypes/data_conversion_sua_iface.cpp   | 26 +------------------
 sklearnex/tests/test_memory_usage.py          |  4 +++
 2 files changed, 5 insertions(+), 25 deletions(-)

diff --git a/onedal/datatypes/data_conversion_sua_iface.cpp b/onedal/datatypes/data_conversion_sua_iface.cpp
index f81dc01d26..d60d2c7f92 100644
--- a/onedal/datatypes/data_conversion_sua_iface.cpp
+++ b/onedal/datatypes/data_conversion_sua_iface.cpp
@@ -207,30 +207,6 @@ void report_problem_to_sua_iface(const char* clarification) {
     throw std::runtime_error{ message };
 }
 
-// TODO:
-// re-use convert_dal_to_sua_type instead.
-std::string get_npy_typestr(const dal::data_type dtype) {
-    switch (dtype) {
-        case dal::data_type::float32: {
-            return "<f4";
-            break;
-        }
-        case dal::data_type::float64: {
-            return "<f8";
-            break;
-        }
-        case dal::data_type::int32: {
-            return "<i4";
-            break;
-        }
-        case dal::data_type::int64: {
-            return "<i8";
-            break;
-        }
-        default: report_problem_to_sua_iface(": unknown data type");
-    };
-}
-
 py::tuple get_npy_strides(const dal::data_layout& data_layout,
                           npy_intp row_count,
                           npy_intp column_count) {
@@ -301,7 +277,7 @@ py::dict construct_sua_iface(const dal::table& input) {
     iface["strides"] = get_npy_strides(data_layout, row_count, column_count);
     // dpctl supports only version 1.
     iface["version"] = 1;
-    iface["typestr"] = get_npy_typestr(dtype);
+    iface["typestr"] = convert_dal_to_sua_type(dtype);
     iface["syclobj"] = pack_queue(queue);
 
     return iface;
diff --git a/sklearnex/tests/test_memory_usage.py b/sklearnex/tests/test_memory_usage.py
index 28a9ed2481..c2e74cfd1b 100644
--- a/sklearnex/tests/test_memory_usage.py
+++ b/sklearnex/tests/test_memory_usage.py
@@ -326,6 +326,10 @@ def test_gpu_memory_leaks(estimator, queue, order, data_shape):
         _kfold_function_template(GPU_ESTIMATORS[estimator], None, data_shape, queue, func)
 
 
+@pytest.mark.skipif(
+    dpctl_available,
+    reason="dpctl.tensor is required for testing.",
+)
 @pytest.mark.parametrize(
     "dataframe,queue", get_dataframes_and_queues("dpctl, dpnp", "cpu, gpu")
 )