Removed unused arguments to combine_models

scaleoutsystems · Jan 23, 2024 · 33742e4 · 33742e4
1 parent d16f671
commit 33742e4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/examples/notebooks/API_Example.ipynb b/examples/notebooks/API_Example.ipynb
@@ -82,7 +82,7 @@
    "outputs": [],
    "source": [
     "session_config_fedavg = {\n",
-    "                    \"helper\": \"pytorchhelper\",\n",
+    "                    \"helper\": \"numpyhelper\",\n",
     "                    \"session_id\": \"experiment_fedavg\",\n",
     "                    \"aggregator\": \"fedavg\",\n",
     "                    \"model_id\": seed_model['model_id'],\n",
@@ -100,7 +100,7 @@
    "outputs": [],
    "source": [
     "session_config_fedopt = {\n",
-    "                    \"helper\": \"pytorchhelper\",\n",
+    "                    \"helper\": \"numpyhelper\",\n",
     "                    \"session_id\": \"experiment_fedopt\",\n",
     "                    \"aggregator\": \"fedopt\",\n",
     "                    \"model_id\": seed_model['model_id'],\n",

diff --git a/fedn/fedn/network/combiner/aggregators/fedavg.py b/fedn/fedn/network/combiner/aggregators/fedavg.py
@@ -26,7 +26,7 @@ def __init__(self, storage, server, modelservice, control):
 
         self.name = "fedavg"
 
-    def combine_models(self, helper=None, time_window=180, max_nr_models=100, delete_models=True):
+    def combine_models(self, helper=None, delete_models=True):
         """Aggregate all model updates in the queue by computing an incremental
         weighted average of model parameters.
 

diff --git a/fedn/fedn/network/combiner/aggregators/fedopt.py b/fedn/fedn/network/combiner/aggregators/fedopt.py
@@ -34,13 +34,13 @@ def __init__(self, storage, server, modelservice, control):
         self.v = None
         self.m = None
 
-        # Server side hyperparameters
+        # Server side hyperparameters. Note that these may need extensive fine tuning.
         self.eta = 0.1
         self.beta1 = 0.9
         self.beta2 = 0.99
         self.tau = 1e-4
 
-    def combine_models(self, helper=None, time_window=180, max_nr_models=100, delete_models=True):
+    def combine_models(self, helper=None, delete_models=True):
         """Compute pseudo gradients usigng model updates in the queue.
 
         :param helper: An instance of :class: `fedn.utils.helpers.HelperBase`, ML framework specific helper, defaults to None