Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make examples use start_client(). #2718

Merged
merged 15 commits into from
Jan 25, 2024
Next Next commit
to_client
  • Loading branch information
jafermarq committed Dec 16, 2023
commit bdcf537d8dafb59ce92eb993bb8aff2b2a16df45
4 changes: 2 additions & 2 deletions examples/advanced-pytorch/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -143,9 +143,9 @@ def main() -> None:
testset = torch.utils.data.Subset(testset, range(10))

# Start Flower client
client = CifarClient(trainset, testset, device)
client = CifarClient(trainset, testset, device).to_client*()

fl.client.start_numpy_client(server_address="127.0.0.1:8080", client=client)
fl.client.start_client(server_address="127.0.0.1:8080", client=client)


if __name__ == "__main__":
Expand Down
4 changes: 2 additions & 2 deletions examples/advanced-tensorflow/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,9 @@ def main() -> None:
x_test, y_test = x_test[:10], y_test[:10]

# Start Flower client
client = CifarClient(model, x_train, y_train, x_test, y_test)
client = CifarClient(model, x_train, y_train, x_test, y_test).to_client()

fl.client.start_numpy_client(
fl.client.start_client(
server_address="127.0.0.1:8080",
client=client,
root_certificates=Path(".cache/certificates/ca.crt").read_bytes(),
Expand Down
4 changes: 2 additions & 2 deletions examples/embedded-devices/client_pytorch.py
Original file line number Diff line number Diff line change
Expand Up @@ -204,11 +204,11 @@ def main():
trainsets, valsets, _ = prepare_dataset(use_mnist)

# Start Flower client setting its associated data partition
fl.client.start_numpy_client(
fl.client.start_client(
server_address=args.server_address,
client=FlowerClient(
trainset=trainsets[args.cid], valset=valsets[args.cid], use_mnist=use_mnist
),
).to_client(),
)


Expand Down
4 changes: 2 additions & 2 deletions examples/embedded-devices/client_tf.py
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,9 @@ def main():
trainset, valset = partitions[args.cid]

# Start Flower client setting its associated data partition
fl.client.start_numpy_client(
fl.client.start_client(
server_address=args.server_address,
client=FlowerClient(trainset=trainset, valset=valset, use_mnist=use_mnist),
client=FlowerClient(trainset=trainset, valset=valset, use_mnist=use_mnist).to_client(),
)


Expand Down
2 changes: 1 addition & 1 deletion examples/flower-in-30-minutes/tutorial.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -776,7 +776,7 @@
"\n",
" return FlowerClient(\n",
" trainloader=trainloaders[int(cid)], vallodaer=valloaders[int(cid)]\n",
" )\n",
" ).to_client()\n",
"\n",
" return client_fn\n",
"\n",
Expand Down
4 changes: 2 additions & 2 deletions examples/mt-pytorch/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ def evaluate(self, parameters, config):


# Start Flower client
fl.client.start_numpy_client(
fl.client.start_client(
server_address="0.0.0.0:9092", # "0.0.0.0:9093" for REST
client=FlowerClient(),
client=FlowerClient().to_client(),
transport="grpc-rere", # "rest" for REST
)
4 changes: 2 additions & 2 deletions examples/quickstart-fastai/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ def evaluate(self, parameters, config):


# Start Flower client
fl.client.start_numpy_client(
fl.client.start_client(
server_address="127.0.0.1:8080",
client=FlowerClient(),
client=FlowerClient().to_client(),
)
2 changes: 1 addition & 1 deletion examples/quickstart-huggingface/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ def evaluate(self, parameters, config):
return float(loss), len(testloader), {"accuracy": float(accuracy)}

# Start client
fl.client.start_numpy_client(server_address="127.0.0.1:8080", client=IMDBClient())
fl.client.start_client(server_address="127.0.0.1:8080", client=IMDBClient().to_client())


if __name__ == "__main__":
Expand Down
2 changes: 1 addition & 1 deletion examples/quickstart-jax/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,4 @@ def evaluate(


# Start Flower client
fl.client.start_numpy_client(server_address="127.0.0.1:8080", client=FlowerClient())
fl.client.start_client(server_address="127.0.0.1:8080", client=FlowerClient().to_client())
4 changes: 2 additions & 2 deletions examples/quickstart-mlcube/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ def main():
os.path.dirname(os.path.abspath(__file__)), "workspaces", workspace_name
)

fl.client.start_numpy_client(
server_address="0.0.0.0:8080", client=MLCubeClient(workspace=workspace)
fl.client.start_client(
server_address="0.0.0.0:8080", client=MLCubeClient(workspace=workspace).to_client()
)


Expand Down
4 changes: 2 additions & 2 deletions examples/quickstart-pandas/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ def fit(


# Start Flower client
fl.client.start_numpy_client(
fl.client.start_client(
server_address="127.0.0.1:8080",
client=FlowerClient(),
client=FlowerClient().to_client(),
)
4 changes: 2 additions & 2 deletions examples/quickstart-pytorch-lightning/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ def main() -> None:
train_loader, val_loader, test_loader = mnist.load_data()

# Flower client
client = FlowerClient(model, train_loader, val_loader, test_loader)
fl.client.start_numpy_client(server_address="127.0.0.1:8080", client=client)
client = FlowerClient(model, train_loader, val_loader, test_loader).to_client()
fl.client.start_client(server_address="127.0.0.1:8080", client=client)


if __name__ == "__main__":
Expand Down
4 changes: 2 additions & 2 deletions examples/quickstart-pytorch/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ def evaluate(self, parameters, config):


# Start Flower client
fl.client.start_numpy_client(
fl.client.start_client(
server_address="127.0.0.1:8080",
client=FlowerClient(),
client=FlowerClient().to_client(),
)
2 changes: 1 addition & 1 deletion examples/quickstart-tabnet/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,4 +79,4 @@ def evaluate(self, parameters, config):


# Start Flower client
fl.client.start_numpy_client(server_address="127.0.0.1:8080", client=TabNetClient())
fl.client.start_client(server_address="127.0.0.1:8080", client=TabNetClient().to_client())
2 changes: 1 addition & 1 deletion examples/quickstart-tensorflow/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ def evaluate(self, parameters, config):


# Start Flower client
fl.client.start_numpy_client(server_address="127.0.0.1:8080", client=CifarClient())
fl.client.start_client(server_address="127.0.0.1:8080", client=CifarClient().to_client())
2 changes: 1 addition & 1 deletion examples/simulation-pytorch/sim.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -509,7 +509,7 @@
" valloader = DataLoader(valset.with_transform(apply_transforms), batch_size=32)\n",
"\n",
" # Create and return client\n",
" return FlowerClient(trainloader, valloader)\n",
" return FlowerClient(trainloader, valloader).to_client()\n",
"\n",
" return client_fn\n",
"\n",
Expand Down
2 changes: 1 addition & 1 deletion examples/simulation-pytorch/sim.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ def client_fn(cid: str) -> fl.client.Client:
valset = valset.with_transform(apply_transforms)

# Create and return client
return FlowerClient(trainset, valset)
return FlowerClient(trainset, valset).to_client()

return client_fn

Expand Down
2 changes: 1 addition & 1 deletion examples/simulation-tensorflow/sim.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@
" )\n",
"\n",
" # Create and return client\n",
" return FlowerClient(trainset, valset)\n",
" return FlowerClient(trainset, valset).to_client()\n",
"\n",
" return client_fn\n",
"\n",
Expand Down
2 changes: 1 addition & 1 deletion examples/simulation-tensorflow/sim.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ def client_fn(cid: str) -> fl.client.Client:
)

# Create and return client
return FlowerClient(trainset, valset)
return FlowerClient(trainset, valset).to_client()

return client_fn

Expand Down
2 changes: 1 addition & 1 deletion examples/sklearn-logreg-mnist/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -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(server_address="0.0.0.0:8080", client=MnistClient())
fl.client.start_client(server_address="0.0.0.0:8080", client=MnistClient().to_client())
4 changes: 2 additions & 2 deletions examples/whisper-federated-finetuning/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ def client_fn(cid: str):

return WhisperFlowerClient(
full_train_dataset, num_classes, disable_tqdm, compile
)
).to_client()

return client_fn

Expand Down Expand Up @@ -174,7 +174,7 @@ def run_client():
client_data_path=CLIENT_DATA,
)

fl.client.start_numpy_client(
fl.client.start_client(
server_address=f"{args.server_address}:8080", client=client_fn(args.cid)
)

Expand Down
2 changes: 1 addition & 1 deletion examples/xgboost-comprehensive/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -171,4 +171,4 @@ def evaluate(self, ins: EvaluateIns) -> EvaluateRes:


# Start Flower client
fl.client.start_client(server_address="127.0.0.1:8080", client=XgbClient())
fl.client.start_client(server_address="127.0.0.1:8080", client=XgbClient().to_client())
2 changes: 1 addition & 1 deletion examples/xgboost-quickstart/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -173,4 +173,4 @@ def evaluate(self, ins: EvaluateIns) -> EvaluateRes:


# Start Flower client
fl.client.start_client(server_address="127.0.0.1:8080", client=XgbClient())
fl.client.start_client(server_address="127.0.0.1:8080", client=XgbClient().to_client())