Change all name to path (#2817)

Co-authored-by: Sean Yang <[email protected]>
NVIDIA · Aug 21, 2024 · b9c1c29 · b9c1c29
1 parent b96dc32
commit b9c1c29
Show file tree

Hide file tree

Showing 95 changed files with 233 additions and 233 deletions.
diff --git a/docs/resources/init_weights_1_config_fed_server.json b/docs/resources/init_weights_1_config_fed_server.json
@@ -36,14 +36,14 @@
     "workflows": [
         {
             "id": "pre_train",
-            "name": "InitializeGlobalWeights",
+            "path": "nvflare.app_common.workflows.initialize_global_weights.InitializeGlobalWeights",
             "args": {
                 "task_name": "get_weights"
             }
         },
         {
             "id": "scatter_and_gather",
-            "name": "ScatterAndGather",
+            "path": "nvflare.app_common.workflows.scatter_and_gather.ScatterAndGather",
             "args": {
                 "min_clients": 2,
                 "num_rounds": 2,
@@ -58,7 +58,7 @@
         },
         {
             "id": "cross_site_validate",
-            "name": "CrossSiteModelEval",
+            "path": "nvflare.app_common.workflows.cross_site_model_eval.CrossSiteModelEval",
             "args": {
                 "model_locator_id": "model_locator"
             }

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
@@ -15,17 +15,17 @@
         },
         {
             "id": "shareable_generator",
-            "name": "FullModelShareableGenerator",
+            "path": "nvflare.app_common.shareablegenerators.full_model_shareable_generator.FullModelShareableGenerator",
             "args": {}
         },
         {
             "id": "aggregator",
-            "name": "InTimeAccumulateWeightedAggregator",
+            "path": "nvflare.app_common.aggregators.intime_accumulate_model_aggregator.InTimeAccumulateWeightedAggregator",
             "args": {}
         },
         {
             "id": "model_selector",
-            "name": "IntimeModelSelector",
+            "path": "nvflare.app_common.widgets.intime_model_selector.IntimeModelSelector",
             "args": {
                 "key_metric": "accuracy"
             }
@@ -39,14 +39,14 @@
         },
         {
             "id": "json_generator",
-            "name": "ValidationJsonGenerator",
+	    "path": "nvflare.app_common.widgets.validation_json_generator.ValidationJsonGenerator",
             "args": {}
         }
     ],
     "workflows": [
         {
             "id": "scatter_gather_ctl",
-            "name": "ScatterAndGather",
+            "path": "nvflare.app_common.workflows.scatter_and_gather.ScatterAndGather",
             "args": {
                 "min_clients": "{min_clients}",
                 "num_rounds": "{num_rounds}",
@@ -61,7 +61,7 @@
         },
         {
             "id": "cross_site_model_eval",
-            "name": "CrossSiteModelEval",
+            "path": "nvflare.app_common.workflows.cross_site_model_eval.CrossSiteModelEval",
             "args": {
                 "model_locator_id": "model_locator",
                 "submit_model_timeout": 600,
@@ -70,4 +70,4 @@
             }
         }
     ]
-}
+}
diff --git a/examples/advanced/brats18/configs/brats_central/app/config/config_fed_client.json b/examples/advanced/brats18/configs/brats_central/app/config/config_fed_client.json
@@ -8,7 +8,7 @@
       ],
       "executor": {
         "id": "Executor",
-        "name": "LearnerExecutor",
+        "path": "nvflare.app_common.executors.learner_executor.LearnerExecutor",
         "args": {
           "learner_id": "brats-learner"
         }

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
@@ -36,17 +36,17 @@
     },
     {
       "id": "shareable_generator",
-      "name": "FullModelShareableGenerator",
+      "path": "nvflare.app_common.shareablegenerators.full_model_shareable_generator.FullModelShareableGenerator",
       "args": {}
     },
     {
       "id": "aggregator",
-      "name": "InTimeAccumulateWeightedAggregator",
+      "path": "nvflare.app_common.aggregators.intime_accumulate_model_aggregator.InTimeAccumulateWeightedAggregator",
       "args": {}
     },
     {
       "id": "model_selector",
-      "name": "IntimeModelSelector",
+      "path": "nvflare.app_common.widgets.intime_model_selector.IntimeModelSelector",
       "args": {
         "weigh_by_local_iter": true
       }
@@ -55,7 +55,7 @@
   "workflows": [
     {
       "id": "scatter_and_gather",
-      "name": "ScatterAndGather",
+      "path": "nvflare.app_common.workflows.scatter_and_gather.ScatterAndGather",
       "args": {
         "min_clients": "{min_clients}",
         "num_rounds": "{num_rounds}",

diff --git a/examples/advanced/brats18/configs/brats_fedavg/app/config/config_fed_client.json b/examples/advanced/brats18/configs/brats_fedavg/app/config/config_fed_client.json
@@ -8,7 +8,7 @@
       ],
       "executor": {
         "id": "Executor",
-        "name": "LearnerExecutor",
+        "path": "nvflare.app_common.executors.learner_executor.LearnerExecutor",
         "args": {
           "learner_id": "brats-learner"
         }

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
@@ -36,17 +36,17 @@
     },
     {
       "id": "shareable_generator",
-      "name": "FullModelShareableGenerator",
+      "path": "nvflare.app_common.shareablegenerators.full_model_shareable_generator.FullModelShareableGenerator",
       "args": {}
     },
     {
       "id": "aggregator",
-      "name": "InTimeAccumulateWeightedAggregator",
+      "path": "nvflare.app_common.aggregators.intime_accumulate_model_aggregator.InTimeAccumulateWeightedAggregator",
       "args": {}
     },
     {
       "id": "model_selector",
-      "name": "IntimeModelSelector",
+      "path": "nvflare.app_common.widgets.intime_model_selector.IntimeModelSelector",
       "args": {
         "weigh_by_local_iter": true
       }
@@ -55,7 +55,7 @@
   "workflows": [
     {
       "id": "scatter_and_gather",
-      "name": "ScatterAndGather",
+      "path": "nvflare.app_common.workflows.scatter_and_gather.ScatterAndGather",
       "args": {
         "min_clients": "{min_clients}",
         "num_rounds": "{num_rounds}",

diff --git a/examples/advanced/brats18/configs/brats_fedavg_dp/app/config/config_fed_client.json b/examples/advanced/brats18/configs/brats_fedavg_dp/app/config/config_fed_client.json
@@ -8,7 +8,7 @@
       ],
       "executor": {
         "id": "Executor",
-        "name": "LearnerExecutor",
+        "path": "nvflare.app_common.executors.learner_executor.LearnerExecutor",
         "args": {
           "learner_id": "brats-learner"
         }

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
@@ -36,17 +36,17 @@
     },
     {
       "id": "shareable_generator",
-      "name": "FullModelShareableGenerator",
+      "path": "nvflare.app_common.shareablegenerators.full_model_shareable_generator.FullModelShareableGenerator",
       "args": {}
     },
     {
       "id": "aggregator",
-      "name": "InTimeAccumulateWeightedAggregator",
+      "path": "nvflare.app_common.aggregators.intime_accumulate_model_aggregator.InTimeAccumulateWeightedAggregator",
       "args": {}
     },
     {
       "id": "model_selector",
-      "name": "IntimeModelSelector",
+      "path": "nvflare.app_common.widgets.intime_model_selector.IntimeModelSelector",
       "args": {
         "weigh_by_local_iter": true
       }
@@ -55,7 +55,7 @@
   "workflows": [
     {
       "id": "scatter_and_gather",
-      "name": "ScatterAndGather",
+      "path": "nvflare.app_common.workflows.scatter_and_gather.ScatterAndGather",
       "args": {
         "min_clients": "{min_clients}",
         "num_rounds": "{num_rounds}",

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
@@ -53,7 +53,7 @@
     },
     {
       "id": "model_selector",
-      "name": "IntimeModelSelector",
+      "path": "nvflare.app_common.widgets.intime_model_selector.IntimeModelSelector",
       "args": {}
     },
     {
@@ -65,14 +65,14 @@
     },
     {
       "id": "json_generator",
-      "name": "ValidationJsonGenerator",
+      "path": "nvflare.app_common.widgets.validation_json_generator.ValidationJsonGenerator",
       "args": {}
     }
   ],
   "workflows": [
       {
         "id": "scatter_gather_ctl",
-        "name": "ScatterAndGather",
+        "path": "nvflare.app_common.workflows.scatter_and_gather.ScatterAndGather",
         "args": {
             "min_clients" : "{min_clients}",
             "num_rounds" : "{num_rounds}",

diff --git a/...orld/jobs/cifar10_fedavg_stream_tb/cifar10_fedavg_stream_tb/config/config_fed_client.json b/...orld/jobs/cifar10_fedavg_stream_tb/cifar10_fedavg_stream_tb/config/config_fed_client.json
@@ -32,14 +32,14 @@
         },
         {
             "id": "analytic_sender",
-            "name": "AnalyticsSender",
+            "path": "nvflare.app_common.widgets.streaming.AnalyticsSender",
             "args": {
                 "event_type": "analytix_log_stats"
             }
         },
         {
             "id": "tb_analytics_receive",
-            "name": "TBAnalyticsReceiver",
+            "path": "nvflare.app_opt.tracking.tb.tb_receiver.TBAnalyticsReceiver",
             "args": {
                 "events": [
                     "analytix_log_stats"
@@ -48,7 +48,7 @@
         },
         {
             "id": "event_to_fed",
-            "name": "ConvertToFedEvent",
+            "path": "nvflare.app_common.widgets.convert_to_fed_event.ConvertToFedEvent",
             "args": {
                 "events_to_convert": [
                     "analytix_log_stats"

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
@@ -31,17 +31,17 @@
         },
         {
             "id": "shareable_generator",
-            "name": "FullModelShareableGenerator",
+            "path": "nvflare.app_common.shareablegenerators.full_model_shareable_generator.FullModelShareableGenerator",
             "args": {}
         },
         {
             "id": "aggregator",
-            "name": "InTimeAccumulateWeightedAggregator",
+            "path": "nvflare.app_common.aggregators.intime_accumulate_model_aggregator.InTimeAccumulateWeightedAggregator",
             "args": {}
         },
         {
             "id": "model_selector",
-            "name": "IntimeModelSelector",
+            "path": "nvflare.app_common.widgets.intime_model_selector.IntimeModelSelector",
             "args": {}
         },
         {
@@ -53,12 +53,12 @@
         },
         {
             "id": "json_generator",
-            "name": "ValidationJsonGenerator",
+            "path": "nvflare.app_common.widgets.validation_json_generator.ValidationJsonGenerator",
             "args": {}
         },
         {
             "id": "tb_analytics_receive",
-            "name": "TBAnalyticsReceiver",
+            "path": "nvflare.app_opt.tracking.tb.tb_receiver.TBAnalyticsReceiver",
             "args": {
                 "events": [
                     "fed.analytix_log_stats"
@@ -69,7 +69,7 @@
     "workflows": [
         {
             "id": "scatter_gather_ctl",
-            "name": "ScatterAndGather",
+            "path": "nvflare.app_common.workflows.scatter_and_gather.ScatterAndGather",
             "args": {
                 "min_clients": "{min_clients}",
                 "num_rounds": "{num_rounds}",
@@ -84,7 +84,7 @@
         },
         {
             "id": "cross_site_model_eval",
-            "name": "CrossSiteModelEval",
+            "path": "nvflare.app_common.workflows.cross_site_model_eval.CrossSiteModelEval",
             "args": {
                 "model_locator_id": "model_locator",
                 "submit_model_timeout": 600,

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
@@ -22,7 +22,7 @@
     },
     {
       "id": "model_selector",
-      "name": "IntimeModelSelector",
+      "path": "nvflare.app_common.widgets.intime_model_selector.IntimeModelSelector",
       "args": {}
     },
     {
@@ -34,14 +34,14 @@
     },
     {
       "id": "json_generator",
-      "name": "ValidationJsonGenerator",
+      "path": "nvflare.app_common.widgets.validation_json_generator.ValidationJsonGenerator",
       "args": {}
     }
   ],
   "workflows": [
       {
           "id": "fedavg_ctl",
-          "name": "FedAvg",
+          "path": "nvflare.app_common.workflows.fed_avg.FedAvg",
           "args": {
               "num_clients": "{num_clients}",
               "num_rounds": "{num_rounds}",
@@ -50,7 +50,7 @@
       },
       {
         "id": "cross_site_model_eval",
-        "name": "CrossSiteModelEval",
+        "path": "nvflare.app_common.workflows.cross_site_model_eval.CrossSiteModelEval",
         "args": {
           "model_locator_id": "model_locator",
           "submit_model_timeout": 600,

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
@@ -31,7 +31,7 @@
         },
         {
             "id": "model_selector",
-            "name": "IntimeModelSelector",
+            "path": "nvflare.app_common.widgets.intime_model_selector.IntimeModelSelector",
             "args": {}
         },
         {
@@ -43,14 +43,14 @@
         },
         {
             "id": "json_generator",
-            "name": "ValidationJsonGenerator",
+            "path": "nvflare.app_common.widgets.validation_json_generator.ValidationJsonGenerator",
             "args": {}
         }
     ],
     "workflows": [
         {
             "id": "fedavg_ctl",
-            "name": "FedAvg",
+            "path": "nvflare.app_common.workflows.fed_avg.FedAvg",
             "args": {
                 "num_clients": "{num_clients}",
                 "num_rounds": "{num_rounds}",
@@ -59,7 +59,7 @@
         },
         {
             "id": "cross_site_model_eval",
-            "name": "CrossSiteModelEval",
+            "path": "nvflare.app_common.workflows.cross_site_model_eval.CrossSiteModelEval",
             "args": {
                 "model_locator_id": "model_locator",
                 "submit_model_timeout": 600,