Merge pull request FederatedAI#541 from FederatedAI/contributor_1.0_d…

…ocker Fix KFold and model_base bugs
pf-wang · Sep 4, 2019 · 9661774 · 9661774
2 parents 912163c + 06a4b29
commit 9661774
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/federatedml/model_base.py b/federatedml/model_base.py
@@ -137,7 +137,7 @@ def _run_data(self, data_sets=None, stage=None):
                     eval_data_output = eval_data_output.mapValues(lambda value: value + ["validation"])
 
                 if self.data_output and eval_data_output:
-                    self.data_output.union(eval_data_output)
+                    self.data_output = self.data_output.union(eval_data_output)
                 elif not self.data_output and eval_data_output:
                     self.data_output = eval_data_output
 

diff --git a/federatedml/model_selection/KFold.py b/federatedml/model_selection/KFold.py
@@ -183,13 +183,13 @@ def _synchronize_data(self, data_instance, flowid, data_application=None):
                               name=transfer_id.name,
                               tag=transfer_variable.generate_transferid(transfer_id, flowid),
                               role=consts.HOST,
-                              idx=0)
+                              idx=-1)
             LOGGER.info("remote {} to host".format(data_application))
             return None
         elif self.role == consts.HOST:
             data_sid = federation.get(name=transfer_id.name,
                                       tag=transfer_variable.generate_transferid(transfer_id, flowid),
-                                      idx=-1)
+                                      idx=0)
 
             LOGGER.info("get {} from guest".format(data_application))
             join_data_insts = data_sid.join(data_instance, lambda s, d: d)