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

Raise NotImplementedError in to_datetime with dayfirst without infer_format #14058

Merged
merged 4 commits into from
Sep 15, 2023
Merged

Raise NotImplementedError in to_datetime with dayfirst without infer_format #14058

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
77ef1b7
Raise NotImplementedError in to_datetime with dayfirst without infer_…
mroeschke Sep 7, 2023
995b082
Merge remote-tracking branch 'upstream/branch-23.10' into bug/to_date…
mroeschke Sep 9, 2023
940313f
Fix condition
mroeschke Sep 11, 2023
cc28394
Merge remote-tracking branch 'upstream/branch-23.10' into bug/to_date…
mroeschke Sep 13, 2023
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
11 changes: 6 additions & 5 deletions python/cudf/cudf/core/tools/datetimes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,15 +353,16 @@ def _process_col(col, unit, dayfirst, infer_datetime_format, format):
format=format,
)
else:
if infer_datetime_format and format is None:
if format is None:
if not infer_datetime_format and dayfirst:
raise NotImplementedError(
f"{dayfirst=} not implemented "
f"when {format=} and {infer_datetime_format=}."
)
format = column.datetime.infer_format(
element=col.element_indexing(0),
dayfirst=dayfirst,
)
elif format is None:
format = column.datetime.infer_format(
element=col.element_indexing(0)
)
return col.as_datetime_column(
dtype=_unit_dtype_map[unit],
format=format,
Expand Down
38 changes: 30 additions & 8 deletions python/cudf/cudf/tests/test_datetime.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -617,22 +617,44 @@ def test_datetime_dataframe():
@pytest.mark.parametrize("infer_datetime_format", [True, False])
def test_cudf_to_datetime(data, dayfirst, infer_datetime_format):
pd_data = data
is_string_data = False
if isinstance(pd_data, (pd.Series, pd.DataFrame, pd.Index)):
gd_data = cudf.from_pandas(pd_data)
is_string_data = (
gd_data.ndim == 1
and not gd_data.empty
and gd_data.dtype.kind == "O"
)
else:
if type(pd_data).__module__ == np.__name__:
gd_data = cp.array(pd_data)
else:
gd_data = pd_data
is_string_data = isinstance(gd_data, list) and isinstance(
next(iter(gd_data), None), str
)

expected = pd.to_datetime(
pd_data, dayfirst=dayfirst, infer_datetime_format=infer_datetime_format
)
actual = cudf.to_datetime(
gd_data, dayfirst=dayfirst, infer_datetime_format=infer_datetime_format
)

assert_eq(actual, expected)
if dayfirst and not infer_datetime_format and is_string_data:
# Note: pandas<2.0 also does not respect dayfirst=True correctly
# for object data
with pytest.raises(NotImplementedError):
cudf.to_datetime(
gd_data,
dayfirst=dayfirst,
infer_datetime_format=infer_datetime_format,
)
else:
expected = pd.to_datetime(
pd_data,
dayfirst=dayfirst,
infer_datetime_format=infer_datetime_format,
)
actual = cudf.to_datetime(
gd_data,
dayfirst=dayfirst,
infer_datetime_format=infer_datetime_format,
)
assert_eq(actual, expected)


@pytest.mark.parametrize(
Expand Down