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.

Sign up for GitHub

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

Jump to bottom

Adapt examples/secaggplus-mt/driver.py to the current flower main #2408

Merged
merged 3 commits into from
Sep 28, 2023
Merged

Adapt examples/secaggplus-mt/driver.py to the current flower main #2408

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dd1ef0d
update driver.py
panh99 Sep 21, 2023
67ab545
Merge branch 'main' into update-sa-example
panh99 Sep 22, 2023
3ff93a7
Merge branch 'main' into update-sa-example
panh99 Sep 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions examples/secaggplus-mt/driver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ def merge(_task: task_pb2.Task, _merge_task: task_pb2.Task) -> task_pb2.Task:
task_pb2.TaskIns(
task_id="", # Do not set, will be created and set by the DriverAPI
group_id="",
workload_id="",
workload_id=workload_id,
task=merge(
task,
task_pb2.Task(
Expand Down Expand Up @@ -84,8 +84,14 @@ def weighted_average(metrics: List[Tuple[int, Metrics]]) -> Metrics:

# -------------------------------------------------------------------------- Driver SDK
driver.connect()
create_workload_res: driver_pb2.CreateWorkloadResponse = driver.create_workload(
req=driver_pb2.CreateWorkloadRequest()
)
# -------------------------------------------------------------------------- Driver SDK

workload_id = create_workload_res.workload_id
print(f"Created workload id {workload_id}")

history = History()
for server_round in range(num_rounds):
print(f"Commencing server round {server_round + 1}")
Expand Down Expand Up @@ -113,15 +119,15 @@ def weighted_average(metrics: List[Tuple[int, Metrics]]) -> Metrics:
# loop and wait until enough client nodes are available.
while True:
# Get a list of node ID's from the server
get_nodes_req = driver_pb2.GetNodesRequest()
get_nodes_req = driver_pb2.GetNodesRequest(workload_id=workload_id)

# ---------------------------------------------------------------------- Driver SDK
get_nodes_res: driver_pb2.GetNodesResponse = driver.get_nodes(
req=get_nodes_req
)
# ---------------------------------------------------------------------- Driver SDK

all_node_ids: List[int] = get_nodes_res.node_ids
all_node_ids: List[int] = [node.node_id for node in get_nodes_res.nodes]

if len(all_node_ids) >= num_client_nodes_per_round:
# Sample client nodes
Expand Down