Adapt FederatedServer to use the new version of FLRunConfig

declearn/main/_server.py

@@ -205,9 +205,10 @@ class FederatedServer:
             round_i = 0
             while True:
                 round_i += 1
-                await self.training_round(round_i, config.training)
-                await self.evaluation_round(round_i, config.evaluate)
-                if not self._keep_training(round_i, config.rounds, early_stop):
+                await self.training_round(round_i, config.get_next_train_config)
+                if config.get_next_valid_config is not None:
+                    await self.evaluation_round(round_i, config.get_next_valid_config)
+                if not self._keep_training(round_i, early_stop, config):
                     break
             # Interrupt training when time comes.
             self.logger.info("Stopping training.")
@@ -387,10 +388,10 @@ class FederatedServer:
         self.logger.info("Sending privacy requests to all clients.")
         assert config.privacy is not None  # else this method is not called
         params = {
-            "rounds": config.rounds,
-            "batches": config.training.batch_cfg,
-            "n_epoch": config.training.n_epoch,
-            "n_steps": config.training.n_steps,
+            "rounds": config.n_rounds,
+            "batches": config.train_cfg.batch_cfg,
+            "n_epoch": config.train_cfg.n_epoch,
+            "n_steps": config.train_cfg.n_steps,
             **dataclasses.asdict(config.privacy),
         }  # type: Dict[str, Any]
         message = messaging.PrivacyRequest(**params)