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

Cherry pick fixes from 2.4 #2768

Merged
merged 4 commits into from
Aug 7, 2024
Merged

Cherry pick fixes from 2.4 #2768

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
88f5cc7
Starts heartbeat after task is pull and before task execution (#2415)
YuanTingHsieh Mar 26, 2024
b4be24e
Starts pipe handler heartbeat send/check after task is pull before ta…
YuanTingHsieh Mar 26, 2024
73998cb
Use unbuffered python launch (#2472)
YuanTingHsieh Apr 5, 2024
b1e23a7
Upgrade gunicorn (#2525)
YuanTingHsieh May 9, 2024
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
2 changes: 1 addition & 1 deletion job_templates/cyclic_cc_pt/config_fed_client.conf
View file
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Loading