Skip to content

REF: use consistent pattern in tslibs.vectorized #35613

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

Merged
merged 7 commits into from
Aug 11, 2020
Merged

REF: use consistent pattern in tslibs.vectorized #35613

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f3f0248
REF: use use_utc pattern in tslibs.vectorized
jbrockmendel Aug 4, 2020
9f5d9ef
Merge branch 'master' of https://github.com/pandas-dev/pandas into re…
jbrockmendel Aug 4, 2020
feb99e7
Merge branch 'master' of https://github.com/pandas-dev/pandas into re…
jbrockmendel Aug 8, 2020
a84c147
Fix declarations
jbrockmendel Aug 8, 2020
4424c28
initialize preemptively
jbrockmendel Aug 8, 2020
2070549
Merge branch 'master' of https://github.com/pandas-dev/pandas into re…
jbrockmendel Aug 10, 2020
28af38f
STY: whitespace fixup
jbrockmendel Aug 10, 2020
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
149 changes: 66 additions & 83 deletions pandas/_libs/tslibs/vectorized.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,44 +275,38 @@ cpdef ndarray[int64_t] normalize_i8_timestamps(const int64_t[:] stamps, tzinfo t
int64_t[:] deltas
str typ
Py_ssize_t[:] pos
int64_t delta, local_val

if tz is None or is_utc(tz):
with nogil:
for i in range(n):
if stamps[i] == NPY_NAT:
result[i] = NPY_NAT
continue
local_val = stamps[i]
result[i] = normalize_i8_stamp(local_val)
int64_t local_val, delta = NPY_NAT
bint use_utc = False, use_tzlocal = False, use_fixed = False

if is_utc(tz) or tz is None:
use_utc = True
elif is_tzlocal(tz):
for i in range(n):
if stamps[i] == NPY_NAT:
result[i] = NPY_NAT
continue
local_val = tz_convert_utc_to_tzlocal(stamps[i], tz)
result[i] = normalize_i8_stamp(local_val)
use_tzlocal = True
else:
# Adjust datetime64 timestamp, recompute datetimestruct
trans, deltas, typ = get_dst_info(tz)

if typ not in ["pytz", "dateutil"]:
# static/fixed; in this case we know that len(delta) == 1
use_fixed = True
delta = deltas[0]
for i in range(n):
if stamps[i] == NPY_NAT:
result[i] = NPY_NAT
continue
local_val = stamps[i] + delta
result[i] = normalize_i8_stamp(local_val)
else:
pos = trans.searchsorted(stamps, side="right") - 1
for i in range(n):
if stamps[i] == NPY_NAT:
result[i] = NPY_NAT
continue
local_val = stamps[i] + deltas[pos[i]]
result[i] = normalize_i8_stamp(local_val)

for i in range(n):
# TODO: reinstate nogil for use_utc case?
if stamps[i] == NPY_NAT:
result[i] = NPY_NAT
continue

if use_utc:
local_val = stamps[i]
elif use_tzlocal:
local_val = tz_convert_utc_to_tzlocal(stamps[i], tz)
elif use_fixed:
local_val = stamps[i] + delta
else:
local_val = stamps[i] + deltas[pos[i]]

result[i] = normalize_i8_stamp(local_val)

return result.base # `.base` to access underlying ndarray

Expand All @@ -339,40 +333,36 @@ def is_date_array_normalized(const int64_t[:] stamps, tzinfo tz=None):
ndarray[int64_t] trans
int64_t[:] deltas
intp_t[:] pos
int64_t local_val, delta
int64_t local_val, delta = NPY_NAT
str typ
int64_t day_nanos = 24 * 3600 * 1_000_000_000
bint use_utc = False, use_tzlocal = False, use_fixed = False

if tz is None or is_utc(tz):
for i in range(n):
local_val = stamps[i]
if local_val % day_nanos != 0:
return False

if is_utc(tz) or tz is None:
use_utc = True
elif is_tzlocal(tz):
for i in range(n):
local_val = tz_convert_utc_to_tzlocal(stamps[i], tz)
if local_val % day_nanos != 0:
return False
use_tzlocal = True
else:
trans, deltas, typ = get_dst_info(tz)

if typ not in ["pytz", "dateutil"]:
# static/fixed; in this case we know that len(delta) == 1
use_fixed = True
delta = deltas[0]
for i in range(n):
# Adjust datetime64 timestamp, recompute datetimestruct
local_val = stamps[i] + delta
if local_val % day_nanos != 0:
return False
else:
pos = trans.searchsorted(stamps, side="right") - 1

for i in range(n):
if use_utc:
local_val = stamps[i]
elif use_tzlocal:
local_val = tz_convert_utc_to_tzlocal(stamps[i], tz)
elif use_fixed:
local_val = stamps[i] + delta
else:
pos = trans.searchsorted(stamps) - 1
for i in range(n):
# Adjust datetime64 timestamp, recompute datetimestruct
local_val = stamps[i] + deltas[pos[i]]
if local_val % day_nanos != 0:
return False
local_val = stamps[i] + deltas[pos[i]]

if local_val % day_nanos != 0:
return False

return True

Expand All @@ -390,45 +380,38 @@ def dt64arr_to_periodarr(const int64_t[:] stamps, int freq, tzinfo tz):
int64_t[:] deltas
Py_ssize_t[:] pos
npy_datetimestruct dts
int64_t local_val
int64_t local_val, delta = NPY_NAT
bint use_utc = False, use_tzlocal = False, use_fixed = False

if is_utc(tz) or tz is None:
with nogil:
for i in range(n):
if stamps[i] == NPY_NAT:
result[i] = NPY_NAT
continue
dt64_to_dtstruct(stamps[i], &dts)
result[i] = get_period_ordinal(&dts, freq)

use_utc = True
elif is_tzlocal(tz):
for i in range(n):
if stamps[i] == NPY_NAT:
result[i] = NPY_NAT
continue
local_val = tz_convert_utc_to_tzlocal(stamps[i], tz)
dt64_to_dtstruct(local_val, &dts)
result[i] = get_period_ordinal(&dts, freq)
use_tzlocal = True
else:
# Adjust datetime64 timestamp, recompute datetimestruct
trans, deltas, typ = get_dst_info(tz)

if typ not in ["pytz", "dateutil"]:
# static/fixed; in this case we know that len(delta) == 1
for i in range(n):
if stamps[i] == NPY_NAT:
result[i] = NPY_NAT
continue
dt64_to_dtstruct(stamps[i] + deltas[0], &dts)
result[i] = get_period_ordinal(&dts, freq)
use_fixed = True
delta = deltas[0]
else:
pos = trans.searchsorted(stamps, side="right") - 1

for i in range(n):
if stamps[i] == NPY_NAT:
result[i] = NPY_NAT
continue
dt64_to_dtstruct(stamps[i] + deltas[pos[i]], &dts)
result[i] = get_period_ordinal(&dts, freq)
for i in range(n):
# TODO: reinstate nogil for use_utc case?
if stamps[i] == NPY_NAT:
result[i] = NPY_NAT
continue

if use_utc:
local_val = stamps[i]
elif use_tzlocal:
local_val = tz_convert_utc_to_tzlocal(stamps[i], tz)
elif use_fixed:
local_val = stamps[i] + delta
else:
local_val = stamps[i] + deltas[pos[i]]

dt64_to_dtstruct(local_val, &dts)
result[i] = get_period_ordinal(&dts, freq)

return result.base # .base to get underlying ndarray