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

Re-implement DataFrame unboxing #860

Merged
densmirn merged 13 commits into from
May 29, 2020
Merged

Re-implement DataFrame unboxing #860

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
4e5cd9a
Boxing draft
akharche May 25, 2020
06e9295
Merge branch 'feature/dataframe_model_refactoring' of https://github.…
akharche May 27, 2020
ce499ff
Implement unboxing in new structure
akharche May 27, 2020
fdf672e
Improve variable names + add error handling
akharche May 28, 2020
f164c3d
Return error status
akharche May 28, 2020
99e9269
Move getting list size to if_ok block
akharche May 28, 2020
ce771b8
Unskipped unexpected success tests
akharche May 28, 2020
6b45a77
Unskipped unexpected success tests in GroupBy
akharche May 28, 2020
0814cc3
Merge branch 'feature/dataframe_model_refactoring' of https://github.…
akharche May 29, 2020
66b40a8
Remove decorators
akharche May 29, 2020
1d43ce6
Change to incref False
akharche May 29, 2020
8ee9364
Skip tests failed due to unimplemented df structure
akharche May 29, 2020
666fceb
Bug in rolling
akharche May 29, 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
Prev Previous commit
Next Next commit
Move getting list size to if_ok block
  • Loading branch information
@akharche
akharche committed May 28, 2020
commit 99e92694c747f4d4947557e4df8100602d9579d8
4 changes: 2 additions & 2 deletions sdc/hiframes/boxing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,10 +94,10 @@ def unbox_dataframe(typ, val, c):

col_list_type = types.List(string_type)
ok, inst = listobj.ListInstance.allocate_ex(c.context, c.builder, col_list_type, n_cols)
inst.size = c.context.get_constant(types.intp, n_cols)

with c.builder.if_else(ok, likely=True) as (if_ok, if_not_ok):
with if_ok:
inst.size = c.context.get_constant(types.intp, n_cols)
for i, column_str in enumerate(column_strs):
inst.setitem(c.context.get_constant(types.intp, i), column_str, incref=True)
dataframe.columns = inst.value
Expand All @@ -116,10 +116,10 @@ def unbox_dataframe(typ, val, c):
n_type_cols = len(col_indices)
list_type = types.List(col_typ)
ok, inst = listobj.ListInstance.allocate_ex(c.context, c.builder, list_type, n_type_cols)
inst.size = c.context.get_constant(types.intp, n_type_cols)

with c.builder.if_else(ok, likely=True) as (if_ok, if_not_ok):
with if_ok:
inst.size = c.context.get_constant(types.intp, n_type_cols)
for i, col_idx in enumerate(col_indices):
series_obj = c.pyapi.object_getattr_string(val, typ.columns[col_idx])
arr_obj = c.pyapi.object_getattr_string(series_obj, "values")
Expand Down