Skip to content

Commit

Permalink
break(framework) Remove option to start SuperLink for simulation (#3513)
Browse files Browse the repository at this point in the history
  • Loading branch information
jafermarq authored May 27, 2024
1 parent 2e1d943 commit 1647bd2
Showing 1 changed file with 0 additions and 78 deletions.
78 changes: 0 additions & 78 deletions src/py/flwr/server/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
"""Flower server app."""

import argparse
import asyncio
import csv
import importlib.util
import sys
Expand All @@ -39,7 +38,6 @@
MISSING_EXTRA_REST,
TRANSPORT_TYPE_GRPC_RERE,
TRANSPORT_TYPE_REST,
TRANSPORT_TYPE_VCE,
)
from flwr.common.exit_handlers import register_exit_handlers
from flwr.common.logger import log, warn_deprecated_feature
Expand All @@ -63,7 +61,6 @@
)
from .superlink.fleet.grpc_rere.fleet_servicer import FleetServicer
from .superlink.fleet.grpc_rere.server_interceptor import AuthenticateServerInterceptor
from .superlink.fleet.vce import start_vce
from .superlink.state import StateFactory

ADDRESS_DRIVER_API = "0.0.0.0:9091"
Expand Down Expand Up @@ -401,17 +398,6 @@ def run_superlink() -> None:
interceptors=interceptors,
)
grpc_servers.append(fleet_server)
elif args.fleet_api_type == TRANSPORT_TYPE_VCE:
f_stop = asyncio.Event() # Does nothing
_run_fleet_api_vce(
num_supernodes=args.num_supernodes,
client_app_attr=args.client_app,
backend_name=args.backend,
backend_config_json_stream=args.backend_config,
app_dir=args.app_dir,
state_factory=state_factory,
f_stop=f_stop,
)
else:
raise ValueError(f"Unknown fleet_api_type: {args.fleet_api_type}")

Expand Down Expand Up @@ -569,29 +555,6 @@ def _run_fleet_api_grpc_rere(
return fleet_grpc_server


# pylint: disable=too-many-arguments
def _run_fleet_api_vce(
num_supernodes: int,
client_app_attr: str,
backend_name: str,
backend_config_json_stream: str,
app_dir: str,
state_factory: StateFactory,
f_stop: asyncio.Event,
) -> None:
log(INFO, "Flower VCE: Starting Fleet API (VirtualClientEngine)")

start_vce(
num_supernodes=num_supernodes,
client_app_attr=client_app_attr,
backend_name=backend_name,
backend_config_json_stream=backend_config_json_stream,
state_factory=state_factory,
app_dir=app_dir,
f_stop=f_stop,
)


# pylint: disable=import-outside-toplevel,too-many-arguments
def _run_fleet_api_rest(
host: str,
Expand Down Expand Up @@ -783,14 +746,6 @@ def _add_args_fleet_api(parser: argparse.ArgumentParser) -> None:
help="Start a Fleet API server (REST, experimental)",
)

ex_group.add_argument(
"--vce",
action="store_const",
dest="fleet_api_type",
const=TRANSPORT_TYPE_VCE,
help="Start a Fleet API server (VirtualClientEngine)",
)

# Fleet API gRPC-rere options
grpc_rere_group = parser.add_argument_group(
"Fleet API (gRPC-rere) server options", ""
Expand Down Expand Up @@ -826,36 +781,3 @@ def _add_args_fleet_api(parser: argparse.ArgumentParser) -> None:
type=int,
default=1,
)

# Fleet API VCE options
vce_group = parser.add_argument_group("Fleet API (VCE) server options", "")
vce_group.add_argument(
"--client-app",
help="For example: `client:app` or `project.package.module:wrapper.app`.",
)
vce_group.add_argument(
"--num-supernodes",
type=int,
help="Number of simulated SuperNodes.",
)
vce_group.add_argument(
"--backend",
default="ray",
type=str,
help="Simulation backend that executes the ClientApp.",
)
vce_group.add_argument(
"--backend-config",
type=str,
default='{"client_resources": {"num_cpus":1, "num_gpus":0.0}, "tensorflow": 0}',
help='A JSON formatted stream, e.g \'{"<keyA>":<value>, "<keyB>":<value>}\' to '
"configure a backend. Values supported in <value> are those included by "
"`flwr.common.typing.ConfigsRecordValues`. ",
)
parser.add_argument(
"--app-dir",
default="",
help="Add specified directory to the PYTHONPATH and load"
"ClientApp from there."
" Default: current working directory.",
)

0 comments on commit 1647bd2

Please sign in to comment.