Merge branch 'main' into tutorial

NVIDIA · Aug 23, 2024 · b828504 · b828504
2 parents e71f5bb + 141c8bd
commit b828504
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 10 deletions.
diff --git a/examples/advanced/xgboost/data_job_setup.ipynb b/examples/advanced/xgboost/data_job_setup.ipynb
@@ -65,7 +65,7 @@
    "outputs": [],
    "source": [
     "# please change this DATASET_ROOT to the correct path containing HIGGS dataset\n",
-    "%env DATASET_ROOT=/data\n",
+    "%env DATASET_ROOT=$HOME/dataset\n",
     "!python3 utils/prepare_data_split.py \\\n",
     "        --data_path \"${DATASET_ROOT}/HIGGS.csv\" \\\n",
     "        --site_num 5 \\\n",
@@ -96,15 +96,15 @@
     "%env DATA_SPLIT_ROOT=/tmp/nvflare/xgboost/HIGGS/data_splits/\n",
     "!python3 utils/prepare_job_config.py \\\n",
     "        --site_num 5 \\\n",
-    "        --training_mode bagging \\\n",
+    "        --training_algo bagging \\\n",
     "        --split_method uniform \\\n",
     "        --lr_mode uniform \\\n",
     "        --nthread 16 \\\n",
     "        --tree_method \"hist\" \\\n",
     "        --data_root \"${DATA_SPLIT_ROOT}\"\n",
     "!python3 utils/prepare_job_config.py \\\n",
     "        --site_num 5 \\\n",
-    "        --training_mode histogram \\\n",
+    "        --training_algo histogram \\\n",
     "        --split_method uniform \\\n",
     "        --lr_mode uniform \\\n",
     "        --nthread 16 \\\n",

diff --git a/...en_ct_segmentation_local/jobs/spleen_ct_segmentation_he/app/config/config_fed_server.json b/...en_ct_segmentation_local/jobs/spleen_ct_segmentation_he/app/config/config_fed_server.json
@@ -46,7 +46,7 @@
     },
     {
       "id": "json_generator",
-      "path": "nvflare.app_common.widgets.validation_json_generator",
+      "path": "nvflare.app_common.widgets.validation_json_generator.ValidationJsonGenerator",
       "args": {}
     }
   ],

diff --git a/...ct_segmentation_local/jobs/spleen_ct_segmentation_local/app/config/config_fed_server.conf b/...ct_segmentation_local/jobs/spleen_ct_segmentation_local/app/config/config_fed_server.conf
@@ -40,7 +40,7 @@
     },
     {
       "id": "json_generator",
-      "path": "nvflare.app_common.widgets.validation_json_generator",
+      "path": "nvflare.app_common.widgets.validation_json_generator.ValidationJsonGenerator",
       "args": {}
     },
     {

diff --git a/integration/monai/examples/spleen_ct_segmentation_sim/job/app/config/config_fed_server.json b/integration/monai/examples/spleen_ct_segmentation_sim/job/app/config/config_fed_server.json
@@ -40,7 +40,7 @@
     },
     {
       "id": "json_generator",
-      "path": "nvflare.app_common.widgets.validation_json_generator",
+      "path": "nvflare.app_common.widgets.validation_json_generator.ValidationJsonGenerator",
       "args": {}
     }
   ],

diff --git a/...monai/examples/spleen_ct_segmentation_sim/job_multi_gpu/app/config/config_fed_server.json b/...monai/examples/spleen_ct_segmentation_sim/job_multi_gpu/app/config/config_fed_server.json
@@ -40,7 +40,7 @@
     },
     {
       "id": "json_generator",
-      "path": "nvflare.app_common.widgets.validation_json_generator",
+      "path": "nvflare.app_common.widgets.validation_json_generator.ValidationJsonGenerator",
       "args": {}
     }
   ],

diff --git a/research/auto-fed-rl/jobs/cifar10_autofedrl/cifar10_autofedrl/config/config_fed_server.json b/research/auto-fed-rl/jobs/cifar10_autofedrl/cifar10_autofedrl/config/config_fed_server.json
@@ -124,7 +124,7 @@
         },
         {
             "id": "json_generator",
-            "path": "nvflare.app_common.widgets.validation_json_generator",
+            "path": "nvflare.app_common.widgets.validation_json_generator.ValidationJsonGenerator",
             "args": {}
         }
     ],

diff --git a/research/one-shot-vfl/jobs/cifar10_oneshotVFL/server/config/config_fed_server.json b/research/one-shot-vfl/jobs/cifar10_oneshotVFL/server/config/config_fed_server.json
@@ -26,7 +26,7 @@
     },
     {
       "id": "json_generator",
-      "path": "nvflare.app_common.widgets.validation_json_generator",
+      "path": "nvflare.app_common.widgets.validation_json_generator.ValidationJsonGenerator",
       "args": {}
     }
   ],

diff --git a/research/quantifying-data-leakage/jobs/app_template/server/config/config_fed_server.json b/research/quantifying-data-leakage/jobs/app_template/server/config/config_fed_server.json
@@ -49,7 +49,7 @@
         },
         {
             "id": "json_generator",
-            "path": "nvflare.app_common.widgets.validation_json_generator",
+            "path": "nvflare.app_common.widgets.validation_json_generator.ValidationJsonGenerator",
             "args": {}
         }
     ],