Skip to content
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

dataframe fix: fix cmp between tensor and ndarray/pd.Series #4967

Merged
merged 1 commit into from
Jul 4, 2023
Merged

dataframe fix: fix cmp between tensor and ndarray/pd.Series #4967

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 9 additions & 4 deletions python/fate/arch/dataframe/ops/_cmp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import torch
from .._dataframe import DataFrame
from .._dataframe import DataManager
from ..manager import BlockType
from .utils.operators import binary_operate
from .utils.series_align import series_to_ndarray
from ._compress_block import compress_blocks
Expand All @@ -42,10 +43,13 @@ def cmp_operate(lhs: DataFrame, rhs, op) -> "DataFrame":
rhs = rhs.reshape(-1)
field_indexes = [data_manager.get_field_offset(name) for name in column_names]
field_indexes_mappings = dict(zip(field_indexes, range(len(field_indexes))))
rhs_blocks = [np.array([]) for i in range(data_manager.block_num)]
rhs_blocks = [np.array([]) for _ in range(data_manager.block_num)]
for bid in block_indexes:
indexer = [field_indexes_mappings[field] for field in data_manager.get_block(bid).field_indexes]
rhs_blocks[bid] = rhs[indexer]
if BlockType.is_tensor(data_manager.get_block(bid).block_type):
rhs_blocks[bid] = torch.Tensor(rhs[indexer])
else:
rhs_blocks[bid] = rhs[indexer]

block_table = binary_operate(lhs.block_table, rhs_blocks, op, block_indexes)

Expand All @@ -64,7 +68,7 @@ def cmp_operate(lhs: DataFrame, rhs, op) -> "DataFrame":
]

block_table = _cmp_dfs(lhs.block_table, rhs.block_table, op, lhs_block_loc, rhs_block_loc,
block_indexes, indexers)
block_indexes, indexers)
else:
raise ValueError(f"Not implement comparison of rhs type={type(rhs)}")

Expand All @@ -76,14 +80,15 @@ def cmp_operate(lhs: DataFrame, rhs, op) -> "DataFrame":
data_manager
)


def _merge_bool_blocks(block_table, data_manager: DataManager, block_indexes):
"""
all blocks are bool type, they should be merge into one blocks
"""
dst_data_manager = data_manager.duplicate()
to_promote_types = []
for bid in block_indexes:
to_promote_types.append((bid, torch.bool))
to_promote_types.append((bid, BlockType.bool))

dst_data_manager.promote_types(to_promote_types)
dst_block_table, dst_data_manager = compress_blocks(block_table, dst_data_manager)
Expand Down