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.

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

Implement cftime vectorization as discussed in PR #8322 #8324

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
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
41 changes: 27 additions & 14 deletions xarray/coding/times.py
Original file line number Diff line number Diff line change
Expand Up @@ -628,25 +628,38 @@ def _encode_datetime_with_cftime(dates, units: str, calendar: str) -> np.ndarray
if cftime is None:
raise ModuleNotFoundError("No module named 'cftime'")

dates = np.asarray(dates)
original_shape = dates.shape

if np.issubdtype(dates.dtype, np.datetime64):
# numpy's broken datetime conversion only works for us precision
dates = dates.astype("M8[us]").astype(datetime)

def encode_datetime(d):
# Since netCDF files do not support storing float128 values, we ensure
# that float64 values are used by setting longdouble=False in num2date.
# This try except logic can be removed when xarray's minimum version of
# cftime is at least 1.6.2.
try:
return (
np.nan
if d is None
else cftime.date2num(d, units, calendar, longdouble=False)
)
except TypeError:
return np.nan if d is None else cftime.date2num(d, units, calendar)
dates = np.atleast_1d(dates)

# Find all the None position
none_position = np.equal(dates, None)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

mypy complains here.
Not sure if this is an issue of wrong typing of numpy, or if this is not a recommended way of calling equals. (I think the None is the problem).

filtered_dates = dates[~none_position]

# Since netCDF files do not support storing float128 values, we ensure
# that float64 values are used by setting longdouble=False in num2date.
# This try except logic can be removed when xarray's minimum version of
# cftime is at least 1.6.2.
try:
encoded_nums = cftime.date2num(
filtered_dates, units, calendar, longdouble=False
)
except TypeError:
encoded_nums = cftime.date2num(filtered_dates, units, calendar)

if filtered_dates.size == none_position.size:
return encoded_nums.reshape(original_shape)

return reshape(np.array([encode_datetime(d) for d in ravel(dates)]), dates.shape)
# Create a full matrix of NaN
# And fill the num dates in the not NaN or None position
result = np.full(dates.shape, np.nan)
spencerkclark marked this conversation as resolved.
Show resolved Hide resolved
result[np.nonzero(~none_position)] = encoded_nums
return result.reshape(original_shape)


def cast_to_int_if_safe(num) -> np.ndarray:
Expand Down
Loading