Merge branch '2.4' into fix_client_custom_code_simulator_24

.github/workflows/blossom-ci.yml

@@ -74,7 +74,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           repository: ${{ fromJson(needs.Authorization.outputs.args).repo }}
           ref: ${{ fromJson(needs.Authorization.outputs.args).ref }}

.github/workflows/codeql.yml

@@ -36,7 +36,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.github/workflows/markdown-links-check.yml

@@ -23,7 +23,7 @@ jobs:
   markdown-link-check:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@master
+    - uses: actions/checkout@v4
     - uses: gaurav-nelson/github-action-markdown-link-check@1.0.15
       with:
         max-depth: -1

.github/workflows/premerge.yml

@@ -29,9 +29,9 @@ jobs:
         os: [ ubuntu-22.04, ubuntu-20.04 ]
         python-version: [ "3.8", "3.9", "3.10" ]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
@@ -49,9 +49,9 @@ jobs:
         os: [ ubuntu-22.04, ubuntu-20.04 ]
         python-version: [ "3.8", "3.9", "3.10" ]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies

docs/real_world_fl/operation.rst

@@ -34,7 +34,7 @@ commands shown as examples of how they may be run with a description.
     clone_job,``clone_job job_id``,Creates a copy of the specified job with a new job_id
     abort,``abort job_id client``,Aborts the job for the specified job_id for all clients. Individual client jobs can be aborted by specifying *clientname*.
     ,``abort job_id server``,Aborts the server job for the specified job_id.
-    download_job,``download_job job_id``,Download folder from the job store containing the job and workspace
+    download_job,``download_job job_id``,Download folder from the job store containing the job and workspace. Please note that for larger jobs there may be extra delay for workspace creation in the job store (If you try to download the job before that you may not be able to get the workspace data)
     delete_job,``delete_job job_id``,Delete the job from the job store
     cat,``cat server startup/fed_server.json -ns``,Show content of a file (-n: number all output lines; -s: suppress repeated empty output lines)
     ,``cat clientname startup/docker.sh -bT``,Show content of a file (-b: number nonempty output lines; -T: display TAB characters as ^I)

examples/advanced/finance/jobs/2_histogram/app_server/config/config_fed_server.json

@@ -9,9 +9,9 @@
     "workflows": [
         {
             "id": "xgb_controller",
-            "path": "nvflare.app_opt.xgboost.histogram_based.controller.XGBFedController",
+            "path": "nvflare.app_opt.xgboost.histogram_based_v2.controller.XGBFedController",
             "args": {
-                "train_timeout": 30000
+                "num_rounds": 100
             }
         }
     ]

examples/advanced/finance/jobs/2_histogram/app_site-1/config/config_fed_client.json

@@ -3,14 +3,15 @@
     "executors": [
         {
             "tasks": [
-                "train"
+                "config",
+                "start"
             ],
             "executor": {
                 "id": "Executor",
-                "name": "FedXGBHistogramExecutor",
+                "path": "nvflare.app_opt.xgboost.histogram_based_v2.executor.FedXGBHistogramExecutor",
                 "args": {
                     "data_loader_id": "dataloader",
-                    "num_rounds": 100,
+                    "model_file_name": "test.model.json",
                     "early_stopping_rounds": 2,
                     "xgb_params": {
                         "max_depth": 8,

examples/advanced/finance/jobs/2_histogram/app_site-2/config/config_fed_client.json

@@ -3,14 +3,15 @@
     "executors": [
         {
             "tasks": [
-                "train"
+                "config",
+                "start"
             ],
             "executor": {
                 "id": "Executor",
-                "name": "FedXGBHistogramExecutor",
+                "path": "nvflare.app_opt.xgboost.histogram_based_v2.executor.FedXGBHistogramExecutor",
                 "args": {
                     "data_loader_id": "dataloader",
-                    "num_rounds": 100,
+                    "model_file_name": "test.model.json",
                     "early_stopping_rounds": 2,
                     "xgb_params": {
                         "max_depth": 8,

examples/advanced/finance/requirements.txt

@@ -1,7 +1,7 @@
 nvflare~=2.4.0rc
 openmined.psi==1.1.1
 pandas
-xgboost>=1.7.0
+xgboost==2.0.3
 scikit-learn
 torch
 tensorboard