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

Series.add / Series.lt with fill_value #655

Merged
AlexanderKalistratov merged 22 commits into from
Apr 23, 2020
Merged

Series.add / Series.lt with fill_value #655

Show file tree
Hide file tree
Changes from 21 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
d331183
Series.add / Series.lt with fill_value
Feb 28, 2020
eb4a728
Merge branch 'master' of https://github.com/IntelPython/sdc into oper…
Feb 28, 2020
722e966
del useless
Feb 28, 2020
52560c1
Add oprimization for fill_value=None
Mar 2, 2020
8839fc1
Merge branch 'master' of https://github.com/IntelPython/sdc into oper…
Mar 2, 2020
475cb58
pep
Mar 2, 2020
b483957
test and impl fix
Mar 13, 2020
1684822
non index impl fix
Mar 13, 2020
b2ec0a6
update script
Mar 17, 2020
c0ca1ad
fix
Mar 17, 2020
af3bbdd
Merge branch 'master' of https://github.com/IntelPython/sdc into oper…
Mar 17, 2020
92d0692
fix operators
Mar 20, 2020
15e2806
add doc
Mar 20, 2020
fc0510b
div fix
Mar 20, 2020
90e5647
Merge branch 'master' into oper_ser
1e-to Mar 20, 2020
ef8fe79
doc fix
Mar 21, 2020
c48f2e3
fix algo for scalars
Mar 21, 2020
70a5484
small fixes
Apr 14, 2020
bf87286
Merge branch 'master' into oper_ser
1e-to Apr 14, 2020
8f76b36
del prange
Apr 14, 2020
e09a6fc
Fix script
Apr 20, 2020
542a59c
fix vars
Apr 20, 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
23 changes: 20 additions & 3 deletions buildscripts/autogen_sources.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@

arithmetic_binops_symbols = {
'add': '+',
'div': '/',
'sub': '-',
'mul': '*',
'truediv': '/',
Expand Down Expand Up @@ -116,9 +117,12 @@
imports_start_line, import_end_line = min(imports_line_numbers), max(imports_line_numbers)
import_section_text = ''.join(module_text_lines[imports_start_line: import_end_line + 1])

series_operator_comp_binop = inspect.getsource(templates_module.sdc_pandas_series_operator_comp_binop)
Copy link
Contributor

@kozlov-alexey kozlov-alexey Apr 20, 2020

Choose a reason for hiding this comment

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

I don't think series_operator_comp_binop var is needed, since we are using it only once.
Let's maybe rename and shorten the template names, e.g:

template_series_arithmetic_binop -> template_series_binop
template_series_comparison_binop -> template_series_comp_binop
template_series_arithmetic_binop_operator -> template_series_operator
template_series_comparison_binop_operator -> template_series_comp_operator
template_str_arr_comparison_binop -> template_str_arr_comp_binop

# read function templates for arithmetic and comparison operators from templates module
template_series_arithmetic_binop = inspect.getsource(templates_module.sdc_pandas_series_operator_binop)
template_series_comparison_binop = inspect.getsource(templates_module.sdc_pandas_series_operator_comp_binop)
template_series_arithmetic_binop = inspect.getsource(templates_module.sdc_pandas_series_binop)
template_series_comparison_binop = inspect.getsource(templates_module.sdc_pandas_series_comp_binop)
template_series_arithmetic_binop_operator = inspect.getsource(templates_module.sdc_pandas_series_operator_binop)
template_series_comparison_binop_operator = series_operator_comp_binop
template_str_arr_comparison_binop = inspect.getsource(templates_module.sdc_str_arr_operator_comp_binop)

exit_status = -1
Expand All @@ -135,12 +139,25 @@
for name in arithmetic_binops_symbols:
func_text = template_series_arithmetic_binop.replace('binop', name)
func_text = func_text.replace(' + ', f' {arithmetic_binops_symbols[name]} ')
func_text = func_text.replace('def ', f'@sdc_overload(operator.{name})\ndef ', 1)
func_text = func_text.replace('def ', f"@sdc_overload_method(SeriesType, '{name}')\ndef ", 1)
file.write(f'\n\n{func_text}')

for name in comparison_binops_symbols:
func_text = template_series_comparison_binop.replace('comp_binop', name)
func_text = func_text.replace(' < ', f' {comparison_binops_symbols[name]} ')
func_text = func_text.replace('def ', f"@sdc_overload_method(SeriesType, '{name}')\ndef ", 1)
file.write(f'\n\n{func_text}')

for name in arithmetic_binops_symbols:
if name != "div":
func_text = template_series_arithmetic_binop_operator.replace('binop', name)
func_text = func_text.replace(' + ', f' {arithmetic_binops_symbols[name]} ')
func_text = func_text.replace('def ', f'@sdc_overload(operator.{name})\ndef ', 1)
file.write(f'\n\n{func_text}')

for name in comparison_binops_symbols:
func_text = template_series_comparison_binop_operator.replace('comp_binop', name)
func_text = func_text.replace(' < ', f' {comparison_binops_symbols[name]} ')
func_text = func_text.replace('def ', f'@sdc_overload(operator.{name})\ndef ', 1)
file.write(f'\n\n{func_text}')

Expand Down
16 changes: 14 additions & 2 deletions sdc/datatypes/common_functions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,9 +228,21 @@ def sdc_join_series_indexes_impl(left, right):
ridx = numpy.empty(est_total_size, numpy.int64)
joined = numpy.empty(est_total_size, numba_common_dtype)

left_nan = []
right_nan = []
for i in range(lsize):
if numpy.isnan(left[i]):
left_nan.append(i)
for i in range(rsize):
if numpy.isnan(right[i]):
right_nan.append(i)

# sort arrays saving the old positions
sorted_left = numpy.argsort(left, kind='mergesort')
sorted_right = numpy.argsort(right, kind='mergesort')
# put the position of the nans in an increasing sequence
sorted_left[lsize-len(left_nan):] = left_nan
sorted_right[rsize-len(right_nan):] = right_nan

i, j, k = 0, 0, 0
while (i < lsize and j < rsize):
Expand All @@ -241,13 +253,13 @@ def sdc_join_series_indexes_impl(left, right):
left_index = left[sorted_left[i]]
right_index = right[sorted_right[j]]

if (left_index < right_index):
if (left_index < right_index) or numpy.isnan(right_index):
joined[k] = left_index
lidx[k] = sorted_left[i]
ridx[k] = -1
i += 1
k += 1
elif (left_index > right_index):
elif (left_index > right_index) or numpy.isnan(left_index):
joined[k] = right_index
lidx[k] = -1
ridx[k] = sorted_right[j]
Expand Down
Loading