move "batch_size" from data to dataloader (#475)

alibaba · Dec 20, 2022 · f837073 · f837073
1 parent 61d429e
commit f837073
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/federatedscope/vertical_fl/xgb_base/baseline/xgb_base_on_abalone.yaml b/federatedscope/vertical_fl/xgb_base/baseline/xgb_base_on_abalone.yaml
@@ -9,10 +9,10 @@ model:
 data:
   root: data/
   type: abalone
-  batch_size: 4000
   splits: [0.8, 0.2]
 dataloader:
   type: raw
+  batch_size: 4000
 criterion:
   type: Regression
 trainer:

diff --git a/federatedscope/vertical_fl/xgb_base/baseline/xgb_base_on_blogfeedback.yaml b/federatedscope/vertical_fl/xgb_base/baseline/xgb_base_on_blogfeedback.yaml
@@ -9,10 +9,10 @@ model:
 data:
   root: data/
   type: blog
-  batch_size: 8000
   splits: [1.0, 0.0]
 dataloader:
   type: raw
+  batch_size: 8000
 criterion:
   type: Regression
 trainer:

diff --git a/federatedscope/vertical_fl/xgb_base/baseline/xgb_base_on_givemesomecredit.yaml b/federatedscope/vertical_fl/xgb_base/baseline/xgb_base_on_givemesomecredit.yaml
@@ -9,10 +9,10 @@ model:
 data:
   root: data/
   type: credit
-  batch_size: 2000
   splits: [0.8, 0.2]
 dataloader:
   type: raw
+  batch_size: 2000
 criterion:
   type: CrossEntropyLoss
 trainer:

diff --git a/federatedscope/vertical_fl/xgb_base/worker/XGBClient.py b/federatedscope/vertical_fl/xgb_base/worker/XGBClient.py
@@ -47,7 +47,7 @@ def __init__(self,
         self.federate_mode = config.federate.mode
 
         self.bin_num = config.train.optimizer.bin_num
-        self.batch_size = config.data.batch_size
+        self.batch_size = config.dataloader.batch_size
 
         self.data = data
         self.own_label = ('y' in self.data['train'])
@@ -74,7 +74,7 @@ def _init_data_related_var(self):
         self.num_of_parties = self._cfg.federate.client_num
 
         self.dataloader = batch_iter(self.data['train'],
-                                     self._cfg.data.batch_size,
+                                     self.batch_size,
                                      shuffled=True)
 
         self.feature_order = None

diff --git a/federatedscope/vertical_fl/xgb_base/worker/XGBServer.py b/federatedscope/vertical_fl/xgb_base/worker/XGBServer.py
@@ -45,7 +45,7 @@ def __init__(self,
                                self.callback_func_for_feature_importance)
 
     def _init_data_related_var(self):
-        self.batch_size = self._cfg.data.batch_size
+        self.batch_size = self._cfg.dataloader.batch_size
         self.feature_list = [0] + self.vertical_dims
         self.feature_partition = [
             self.feature_list[i + 1] - self.feature_list[i]