Skip to content

Commit

Permalink
Cherry pick fixes from 2.4 (#2768)
Browse files Browse the repository at this point in the history
  • Loading branch information
@YuanTingHsieh
YuanTingHsieh authored Aug 7, 2024
1 parent 7090e4d commit e9f000b
Show file tree
Hide file tree
Showing 22 changed files with 22 additions and 20 deletions.
2 changes: 1 addition & 1 deletion job_templates/cyclic_cc_pt/config_fed_client.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@

args {
# the launcher will invoke the script
script = "python3 custom/{app_script} {app_config} "
script = "python3 -u custom/{app_script} {app_config} "
# if launch_once is true, the SubprocessLauncher will launch once for the whole job
# if launch_once is false, the SubprocessLauncher will launch a process for each task it receives from server
launch_once = true
Expand Down
2 changes: 1 addition & 1 deletion job_templates/cyclic_pt/config_fed_client.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@

args {
# the launcher will invoke the script
script = "python3 custom/{app_script} {app_config} "
script = "python3 -u custom/{app_script} {app_config} "
# if launch_once is true, the SubprocessLauncher will launch once for the whole job
# if launch_once is false, the SubprocessLauncher will launch a process for each task it receives from server
launch_once = true
Expand Down
2 changes: 1 addition & 1 deletion job_templates/sag_cse_pt/config_fed_client.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@

args {
# the launcher will invoke the script
script = "python3 custom/{app_script} {app_config} "
script = "python3 -u custom/{app_script} {app_config} "
# if launch_once is true, the SubprocessLauncher will launch once for the whole job
# if launch_once is false, the SubprocessLauncher will launch a process for each task it receives from server
launch_once = true
Expand Down
2 changes: 1 addition & 1 deletion job_templates/sag_gnn/app_1/config_fed_client.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@

args {
# the launcher will invoke the script
script = "python3 custom/{app_script} {app_config} "
script = "python3 -u custom/{app_script} {app_config} "
# if launch_once is true, the SubprocessLauncher will launch once for the whole job
# if launch_once is false, the SubprocessLauncher will launch a process for each task it receives from server
launch_once = true
Expand Down
2 changes: 1 addition & 1 deletion job_templates/sag_gnn/app_2/config_fed_client.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@

args {
# the launcher will invoke the script
script = "python3 custom/{app_script} {app_config} "
script = "python3 -u custom/{app_script} {app_config} "
# if launch_once is true, the SubprocessLauncher will launch once for the whole job
# if launch_once is false, the SubprocessLauncher will launch a process for each task it receives from server
launch_once = true
Expand Down
2 changes: 1 addition & 1 deletion job_templates/sag_np/config_fed_client.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@

args {
# the launcher will invoke the script
script = "python3 custom/{app_script} {app_config} "
script = "python3 -u custom/{app_script} {app_config} "
# if launch_once is true, the SubprocessLauncher will launch once for the whole job
# if launch_once is false, the SubprocessLauncher will launch a process for each task it receives from server
launch_once = true
Expand Down
2 changes: 1 addition & 1 deletion job_templates/sag_np_cell_pipe/config_fed_client.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@

args {
# the launcher will invoke the script
script = "python3 custom/{app_script} {app_config} "
script = "python3 -u custom/{app_script} {app_config} "
# if launch_once is true, the SubprocessLauncher will launch once for the whole job
# if launch_once is false, the SubprocessLauncher will launch a process for each task it receives from server
launch_once = true
Expand Down
2 changes: 1 addition & 1 deletion job_templates/sag_np_metrics/config_fed_client.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@

args {
# the launcher will invoke the script
script = "python3 custom/{app_script} {app_config} "
script = "python3 -u custom/{app_script} {app_config} "
# if launch_once is true, the SubprocessLauncher will launch once for the whole job
# if launch_once is false, the SubprocessLauncher will launch a process for each task it receives from server
launch_once = true
Expand Down
2 changes: 1 addition & 1 deletion job_templates/sag_pt/config_fed_client.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@

args {
# the launcher will invoke the script
script = "python3 custom/{app_script} {app_config} "
script = "python3 -u custom/{app_script} {app_config} "
# if launch_once is true, the SubprocessLauncher will launch once for the whole job
# if launch_once is false, the SubprocessLauncher will launch a process for each task it receives from server
launch_once = true
Expand Down
2 changes: 1 addition & 1 deletion job_templates/sag_pt_deploy_map/app_1/config_fed_client.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@

args {
# the launcher will invoke the script
script = "python3 custom/{app_script} {app_config} "
script = "python3 -u custom/{app_script} {app_config} "
# if launch_once is true, the SubprocessLauncher will launch once for the whole job
# if launch_once is false, the SubprocessLauncher will launch a process for each task it receives from server
launch_once = true
Expand Down
2 changes: 1 addition & 1 deletion job_templates/sag_pt_deploy_map/app_2/config_fed_client.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@

args {
# the launcher will invoke the script
script = "python3 custom/{app_script} {app_config} "
script = "python3 -u custom/{app_script} {app_config} "
# if launch_once is true, the SubprocessLauncher will launch once for the whole job
# if launch_once is false, the SubprocessLauncher will launch a process for each task it receives from server
launch_once = true
Expand Down
2 changes: 1 addition & 1 deletion job_templates/sag_pt_he/config_fed_client.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@

args {
# the launcher will invoke the script
script = "python3 custom/{app_script} {app_config} "
script = "python3 -u custom/{app_script} {app_config} "
# if launch_once is true, the SubprocessLauncher will launch once for the whole job
# if launch_once is false, the SubprocessLauncher will launch a process for each task it receives from server
launch_once = true
Expand Down
2 changes: 1 addition & 1 deletion job_templates/sag_pt_mlflow/config_fed_client.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@

args {
# the launcher will invoke the script
script = "python3 custom/{app_script} {app_config} "
script = "python3 -u custom/{app_script} {app_config} "
# if launch_once is true, the SubprocessLauncher will launch once for the whole job
# if launch_once is false, the SubprocessLauncher will launch a process for each task it receives from server
launch_once = true
Expand Down
2 changes: 1 addition & 1 deletion job_templates/sag_tf/config_fed_client.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ components = [

args {
# the launcher will invoke the script
script = "python3 custom/{app_script} {app_config} "
script = "python3 -u custom/{app_script} {app_config} "
# if launch_once is true, the SubprocessLauncher will launch once for the whole job
# if launch_once is false, the SubprocessLauncher will launch a process for each task it receives from server
launch_once = true
Expand Down
2 changes: 1 addition & 1 deletion job_templates/sklearn_kmeans/config_fed_client.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@

args {
# the launcher will invoke the script
script = "python3 custom/{app_script} {app_config} "
script = "python3 -u custom/{app_script} {app_config} "
# if launch_once is true, the SubprocessLauncher will launch once for the whole job
# if launch_once is false, the SubprocessLauncher will launch a process for each task it receives from server
launch_once = true
Expand Down
2 changes: 1 addition & 1 deletion job_templates/sklearn_linear/config_fed_client.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@

args {
# the launcher will invoke the script
script = "python3 custom/{app_script} {app_config} "
script = "python3 -u custom/{app_script} {app_config} "
# if launch_once is true, the SubprocessLauncher will launch once for the whole job
# if launch_once is false, the SubprocessLauncher will launch a process for each task it receives from server
launch_once = true
Expand Down
2 changes: 1 addition & 1 deletion job_templates/sklearn_svm/config_fed_client.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@

args {
# the launcher will invoke the script
script = "python3 custom/{app_script} {app_config} "
script = "python3 -u custom/{app_script} {app_config} "
# if launch_once is true, the SubprocessLauncher will launch once for the whole job
# if launch_once is false, the SubprocessLauncher will launch a process for each task it receives from server
launch_once = true
Expand Down
2 changes: 1 addition & 1 deletion job_templates/swarm_cse_pt/config_fed_client.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ components = [

args {
# the launcher will invoke the script
script = "python3 custom/{app_script} {app_config} "
script = "python3 -u custom/{app_script} {app_config} "
# if launch_once is true, the SubprocessLauncher will launch once for the whole job
# if launch_once is false, the SubprocessLauncher will launch a process for each task it receives from server
launch_once = true
Expand Down
2 changes: 1 addition & 1 deletion job_templates/xgboost_tree/config_fed_client.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@

args {
# the launcher will invoke the script
script = "python3 custom/{app_script} {app_config} "
script = "python3 -u custom/{app_script} {app_config} "
# if launch_once is true, the SubprocessLauncher will launch once for the whole job
# if launch_once is false, the SubprocessLauncher will launch a process for each task it receives from server
launch_once = true
Expand Down
1 change: 1 addition & 0 deletions nvflare/app_common/executors/task_exchanger.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ def handle_event(self, event_type: str, fl_ctx: FLContext):
)
self.pipe_handler.set_status_cb(self._pipe_status_cb)
self.pipe.open(self.pipe_channel_name)
elif event_type == EventType.BEFORE_TASK_EXECUTION:
self.pipe_handler.start()
elif event_type == EventType.ABOUT_TO_END_RUN:
self.log_info(fl_ctx, "Stopping pipe handler")
Expand Down
1 change: 1 addition & 0 deletions nvflare/app_common/widgets/metric_relay.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ def handle_event(self, event_type: str, fl_ctx: FLContext):
self.pipe_handler.set_status_cb(self._pipe_status_cb)
self.pipe_handler.set_message_cb(self._pipe_msg_cb)
self.pipe.open(self.pipe_channel_name)
elif event_type == EventType.BEFORE_TASK_EXECUTION:
self.pipe_handler.start()
elif event_type == EventType.ABOUT_TO_END_RUN:
self.log_info(fl_ctx, "Stopping pipe handler")
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ install_requires =
Flask-SQLAlchemy==3.1.1
SQLAlchemy==2.0.16
grpcio==1.62.1
gunicorn>=20.1.0
gunicorn>=22.0.0
numpy<=1.26.4
protobuf==4.24.4
psutil>=5.9.1
Expand Down

0 comments on commit e9f000b

Please sign in to comment.