From 579c771154ca378074706d2d04ba1fa6c473fa0d Mon Sep 17 00:00:00 2001 From: gxenos Date: Fri, 29 Jul 2022 14:40:22 +0300 Subject: [PATCH 1/2] Update sklearn example's server and client --- examples/sklearn-logreg-mnist/client.py | 4 ++-- examples/sklearn-logreg-mnist/server.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/sklearn-logreg-mnist/client.py b/examples/sklearn-logreg-mnist/client.py index 8cee0d181b5..dbf0f2f462a 100644 --- a/examples/sklearn-logreg-mnist/client.py +++ b/examples/sklearn-logreg-mnist/client.py @@ -27,7 +27,7 @@ # Define Flower client class MnistClient(fl.client.NumPyClient): - def get_parameters(self): # type: ignore + def get_parameters(self, config): # type: ignore return utils.get_model_parameters(model) def fit(self, parameters, config): # type: ignore @@ -46,4 +46,4 @@ def evaluate(self, parameters, config): # type: ignore return loss, len(X_test), {"accuracy": accuracy} # Start Flower client - fl.client.start_numpy_client("0.0.0.0:8080", client=MnistClient()) + fl.client.start_numpy_client(server_address="0.0.0.0:8080", client=MnistClient()) diff --git a/examples/sklearn-logreg-mnist/server.py b/examples/sklearn-logreg-mnist/server.py index f80b24da1a8..77e7a89dd66 100644 --- a/examples/sklearn-logreg-mnist/server.py +++ b/examples/sklearn-logreg-mnist/server.py @@ -17,7 +17,7 @@ def get_evaluate_fn(model: LogisticRegression): _, (X_test, y_test) = utils.load_mnist() # The `evaluate` function will be called after every round - def evaluate(parameters: fl.common.Weights): + def evaluate(server_round, parameters: fl.common.NDArrays, config): # Update model with the latest parameters utils.set_model_params(model, parameters) loss = log_loss(y_test, model.predict_proba(X_test)) @@ -39,5 +39,5 @@ def evaluate(parameters: fl.common.Weights): fl.server.start_server( server_address="0.0.0.0:8080", strategy=strategy, - config={"num_rounds": 5}, + config=fl.server.ServerConfig(num_rounds=5), ) From 3ec5ed8d9d1f692ed32556a88d1ff2906a72f33d Mon Sep 17 00:00:00 2001 From: George Date: Fri, 29 Jul 2022 18:41:23 +0300 Subject: [PATCH 2/2] Changed flwr version in the pyproject.toml file --- examples/sklearn-logreg-mnist/pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/sklearn-logreg-mnist/pyproject.toml b/examples/sklearn-logreg-mnist/pyproject.toml index d427878f3bf..5de1cd78826 100644 --- a/examples/sklearn-logreg-mnist/pyproject.toml +++ b/examples/sklearn-logreg-mnist/pyproject.toml @@ -15,7 +15,7 @@ authors = [ [tool.poetry.dependencies] python = "^3.8" -flwr = "^0.19.0" +flwr = "^1.0.0" # flwr = { path = "../../", develop = true } # Development scikit-learn = "^1.1.1" openml = "^0.12.2"