app_opt scan changes.

yhwen · Aug 9, 2024 · 20d1903 · 20d1903
1 parent f8a3735
commit 20d1903
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 15 deletions.
diff --git a/docs/programming_guide/component_configuration.rst b/docs/programming_guide/component_configuration.rst
@@ -139,7 +139,7 @@ For example:
 
     {
         "id": "shareable_generator",
-        "name": "PTFedOptModelShareableGenerator",
+        "path": "nvflare.app_opt.pt.fedopt.PTFedOptModelShareableGenerator",
         "args": {
             "device": "cpu",
             "source_model": "model",

diff --git a/docs/programming_guide/execution_api_type/executor.rst b/docs/programming_guide/execution_api_type/executor.rst
@@ -93,7 +93,7 @@ processes to use.
                     "local_epochs": 5,
                     "steps_aggregation": 0,
                     "model_reader_writer": {
-                      "name": "PTModelReaderWriter"
+                      "path": "nvflare.app_opt.pt.model_reader_writer.PTModelReaderWriter"
                     }
                   }
                 }

diff --git a/docs/resources/init_weights_1_config_fed_server.json b/docs/resources/init_weights_1_config_fed_server.json
@@ -8,7 +8,7 @@
     "components": [
         {
             "id": "persistor",
-            "name": "PTFileModelPersistor"
+            "path": "nvflare.app_opt.pt.file_model_persistor.PTFileModelPersistor"
         },
         {
             "id": "shareable_generator",

diff --git a/...en_ct_segmentation_local/jobs/spleen_ct_segmentation_he/app/config/config_fed_client.json b/...en_ct_segmentation_local/jobs/spleen_ct_segmentation_he/app/config/config_fed_client.json
@@ -21,7 +21,7 @@
       "tasks": ["train"],
       "filters":[
           {
-          "name": "HEModelEncryptor",
+          "path": "nvflare.app_opt.he.model_encryptor.HEModelEncryptor",
           "args": {
             "weigh_by_local_iter": true
           }
@@ -32,7 +32,7 @@
       "tasks": ["submit_model"],
       "filters":[
           {
-          "name": "HEModelEncryptor",
+          "path": "nvflare.app_opt.he.model_encryptor.HEModelEncryptor",
           "args": {
             "weigh_by_local_iter": false
           }
@@ -45,7 +45,7 @@
       "tasks": ["train", "validate"],
       "filters":[
           {
-          "name": "HEModelDecryptor",
+          "path": "nvflare.app_opt.he.model_encryptor.HEModelDecryptor",
           "args": {
           }
         }

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
@@ -9,7 +9,7 @@
   "components": [
     {
       "id": "serialize_filter",
-      "name": "HEModelSerializeFilter",
+      "path": "nvflare.app_opt.he.model_serialize_filter.HEModelSerializeFilter",
       "args": {}
     },
     {
@@ -22,12 +22,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
       }
@@ -39,7 +39,7 @@
     },
     {
       "id": "model_locator",
-      "name": "PTFileModelLocator",
+      "path": "nvflare.app_opt.pt.file_model_locator.PTFileModelLocator",
       "args": {
         "pt_persistor_id": "persistor"
       }
@@ -68,7 +68,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/...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
@@ -33,7 +33,7 @@
     },
     {
       "id": "model_locator",
-      "name": "PTFileModelLocator",
+      "path": "nvflare.app_opt.pt.file_model_locator.PTFileModelLocator",
       "args": {
         "pt_persistor_id": "persistor"
       }

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
@@ -33,7 +33,7 @@
     },
     {
       "id": "model_locator",
-      "name": "PTFileModelLocator",
+      "path": "nvflare.app_opt.pt.file_model_locator.PTFileModelLocator",
       "args": {
         "pt_persistor_id": "persistor"
       }

diff --git a/...monai/examples/spleen_ct_segmentation_sim/job_multi_gpu/app/config/config_fed_client.json b/...monai/examples/spleen_ct_segmentation_sim/job_multi_gpu/app/config/config_fed_client.json
@@ -8,7 +8,7 @@
       ],
       "executor": {
         "id": "executor",
-        "name": "PTMultiProcessExecutor",
+        "path": "nvflare.app_opt.pt.multi_process_executor.PTMultiProcessExecutor",
         "args": {
           "executor_id": "client_algo_executor",
           "num_of_processes": 2,

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
@@ -33,7 +33,7 @@
     },
     {
       "id": "model_locator",
-      "name": "PTFileModelLocator",
+      "path": "nvflare.app_opt.pt.file_model_locator.PTFileModelLocator",
       "args": {
         "pt_persistor_id": "persistor"
       }