more app_opt scan example changes.

yhwen · Aug 14, 2024 · ebd0075 · ebd0075
1 parent f388c12
commit ebd0075
Show file tree

Hide file tree

Showing 33 changed files with 52 additions and 52 deletions.
diff --git a/examples/advanced/bionemo/task_fitting/jobs/fedavg/app/config/config_fed_server.json b/examples/advanced/bionemo/task_fitting/jobs/fedavg/app/config/config_fed_server.json
@@ -32,7 +32,7 @@
         },
         {
             "id": "model_locator",
-            "name": "PTFileModelLocator",
+            "path": "nvflare.app_opt.pt.file_model_locator.PTFileModelLocator",
             "args": {
                 "pt_persistor_id": "persistor"
             }

diff --git a/examples/advanced/brats18/configs/brats_central/app/config/config_fed_server.json b/examples/advanced/brats18/configs/brats_central/app/config/config_fed_server.json
@@ -10,7 +10,7 @@
   "components": [
     {
       "id": "persistor",
-      "name": "PTFileModelPersistor",
+      "path": "nvflare.app_opt.pt.file_model_persistor.PTFileModelPersistor",
       "args": {
         "model": {
           "path": "monai.networks.nets.segresnet.SegResNet",

diff --git a/examples/advanced/brats18/configs/brats_fedavg/app/config/config_fed_server.json b/examples/advanced/brats18/configs/brats_fedavg/app/config/config_fed_server.json
@@ -10,7 +10,7 @@
   "components": [
     {
       "id": "persistor",
-      "name": "PTFileModelPersistor",
+      "path": "nvflare.app_opt.pt.file_model_persistor.PTFileModelPersistor",
       "args": {
         "model": {
           "path": "monai.networks.nets.segresnet.SegResNet",

diff --git a/examples/advanced/brats18/configs/brats_fedavg_dp/app/config/config_fed_server.json b/examples/advanced/brats18/configs/brats_fedavg_dp/app/config/config_fed_server.json
@@ -10,7 +10,7 @@
   "components": [
     {
       "id": "persistor",
-      "name": "PTFileModelPersistor",
+      "path": "nvflare.app_opt.pt.file_model_persistor.PTFileModelPersistor",
       "args": {
         "model": {
           "path": "monai.networks.nets.segresnet.SegResNet",

diff --git a/...cifar10-real-world/jobs/cifar10_fedavg_he/cifar10_fedavg_he/config/config_fed_client.json b/...cifar10-real-world/jobs/cifar10_fedavg_he/cifar10_fedavg_he/config/config_fed_client.json
@@ -23,7 +23,7 @@
       "tasks": ["train"],
       "filters":[
           {
-          "name": "HEModelEncryptor",
+          "path": "nvflare.app_opt.he.model_encryptor.HEModelEncryptor",
           "args": {
             "weigh_by_local_iter": true
           }
@@ -34,7 +34,7 @@
       "tasks": ["submit_model"],
       "filters":[
           {
-          "name": "HEModelEncryptor",
+          "path": "nvflare.app_opt.he.model_encryptor.HEModelEncryptor",
           "args": {
             "weigh_by_local_iter": false
           }
@@ -47,7 +47,7 @@
       "tasks": ["train", "validate"],
       "filters":[
           {
-          "name": "HEModelDecryptor",
+          "path": "nvflare.app_opt.he.model_encryptor.HEModelEncryptor",
           "args": {
           }
         }

diff --git a/...cifar10-real-world/jobs/cifar10_fedavg_he/cifar10_fedavg_he/config/config_fed_server.json b/...cifar10-real-world/jobs/cifar10_fedavg_he/cifar10_fedavg_he/config/config_fed_server.json
@@ -24,13 +24,13 @@
     },
     {
       "id": "serialize_filter",
-      "name": "HEModelSerializeFilter",
+      "path": "nvflare.app_opt.he.model_serialize_filter.HEModelSerializeFilter",
       "args": {
       }
     },
     {
       "id": "persistor",
-      "name": "PTFileModelPersistor",
+      "path": "nvflare.app_opt.pt.file_model_persistor.PTFileModelPersistor",
       "args": {
         "model": {
           "path": "pt.networks.cifar10_nets.ModerateCNN",
@@ -41,12 +41,12 @@
     },
     {
       "id": "shareable_generator",
-      "name": "HEModelShareableGenerator",
+      "path": "nvflare.app_opt.he.model_sharable_generator.HEModelShareableGenerator",
       "args": {}
     },
     {
       "id": "aggregator",
-      "name": "HEInTimeAccumulateWeightedAggregator",
+      "path": "nvflare.app_opt.he.intime_accumulate_model_aggregator.HEInTimeAccumulateWeightedAggregator",
       "args": {
         "weigh_by_local_iter": false
       }
@@ -58,7 +58,7 @@
     },
     {
       "id": "model_locator",
-      "name": "PTFileModelLocator",
+      "path": "nvflare.app_opt.pt.file_model_locator.PTFileModelLocator",
       "args": {
         "pt_persistor_id": "persistor"
       }
@@ -87,7 +87,7 @@
       },
       {
         "id": "cross_site_model_eval",
-        "name": "HECrossSiteModelEval",
+        "path": "nvflare.app_opt.he.cross_site_model_eval.HECrossSiteModelEval",
         "args": {
           "model_locator_id": "model_locator",
           "submit_model_timeout": 600,

diff --git a/...orld/jobs/cifar10_fedavg_stream_tb/cifar10_fedavg_stream_tb/config/config_fed_server.json b/...orld/jobs/cifar10_fedavg_stream_tb/cifar10_fedavg_stream_tb/config/config_fed_server.json
@@ -21,7 +21,7 @@
         },
         {
             "id": "persistor",
-            "name": "PTFileModelPersistor",
+            "path": "nvflare.app_opt.pt.file_model_persistor.PTFileModelPersistor",
             "args": {
                 "model": {
                     "path": "pt.networks.cifar10_nets.ModerateCNN",
@@ -46,7 +46,7 @@
         },
         {
             "id": "model_locator",
-            "name": "PTFileModelLocator",
+            "path": "nvflare.app_opt.pt.file_model_locator.PTFileModelLocator",
             "args": {
                 "pt_persistor_id": "persistor"
             }

diff --git a/...ed/cifar10/cifar10-sim/jobs/cifar10_central/cifar10_central/config/config_fed_server.json b/...ed/cifar10/cifar10-sim/jobs/cifar10_central/cifar10_central/config/config_fed_server.json
@@ -12,7 +12,7 @@
   "components": [
     {
       "id": "persistor",
-      "name": "PTFileModelPersistor",
+      "path": "nvflare.app_opt.pt.file_model_persistor.PTFileModelPersistor",
       "args": {
         "model": {
           "path": "pt.networks.cifar10_nets.ModerateCNN",
@@ -27,7 +27,7 @@
     },
     {
       "id": "model_locator",
-      "name": "PTFileModelLocator",
+      "path": "nvflare.app_opt.pt.file_model_locator.PTFileModelLocator",
       "args": {
         "pt_persistor_id": "persistor"
       }

diff --git a/...nced/cifar10/cifar10-sim/jobs/cifar10_fedavg/cifar10_fedavg/config/config_fed_server.json b/...nced/cifar10/cifar10-sim/jobs/cifar10_fedavg/cifar10_fedavg/config/config_fed_server.json
@@ -21,7 +21,7 @@
         },
         {
             "id": "persistor",
-            "name": "PTFileModelPersistor",
+            "path": "nvflare.app_opt.pt.file_model_persistor.PTFileModelPersistor",
             "args": {
                 "model": {
                     "path": "pt.networks.cifar10_nets.ModerateCNN",
@@ -36,7 +36,7 @@
         },
         {
             "id": "model_locator",
-            "name": "PTFileModelLocator",
+            "path": "nvflare.app_opt.pt.file_model_locator.PTFileModelLocator",
             "args": {
                 "pt_persistor_id": "persistor"
             }

diff --git a/...nced/cifar10/cifar10-sim/jobs/cifar10_fedopt/cifar10_fedopt/config/config_fed_server.json b/...nced/cifar10/cifar10-sim/jobs/cifar10_fedopt/cifar10_fedopt/config/config_fed_server.json
@@ -29,14 +29,14 @@
     },
     {
       "id": "persistor",
-      "name": "PTFileModelPersistor",
+      "path": "nvflare.app_opt.pt.file_model_persistor.PTFileModelPersistor",
       "args": {
         "model": "model"
       }
     },
     {
       "id": "shareable_generator",
-      "name": "PTFedOptModelShareableGenerator",
+      "path": "nvflare.app_opt.pt.fedopt.PTFedOptModelShareableGenerator",
       "args": {
         "device": "cpu",
         "source_model": "model",
@@ -71,7 +71,7 @@
     },
     {
       "id": "model_locator",
-      "name": "PTFileModelLocator",
+      "path": "nvflare.app_opt.pt.file_model_locator.PTFileModelLocator",
       "args": {
         "pt_persistor_id": "persistor"
       }

diff --git a/...ed/cifar10/cifar10-sim/jobs/cifar10_fedprox/cifar10_fedprox/config/config_fed_server.json b/...ed/cifar10/cifar10-sim/jobs/cifar10_fedprox/cifar10_fedprox/config/config_fed_server.json
@@ -24,7 +24,7 @@
     },
     {
       "id": "persistor",
-      "name": "PTFileModelPersistor",
+      "path": "nvflare.app_opt.pt.file_model_persistor.PTFileModelPersistor",
       "args": {
         "model": {
           "path": "pt.networks.cifar10_nets.ModerateCNN",
@@ -39,7 +39,7 @@
     },
     {
       "id": "model_locator",
-      "name": "PTFileModelLocator",
+      "path": "nvflare.app_opt.pt.file_model_locator.PTFileModelLocator",
       "args": {
         "pt_persistor_id": "persistor"
       }

diff --git a/.../cifar10/cifar10-sim/jobs/cifar10_scaffold/cifar10_scaffold/config/config_fed_server.json b/.../cifar10/cifar10-sim/jobs/cifar10_scaffold/cifar10_scaffold/config/config_fed_server.json
@@ -21,7 +21,7 @@
         },
         {
             "id": "persistor",
-            "name": "PTFileModelPersistor",
+            "path": "nvflare.app_opt.pt.file_model_persistor.PTFileModelPersistor",
             "args": {
                 "model": {
                     "path": "pt.networks.cifar10_nets.ModerateCNN",
@@ -36,7 +36,7 @@
         },
         {
             "id": "model_locator",
-            "name": "PTFileModelLocator",
+            "path": "nvflare.app_opt.pt.file_model_locator.PTFileModelLocator",
             "args": {
                 "pt_persistor_id": "persistor"
             }

diff --git a/...nced/experiment-tracking/mlflow/jobs/hello-pt-tb-mlflow/app/config/config_fed_server.conf b/...nced/experiment-tracking/mlflow/jobs/hello-pt-tb-mlflow/app/config/config_fed_server.conf
@@ -9,7 +9,7 @@
   "components": [
     {
       "id": "persistor",
-      "name": "PTFileModelPersistor",
+      "path": "nvflare.app_opt.pt.file_model_persistor.PTFileModelPersistor",
       "args": {
         "model": {
           "path": "pt.simple_network.SimpleNetwork"
@@ -30,7 +30,7 @@
     },
     {
       "id": "model_locator",
-      "name": "PTFileModelLocator",
+      "path": "nvflare.app_opt.pt.file_model_locator.PTFileModelLocator",
       "args": {
         "pt_persistor_id": "persistor"
       }

diff --git a/...eriment-tracking/tensorboard/jobs/tensorboard-streaming/app/config/config_fed_server.json b/...eriment-tracking/tensorboard/jobs/tensorboard-streaming/app/config/config_fed_server.json
@@ -9,7 +9,7 @@
   "components": [
     {
       "id": "persistor",
-      "name": "PTFileModelPersistor",
+      "path": "nvflare.app_opt.pt.file_model_persistor.PTFileModelPersistor",
       "args": {
         "model": {
           "path": "pt.simple_network.SimpleNetwork",
@@ -31,7 +31,7 @@
     },
     {
       "id": "model_locator",
-      "name": "PTFileModelLocator",
+      "path": "nvflare.app_opt.pt.file_model_locator.PTFileModelLocator",
       "args": {
         "pt_persistor_id": "persistor"
       }

diff --git a/examples/advanced/nlp-ner/jobs/bert_ncbi/app/config/config_fed_server.json b/examples/advanced/nlp-ner/jobs/bert_ncbi/app/config/config_fed_server.json
@@ -10,7 +10,7 @@
   "components": [
     {
       "id": "persistor",
-      "name": "PTFileModelPersistor",
+      "path": "nvflare.app_opt.pt.file_model_persistor.PTFileModelPersistor",
       "args": {
         "model": {
           "path": "custom.models.nlp_models.BertModel",

diff --git a/examples/advanced/nlp-ner/jobs/gpt2_ncbi/app/config/config_fed_server.json b/examples/advanced/nlp-ner/jobs/gpt2_ncbi/app/config/config_fed_server.json
@@ -10,7 +10,7 @@
   "components": [
     {
       "id": "persistor",
-      "name": "PTFileModelPersistor",
+      "path": "nvflare.app_opt.pt.file_model_persistor.PTFileModelPersistor",
       "args": {
         "model": {
           "path": "custom.models.nlp_models.GPTModel",

diff --git a/...anced/prostate/prostate_2D/job_configs/prostate_central/app/config/config_fed_server.json b/...anced/prostate/prostate_2D/job_configs/prostate_central/app/config/config_fed_server.json
@@ -10,7 +10,7 @@
   "components": [
     {
       "id": "persistor",
-      "name": "PTFileModelPersistor",
+      "path": "nvflare.app_opt.pt.file_model_persistor.PTFileModelPersistor",
       "args": {
       "model": {
             "path": "monai.networks.nets.unet.UNet",

diff --git a/...dvanced/prostate/prostate_2D/job_configs/prostate_ditto/app/config/config_fed_server.json b/...dvanced/prostate/prostate_2D/job_configs/prostate_ditto/app/config/config_fed_server.json
@@ -10,7 +10,7 @@
   "components": [
     {
       "id": "persistor",
-      "name": "PTFileModelPersistor",
+      "path": "nvflare.app_opt.pt.file_model_persistor.PTFileModelPersistor",
       "args": {
       "model": {
             "path": "monai.networks.nets.unet.UNet",

diff --git a/...vanced/prostate/prostate_2D/job_configs/prostate_fedavg/app/config/config_fed_server.json b/...vanced/prostate/prostate_2D/job_configs/prostate_fedavg/app/config/config_fed_server.json
@@ -10,7 +10,7 @@
   "components": [
     {
       "id": "persistor",
-      "name": "PTFileModelPersistor",
+      "path": "nvflare.app_opt.pt.file_model_persistor.PTFileModelPersistor",
       "args": {
       "model": {
             "path": "monai.networks.nets.unet.UNet",

diff --git a/...anced/prostate/prostate_2D/job_configs/prostate_fedprox/app/config/config_fed_server.json b/...anced/prostate/prostate_2D/job_configs/prostate_fedprox/app/config/config_fed_server.json
@@ -10,7 +10,7 @@
   "components": [
     {
       "id": "persistor",
-      "name": "PTFileModelPersistor",
+      "path": "nvflare.app_opt.pt.file_model_persistor.PTFileModelPersistor",
       "args": {
       "model": {
             "path": "monai.networks.nets.unet.UNet",

diff --git a/...anced/prostate/prostate_3D/job_configs/prostate_central/app/config/config_fed_server.json b/...anced/prostate/prostate_3D/job_configs/prostate_central/app/config/config_fed_server.json
@@ -10,7 +10,7 @@
   "components": [
     {
       "id": "persistor",
-      "name": "PTFileModelPersistor",
+      "path": "nvflare.app_opt.pt.file_model_persistor.PTFileModelPersistor",
       "args": {
       "model": {
             "path": "monai.networks.nets.unet.UNet",

diff --git a/...dvanced/prostate/prostate_3D/job_configs/prostate_ditto/app/config/config_fed_server.json b/...dvanced/prostate/prostate_3D/job_configs/prostate_ditto/app/config/config_fed_server.json
@@ -10,7 +10,7 @@
   "components": [
     {
       "id": "persistor",
-      "name": "PTFileModelPersistor",
+      "path": "nvflare.app_opt.pt.file_model_persistor.PTFileModelPersistor",
       "args": {
       "model": {
             "path": "monai.networks.nets.unet.UNet",

diff --git a/...vanced/prostate/prostate_3D/job_configs/prostate_fedavg/app/config/config_fed_server.json b/...vanced/prostate/prostate_3D/job_configs/prostate_fedavg/app/config/config_fed_server.json
@@ -10,7 +10,7 @@
   "components": [
     {
       "id": "persistor",
-      "name": "PTFileModelPersistor",
+      "path": "nvflare.app_opt.pt.file_model_persistor.PTFileModelPersistor",
       "args": {
       "model": {
             "path": "monai.networks.nets.unet.UNet",

diff --git a/...anced/prostate/prostate_3D/job_configs/prostate_fedprox/app/config/config_fed_server.json b/...anced/prostate/prostate_3D/job_configs/prostate_fedprox/app/config/config_fed_server.json
@@ -10,7 +10,7 @@
   "components": [
     {
       "id": "persistor",
-      "name": "PTFileModelPersistor",
+      "path": "nvflare.app_opt.pt.file_model_persistor.PTFileModelPersistor",
       "args": {
       "model": {
             "path": "monai.networks.nets.unet.UNet",

diff --git a/...examples/prompt_learning/jobs/templates/client/config/config_fed_client_multiprocess.json b/...examples/prompt_learning/jobs/templates/client/config/config_fed_client_multiprocess.json
@@ -14,7 +14,7 @@
       ],
       "executor": {
         "id": "Executor",
-        "name": "PTMultiProcessExecutor",
+        "path": "nvflare.app_opt.pt.multi_process_executor.PTMultiProcessExecutor",
         "args": {
           "executor_id": "learner_executor",
           "num_of_processes": "{devices}",

diff --git a/...gration/nemo/examples/prompt_learning/jobs/templates/server/config/config_fed_server.json b/...gration/nemo/examples/prompt_learning/jobs/templates/server/config/config_fed_server.json
@@ -13,7 +13,7 @@
   "components": [
     {
       "id": "persistor",
-      "name": "PTFileModelPersistor",
+      "path": "nvflare.app_opt.pt.file_model_persistor.PTFileModelPersistor",
       "args": {
         "model": {
           "path": "nemo_nvflare.ServerPromptEncoder",

diff --git a/...s/supervised_fine_tuning/jobs/templates/client/config/config_fed_client_multiprocess.json b/...s/supervised_fine_tuning/jobs/templates/client/config/config_fed_client_multiprocess.json
@@ -13,7 +13,7 @@
       ],
       "executor": {
         "id": "Executor",
-        "name": "PTMultiProcessExecutor",
+        "path": "nvflare.app_opt.pt.multi_process_executor.PTMultiProcessExecutor",
         "args": {
           "executor_id": "learner_executor",
           "num_of_processes": "{devices}",

diff --git a/.../nemo/examples/supervised_fine_tuning/jobs/templates/server/config/config_fed_server.json b/.../nemo/examples/supervised_fine_tuning/jobs/templates/server/config/config_fed_server.json
@@ -12,7 +12,7 @@
   "components": [
     {
       "id": "persistor",
-      "name": "PTFileModelPersistor",
+      "path": "nvflare.app_opt.pt.file_model_persistor.PTFileModelPersistor",
       "args": {
         "model": {
           "path": "nemo_nvflare.ServerSFTModel",