Merge branch 'main' into container-streaming

Author: ZiyueXu77

examples/advanced/kaplan-meier-he/README.md

@@ -92,43 +92,20 @@ After these rounds, the federated work is completed. Then at each client, the ag
 ## Run the job
 First, we prepared data for a 5-client federated job. We split and generate the data files for each client with binning interval of 7 days. 
 ```commandline
-python utils/prepare_data.py --site_num 5 --bin_days 7 --out_path "/tmp/flare/dataset/km_data"
+python utils/prepare_data.py --site_num 5 --bin_days 7 --out_path "/tmp/nvflare/dataset/km_data"
 ```
 
 Then we prepare HE context for clients and server, note that this step is done by secure provisioning for real-life applications, but in this study experimenting with BFV scheme, we use this step to distribute the HE context. 
 ```commandline
-python utils/prepare_he_context.py --out_path "/tmp/flare/he_context"
+python utils/prepare_he_context.py --out_path "/tmp/nvflare/he_context"
 ```
 
-Next, we set the location of the job templates directory.
+Next, we run the federated training using NVFlare Simulator via [JobAPI](https://nvflare.readthedocs.io/en/main/programming_guide/fed_job_api.html), both without and with HE:
 ```commandline
-nvflare config -jt ./job_templates
+python km_job.py 
+python km_job.py --encryption
 ```
 
-Then we can generate the job configurations from the `kaplan_meier` template:
-
-Both for the federated job without HE:
-```commandline
-N_CLIENTS=5
-nvflare job create -force -j "/tmp/flare/jobs/kaplan-meier" -w "kaplan_meier" -sd "./src" \
--f config_fed_client.conf app_script="kaplan_meier_train.py" app_config="--data_root /tmp/flare/dataset/km_data" \
--f config_fed_server.conf min_clients=${N_CLIENTS}
-```
-and for the federated job with HE:
-```commandline
-N_CLIENTS=5
-nvflare job create -force -j "/tmp/flare/jobs/kaplan-meier-he" -w "kaplan_meier_he" -sd "./src" \
--f config_fed_client.conf app_script="kaplan_meier_train_he.py" app_config="--data_root /tmp/flare/dataset/km_data --he_context_path /tmp/flare/he_context/he_context_client.txt" \
--f config_fed_server.conf min_clients=${N_CLIENTS} he_context_path="/tmp/flare/he_context/he_context_server.txt"
-```
-
-And we can run the federated job:
-```commandline
-nvflare simulator -w /tmp/flare/workspace_km -n 5 -t 5 /tmp/flare/jobs/kaplan-meier
-```
-```commandline
-nvflare simulator -w /tmp/flare/workspace_km_he -n 5 -t 5 /tmp/flare/jobs/kaplan-meier-he
-```
 By default, this will generate a KM curve image `km_curve_fl.png` and `km_curve_fl_he.png` under each client's directory.
 
 ## Display Result