Skip to content
This repository has been archived by the owner on Feb 2, 2024. It is now read-only.

Series combine #821

Open
wants to merge 21 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
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
Prev Previous commit
Next Next commit
change for
  • Loading branch information
Rubtsowa committed May 26, 2020
commit 8628e319bb52e2e0dc0a30da44bd4e27cead9177
3 changes: 1 addition & 2 deletions sdc/datatypes/hpat_pandas_series_functions.py
Original file line number Diff line number Diff line change
Expand Up @@ -4955,7 +4955,7 @@ def sdc_pandas_series_combine_impl(self, other, func, fill_value=None):
chunks = parallel_chunks(len_val)
for i in prange(len(chunks)):
chunk = chunks[i]
for j in (chunk.start, chunk.stop):
for j in range(chunk.start, chunk.stop):
if self_indexes[j] == -1:
val_self = _fill_value
else:
Expand All @@ -4969,7 +4969,6 @@ def sdc_pandas_series_combine_impl(self, other, func, fill_value=None):
val_other = other[ind_other]._data[0]

result[j] = func(val_self, val_other)

return pandas.Series(result, index=indexes)

return sdc_pandas_series_combine_impl