[Datasets] Unrevert "Fix ndarray representation of single-element rag…

…ged tensor slices. (#30514)" (#30721) (#30752)

This unreverts #30514 by reverting commit 579770a.

A test was merged into master while the original PR was open, which then broke when the original PR was merged. This wasn't caught in pre-merge checks since the PR was merged without having rebased onto latest master.

python/ray/air/tests/test_tensor_extension.py

@@ -178,7 +178,14 @@ def test_arrow_variable_shaped_tensor_array_slice():
         slice(0, 3),
     ]
     for slice_ in slices:
-        for o, e in zip(ata[slice_], arr[slice_]):
+        ata_slice = ata[slice_]
+        ata_slice_np = ata_slice.to_numpy()
+        arr_slice = arr[slice_]
+        # Check for equivalent dtypes and shapes.
+        assert ata_slice_np.dtype == arr_slice.dtype
+        assert ata_slice_np.shape == arr_slice.shape
+        # Iteration over tensor array slices triggers NumPy conversion.
+        for o, e in zip(ata_slice, arr_slice):
             np.testing.assert_array_equal(o, e)
 
 

python/ray/air/util/tensor_extensions/arrow.py

@@ -5,7 +5,10 @@
 import numpy as np
 import pyarrow as pa
 
-from ray.air.util.tensor_extensions.utils import _is_ndarray_variable_shaped_tensor
+from ray.air.util.tensor_extensions.utils import (
+    _is_ndarray_variable_shaped_tensor,
+    _create_strict_ragged_ndarray,
+)
 from ray._private.utils import _get_pyarrow_version
 from ray.util.annotations import PublicAPI
 
@@ -664,10 +667,11 @@ def from_numpy(
             np_data_buffer = np.concatenate(raveled)
         dtype = np_data_buffer.dtype
         if dtype.type is np.object_:
+            types_and_shapes = [(f"dtype={a.dtype}", f"shape={a.shape}") for a in arr]
             raise ValueError(
                 "ArrowVariableShapedTensorArray only supports heterogeneous-shaped "
-                "tensor collections, not arbitrarily nested ragged tensors. Got: "
-                f"{arr}"
+                "tensor collections, not arbitrarily nested ragged tensors. Got "
+                f"arrays: {types_and_shapes}"
             )
         pa_dtype = pa.from_numpy_dtype(dtype)
         if dtype.type is np.bool_:
@@ -720,7 +724,7 @@ def _to_numpy(self, index: Optional[int] = None, zero_copy_only: bool = False):
             arrs = [self._to_numpy(i, zero_copy_only) for i in range(len(self))]
             # Return ragged NumPy ndarray in the ndarray of ndarray pointers
             # representation.
-            return np.array(arrs, dtype=object)
+            return _create_strict_ragged_ndarray(arrs)
         data = self.storage.field("data")
         shapes = self.storage.field("shape")
         value_type = data.type.value_type

python/ray/air/util/tensor_extensions/pandas.py

@@ -44,7 +44,10 @@
 from pandas.core.indexers import check_array_indexer, validate_indices
 from pandas.io.formats.format import ExtensionArrayFormatter
 
-from ray.air.util.tensor_extensions.utils import _is_ndarray_variable_shaped_tensor
+from ray.air.util.tensor_extensions.utils import (
+    _is_ndarray_variable_shaped_tensor,
+    _create_strict_ragged_ndarray,
+)
 from ray.util.annotations import PublicAPI
 
 try:
@@ -1422,9 +1425,7 @@ def _is_boolean(self):
 
 
 def _create_possibly_ragged_ndarray(
-    values: Union[
-        np.ndarray, ABCSeries, Sequence[Union[np.ndarray, TensorArrayElement]]
-    ]
+    values: Union[np.ndarray, ABCSeries, Sequence[np.ndarray]]
 ) -> np.ndarray:
     """
     Create a possibly ragged ndarray.
@@ -1438,11 +1439,8 @@ def _create_possibly_ragged_ndarray(
         return np.array(values, copy=False)
     except ValueError as e:
         if "could not broadcast input array from shape" in str(e):
-            # Create an empty object-dtyped 1D array.
-            arr = np.empty(len(values), dtype=object)
-            # Try to fill the 1D array of pointers with the (ragged) tensors.
-            arr[:] = list(values)
-            return arr
+            # Fall back to strictly creating a ragged ndarray.
+            return _create_strict_ragged_ndarray(values)
         else:
             # Re-raise original error if the failure wasn't a broadcast error.
             raise e from None

python/ray/air/util/tensor_extensions/utils.py

@@ -1,3 +1,5 @@
+from typing import Any
+
 import numpy as np
 
 
@@ -20,3 +22,23 @@ def _is_ndarray_variable_shaped_tensor(arr: np.ndarray) -> bool:
         if a.shape != shape:
             return True
     return True
+
+
+def _create_strict_ragged_ndarray(values: Any) -> np.ndarray:
+    """Create a ragged ndarray; the representation will be ragged (1D array of
+    subndarray pointers) even if it's possible to represent it as a non-ragged ndarray.
+    """
+    # Use the create-empty-and-fill method. This avoids the following pitfalls of the
+    # np.array constructor - np.array(values, dtype=object):
+    #  1. It will fail to construct an ndarray if the first element dimension is
+    #  uniform, e.g. for imagery whose first element dimension is the channel.
+    #  2. It will construct the wrong representation for a single-row column (i.e. unit
+    #  outer dimension). Namely, it will consolidate it into a single multi-dimensional
+    #  ndarray rather than a 1D array of subndarray pointers, resulting in the single
+    #  row not being well-typed (having object dtype).
+
+    # Create an empty object-dtyped 1D array.
+    arr = np.empty(len(values), dtype=object)
+    # Try to fill the 1D array of pointers with the (ragged) tensors.
+    arr[:] = list(values)
+    return arr

python/ray/data/tests/test_transform_pyarrow.py

@@ -142,7 +142,8 @@ def test_arrow_concat_tensor_extension_uniform_and_variable_shaped():
     # consolidation).
     assert out["a"].num_chunks == 2
     # Check content.
-    np.testing.assert_array_equal(out["a"].chunk(0).to_numpy(), a1)
+    for o, e in zip(out["a"].chunk(0).to_numpy(), a1):
+        np.testing.assert_array_equal(o, e)
     for o, e in zip(out["a"].chunk(1).to_numpy(), a2):
         np.testing.assert_array_equal(o, e)
     # NOTE: We don't check equivalence with pyarrow.concat_tables since it currently
@@ -167,8 +168,10 @@ def test_arrow_concat_tensor_extension_uniform_but_different():
     # consolidation).
     assert out["a"].num_chunks == 2
     # Check content.
-    np.testing.assert_array_equal(out["a"].chunk(0).to_numpy(), a1)
-    np.testing.assert_array_equal(out["a"].chunk(1).to_numpy(), a2)
+    for o, e in zip(out["a"].chunk(0).to_numpy(), a1):
+        np.testing.assert_array_equal(o, e)
+    for o, e in zip(out["a"].chunk(1).to_numpy(), a2):
+        np.testing.assert_array_equal(o, e)
     # NOTE: We don't check equivalence with pyarrow.concat_tables since it currently
     # fails for this case.