Skip to content
This repository was archived by the owner on Feb 2, 2024. It is now read-only.
Closed
Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion sdc/datatypes/hpat_pandas_dataframe_functions.py
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,7 @@ def _dataframe_reduce_columns_codegen(func_name, func_params, series_params, col
func_lines = [f'def _df_{func_name}_impl({joined}):']
for i, c in enumerate(columns):
result_c = f'result_{i}'
func_lines += [f' series_{i} = pandas.Series({func_params[0]}._data[{i}])',
func_lines += [f' series_{i} = pandas.Series({func_params[0]}._data[0][{i}])',
f' {result_c} = series_{i}.{func_name}({series_params})']
result_name_list.append(result_c)
all_results = ', '.join(result_name_list)
Expand Down
15 changes: 13 additions & 2 deletions sdc/hiframes/pd_dataframe_ext.py
Original file line number Diff line number Diff line change
Expand Up @@ -122,10 +122,21 @@ def codegen(context, builder, signature, args):
dataframe = cgutils.create_struct_proxy(
signature.return_type)(context, builder)

# data_tup = context.make_tuple(
# builder, types.Tuple(data_typs), data_arrs)
# column_tup = context.make_tuple(
# builder, types.UniTuple(string_type, n_cols), column_strs)

data_list_type = types.List(data_typs[0])
data_list = context.build_list(builder, data_list_type, data_arrs)
data_tup = context.make_tuple(
builder, types.Tuple(data_typs), data_arrs)
builder, types.Tuple([data_list_type]), [data_list])

col_list_type = types.List(string_type)
column_list = context.build_list(builder, col_list_type, column_strs)
column_tup = context.make_tuple(
builder, types.UniTuple(string_type, n_cols), column_strs)
builder, types.UniTuple(col_list_type, 1), [column_list])

zero = context.get_constant(types.int8, 0)

dataframe.data = data_tup
Expand Down
6 changes: 4 additions & 2 deletions sdc/hiframes/pd_dataframe_type.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,11 @@ class DataFrameModel(models.StructModel):
def __init__(self, dmm, fe_type):
n_cols = len(fe_type.columns)
members = [
('data', types.Tuple(fe_type.data)),
# ('data', types.Tuple(fe_type.data)),
('data', types.Tuple([types.List(fe_type.data[0])])),
('index', fe_type.index),
('columns', types.UniTuple(string_type, n_cols)),
# ('columns', types.UniTuple(string_type, n_cols)),
('columns', types.UniTuple(types.List(string_type), 1)),
('parent', types.pyobject),
]
super(DataFrameModel, self).__init__(dmm, fe_type, members)
Expand Down