fix dataframe convert when input cols are str

Signed-off-by: mgqa34 <mgq3374541@163.com>
FederatedAI · Jun 20, 2023 · b115c34 · b115c34
1 parent 3b5923b
commit b115c34
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 10 deletions.
diff --git a/python/fate/arch/dataframe/_frame_reader.py b/python/fate/arch/dataframe/_frame_reader.py
@@ -86,12 +86,12 @@ def _dense_format_to_frame(self, ctx, table):
         from .ops._indexer import get_partition_order_by_raw_table
         partition_order_mappings = get_partition_order_by_raw_table(table)
         # partition_order_mappings = _get_partition_order(table)
-        functools.partial(_to_blocks,
-                          data_manager=data_manager,
-                          retrieval_index_dict=retrieval_index_dict,
-                          partition_order_mappings=partition_order_mappings)
+        to_block_func = functools.partial(_to_blocks,
+                                          data_manager=data_manager,
+                                          retrieval_index_dict=retrieval_index_dict,
+                                          partition_order_mappings=partition_order_mappings)
         block_table = table.mapPartitions(
-            _to_blocks,
+            to_block_func,
             use_previous_behavior=False
         )
 

diff --git a/python/fate/arch/dataframe/manager/block_manager.py b/python/fate/arch/dataframe/manager/block_manager.py
@@ -220,7 +220,10 @@ def __init__(self, *args, **kwargs):
 
     @staticmethod
     def convert_block(block):
-        return  torch.tensor(block, dtype=torch.int32)
+        try:
+            return torch.tensor(block, dtype=torch.int32)
+        except ValueError:
+            return torch.tensor(np.array(block, dtype="int32"), dtype=torch.int32)
 
 
 class Int64Block(Block):
@@ -230,7 +233,10 @@ def __init__(self, *args, **kwargs):
 
     @staticmethod
     def convert_block(block):
-        return  torch.tensor(block, dtype=torch.int64)
+        try:
+            return torch.tensor(block, dtype=torch.int64)
+        except ValueError:
+            return torch.tensor(np.array(block, dtype="int64"), dtype=torch.int64)
 
 
 class Float32Block(Block):
@@ -240,7 +246,10 @@ def __init__(self, *args, **kwargs):
 
     @staticmethod
     def convert_block(block):
-        return torch.tensor(block, dtype=torch.float32)
+        try:
+            return torch.tensor(block, dtype=torch.float32)
+        except ValueError:
+            return torch.tensor(np.array(block, dtype="float32"), dtype=torch.float32)
 
 
 class Float64Block(Block):
@@ -250,7 +259,10 @@ def __init__(self, *args, **kwargs):
 
     @staticmethod
     def convert_block(block):
-        return torch.tensor(block, dtype=torch.float64)
+        try:
+            return torch.tensor(block, dtype=torch.float64)
+        except ValueError:
+            return torch.tensor(np.array(block, dtype="float64"), dtype=torch.float64)
 
 
 class BoolBlock(Block):
@@ -260,7 +272,10 @@ def __init__(self, *args, **kwargs):
 
     @staticmethod
     def convert_block(block):
-        return  torch.tensor(block, dtype=torch.bool)
+        try:
+            return torch.tensor(block, dtype=torch.bool)
+        except ValueError:
+            return torch.tensor(np.array(block, dtype="bool"), dtype=torch.bool)
 
 
 class IndexBlock(Block):