Minor changes and simplifications in testing

Author: Nikita Kulikov

onedal/interop/tests/test_csr_table_interop.py

@@ -18,6 +18,7 @@
 import pytest
 from scipy.sparse import csr_matrix, find, isspmatrix_csr
 
+import onedal
 from onedal.interop.array import from_array
 from onedal.interop.csr_table import from_csr_table, is_csr_entity, to_csr_table
 
@@ -78,6 +79,10 @@ def generate_csr_data(gen, shape, per_row, dtypes):
     return (data, indices, offsets)
 
 
+sp_indexing = onedal._backend.data_management.sparse_indexing
+indexing_offset_map = {sp_indexing.zero_based: 0, sp_indexing.one_based: 1}
+
+
 @pytest.mark.parametrize("shape", table_dimensions)
 @pytest.mark.parametrize("dtype", get_dtype_list())
 @pytest.mark.parametrize("itype", [np.int32, np.uint32, np.int64])
@@ -100,9 +105,16 @@ def test_host_csr_table_functionality(shape, dtype, itype):
     assert onedal_table.get_row_count() == row_count
     assert onedal_table.get_column_count() == col_count
 
-    onedal_indices = from_array(onedal_table.get_column_indices())
+    curr_indexing = onedal_table.get_indexing()
+    offset = indexing_offset_map[curr_indexing]
+
+    def get_indices(array):
+        raw = from_array(array)
+        return raw - offset
+
+    onedal_indices = get_indices(onedal_table.get_column_indices())
     np.testing.assert_equal(scipy_indices, onedal_indices)
-    onedal_offsets = from_array(onedal_table.get_row_offsets())
+    onedal_offsets = get_indices(onedal_table.get_row_offsets())
     np.testing.assert_equal(scipy_offsets, onedal_offsets)
     onedal_data = from_array(onedal_table.get_data())
     np.testing.assert_equal(scipy_data, onedal_data)

onedal/interop/tests/test_homogen_table_interop.py

@@ -17,6 +17,7 @@
 import numpy as np
 import pytest
 
+import onedal
 from onedal.interop.homogen_table import (
     from_homogen_table,
     is_homogen_entity,
@@ -47,6 +48,24 @@
     (123, 999),
 ]
 
+data_layout = onedal._backend.data_management.data_layout
+
+
+def check_table_dimensions(table, shape, transpose):
+    assert table.get_row_count() == shape[0]
+    assert table.get_column_count() == shape[1]
+
+    is_simple = shape[0] == 1
+    is_simple = is_simple or shape[1] == 1
+
+    curr_layout = table.get_data_layout()
+    if transpose and not is_simple:
+        column_major = data_layout.column_major
+        assert curr_layout == column_major
+    else:
+        row_major = data_layout.row_major
+        assert curr_layout == row_major
+
 
 @pytest.mark.skipif(not dpctl_available, reason="requires dpctl>=0.14")
 @pytest.mark.parametrize("queue", get_queues("cpu,gpu"))
@@ -68,8 +87,8 @@ def test_device_array_functionality(queue, backend, transpose, shape, dtype):
     assert is_homogen_entity(onedal_table)
     del dpctl_tensor, wrapped_tensor
 
-    assert onedal_table.get_row_count() == dpctl_sua["shape"][0]
-    assert onedal_table.get_column_count() == dpctl_sua["shape"][1]
+    curr_shape = numpy_array.shape
+    check_table_dimensions(onedal_table, curr_shape, transpose)
 
     return_table = from_homogen_table(onedal_table)
 
@@ -100,8 +119,8 @@ def test_host_homogen_table_functionality(backend, transpose, shape, dtype):
     onedal_table = to_homogen_table(wrapped_tensor)
     assert is_homogen_entity(onedal_table)
 
-    assert onedal_table.get_row_count() == numpy_iface["shape"][0]
-    assert onedal_table.get_column_count() == numpy_iface["shape"][1]
+    curr_shape = numpy_array.shape
+    check_table_dimensions(onedal_table, curr_shape, transpose)
 
     return_table = from_homogen_table(onedal_table)
     return_iface = return_table.__array_interface__

onedal/svm/tests/test_svc.py

@@ -48,7 +48,7 @@ def _restore_from_saved(md, saved_dict):
         setattr(md, check_f, saved_dict[check_f])
 
 
-#def test_estimator():
+# def test_estimator():
 #    def dummy(*args, **kwargs):
 #        pass
 #

onedal/svm/tests/test_svr.py

@@ -49,7 +49,7 @@ def _restore_from_saved(md, saved_dict):
         setattr(md, check_f, saved_dict[check_f])
 
 
-#def test_estimator():
+# def test_estimator():
 #    def dummy(*args, **kwargs):
 #        pass
 #