Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Datasets] Allow MultiHotEncoder to encode arrays #31365

Merged
merged 1 commit into from
Jan 4, 2023
Merged

[Datasets] Allow MultiHotEncoder to encode arrays #31365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions python/ray/data/preprocessors/encoder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
from typing import List, Dict, Optional

from collections import Counter, OrderedDict
import numpy as np
import pandas as pd
import pandas.api.types

Expand Down Expand Up @@ -324,7 +325,9 @@ def _transform_pandas(self, df: pd.DataFrame):
_validate_df(df, *self.columns)
bveeramani marked this conversation as resolved.
Show resolved Hide resolved

def encode_list(element: list, *, name: str):
if not isinstance(element, list):
if isinstance(element, np.ndarray):
element = element.tolist()
elif not isinstance(element, list):
element = [element]
stats = self.stats_[f"unique_values({name})"]
counter = Counter(element)
Expand Down Expand Up @@ -509,6 +512,7 @@ def _get_unique_value_indices(
encode_lists: bool = True,
) -> Dict[str, Dict[str, int]]:
"""If drop_na_values is True, will silently drop NA values."""

if max_categories is None:
max_categories = {}
for column in max_categories:
Expand Down Expand Up @@ -601,5 +605,5 @@ def _is_series_composed_of_lists(series: pd.Series) -> bool:
(element for element in series if element is not None), None
)
return pandas.api.types.is_object_dtype(series.dtype) and isinstance(
first_not_none_element, list
first_not_none_element, (list, np.ndarray)
)
8 changes: 8 additions & 0 deletions python/ray/data/tests/preprocessors/test_encoder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,6 +416,14 @@ def test_multi_hot_encoder():
null_encoder.transform_batch(null_df)
null_encoder.transform_batch(nonnull_df)

# Verify that `fit` and `transform` work with ndarrays.
df = pd.DataFrame({"column": [np.array(["A"]), np.array(["A", "B"])]})
ds = ray.data.from_pandas(df)
encoder = MultiHotEncoder(["column"])
transformed = encoder.fit_transform(ds)
encodings = [record["column"] for record in transformed.take_all()]
assert encodings == [[1, 0], [1, 1]]


def test_multi_hot_encoder_with_max_categories():
"""Tests basic MultiHotEncoder functionality with limit."""
Expand Down