Merge branch 'main' into fedbpt

holgerroth · Apr 11, 2024 · 8f1b110 · 8f1b110
2 parents acc8fd1 + ef025f1
commit 8f1b110
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 11 deletions.
diff --git a/examples/advanced/finance/jobs/2_cyclic/app_server/config/config_fed_server.json b/examples/advanced/finance/jobs/2_cyclic/app_server/config/config_fed_server.json
@@ -24,7 +24,7 @@
     "workflows": [
         {
             "id": "cyclic_ctl",
-            "name": "CyclicController",
+            "path": "nvflare.app_common.workflows.cyclic_ctl.CyclicController",
             "args": {
                 "num_rounds": 50,
                 "task_assignment_timeout": 60,

diff --git a/examples/advanced/finance/jobs/2_histogram/app_site-1/config/config_fed_client.json b/examples/advanced/finance/jobs/2_histogram/app_site-1/config/config_fed_client.json
@@ -7,7 +7,7 @@
             ],
             "executor": {
                 "id": "Executor",
-                "name": "FedXGBHistogramExecutor",
+                "path": "nvflare.app_opt.xgboost.histogram_based.executor.FedXGBHistogramExecutor",
                 "args": {
                     "data_loader_id": "dataloader",
                     "num_rounds": 100,

diff --git a/examples/advanced/finance/jobs/2_histogram/app_site-2/config/config_fed_client.json b/examples/advanced/finance/jobs/2_histogram/app_site-2/config/config_fed_client.json
@@ -7,7 +7,7 @@
             ],
             "executor": {
                 "id": "Executor",
-                "name": "FedXGBHistogramExecutor",
+                "path": "nvflare.app_opt.xgboost.histogram_based.executor.FedXGBHistogramExecutor",
                 "args": {
                     "data_loader_id": "dataloader",
                     "num_rounds": 100,

diff --git a/examples/advanced/finance/jobs/vertical_xgb/app/config/config_fed_client.json b/examples/advanced/finance/jobs/vertical_xgb/app/config/config_fed_client.json
@@ -7,7 +7,7 @@
       ],
       "executor": {
         "id": "xgb_hist_executor",
-        "name": "FedXGBHistogramExecutor",
+        "path": "nvflare.app_opt.xgboost.histogram_based.executor.FedXGBHistogramExecutor",
         "args": {
           "data_loader_id": "dataloader",
           "num_rounds": 100,

diff --git a/examples/advanced/xgboost/histogram-based/jobs/base/app/config/config_fed_client.json b/examples/advanced/xgboost/histogram-based/jobs/base/app/config/config_fed_client.json
@@ -8,7 +8,7 @@
       ],
       "executor": {
         "id": "Executor",
-        "name": "FedXGBHistogramExecutor",
+        "path": "nvflare.app_opt.xgboost.histogram_based.executor.FedXGBHistogramExecutor",
         "args": {
           "data_loader_id": "dataloader",
           "num_rounds": "{num_rounds}",

diff --git a/examples/advanced/xgboost/tree-based/jobs/cyclic_base/app/config/config_fed_server.json b/examples/advanced/xgboost/tree-based/jobs/cyclic_base/app/config/config_fed_server.json
@@ -28,7 +28,7 @@
   "workflows": [
     {
       "id": "cyclic_ctl",
-      "name": "CyclicController",
+      "path": "nvflare.app_common.workflows.cyclic_ctl.CyclicController",
       "args": {
         "num_rounds": "{num_rounds}",
         "task_assignment_timeout": 60,

diff --git a/job_templates/vertical_xgb/config_fed_client.conf b/job_templates/vertical_xgb/config_fed_client.conf
@@ -7,7 +7,7 @@ executors = [
     executor {
       # Federated XGBoost Executor for histogram-base collaboration
       id = "xgb_hist_executor"
-      name = "FedXGBHistogramExecutor"
+      path = "nvflare.app_opt.xgboost.histogram_based.executor.FedXGBHistogramExecutor"
       args {
         num_rounds = 100
         early_stopping_rounds = 2

diff --git a/nvflare/private/fed/app/utils.py b/nvflare/private/fed/app/utils.py
@@ -23,7 +23,6 @@
 from nvflare.apis.fl_constant import FLContextKey, WorkspaceConstants
 from nvflare.apis.fl_context import FLContext
 from nvflare.apis.fl_exception import UnsafeComponentError
-from nvflare.apis.workspace import Workspace
 from nvflare.fuel.hci.security import hash_password
 from nvflare.fuel.sec.security_content_service import SecurityContentService
 from nvflare.private.defs import SSLConstants
@@ -106,9 +105,9 @@ def version_check():
 
 
 def init_security_content_service(workspace_dir):
-    os.makedirs(os.path.join(workspace_dir, WorkspaceConstants.STARTUP_FOLDER_NAME), exist_ok=True)
-    workspace_obj = Workspace(root_dir=workspace_dir)
-    SecurityContentService.initialize(content_folder=workspace_obj.get_startup_kit_dir())
+    content_folder_path = os.path.join(workspace_dir, WorkspaceConstants.STARTUP_FOLDER_NAME)
+    os.makedirs(content_folder_path, exist_ok=True)
+    SecurityContentService.initialize(content_folder=content_folder_path)
 
 
 def component_security_check(fl_ctx: FLContext):