WIP: simulator issue

NVIDIA · Jul 27, 2023 · de4b150 · de4b150
1 parent b3c096f
commit de4b150
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 25 deletions.
diff --git a/nvflare/private/fed/app/client/sub_worker_process.py b/nvflare/private/fed/app/client/sub_worker_process.py
@@ -36,14 +36,14 @@
     CommunicationMetaData,
     MultiProcessCommandNames,
 )
-from nvflare.fuel.f3.cellnet.cell import Cell
+
+# from nvflare.fuel.f3.cellnet.cell import Cell
 from nvflare.fuel.f3.cellnet.cell import Message as CellMessage
 from nvflare.fuel.f3.cellnet.cell import MessageHeaderKey, make_reply
 from nvflare.fuel.f3.cellnet.defs import ReturnCode
 from nvflare.fuel.f3.cellnet.fqcn import FQCN
 from nvflare.fuel.f3.cellnet.net_agent import NetAgent
-
-# from nvflare.fuel.f3.cellnet.new_cell import NewCell as Cell
+from nvflare.fuel.f3.cellnet.new_cell import NewCell as Cell
 from nvflare.fuel.f3.mpm import MainProcessMonitor as mpm
 from nvflare.fuel.sec.audit import AuditService
 from nvflare.fuel.sec.security_content_service import SecurityContentService

diff --git a/nvflare/private/fed/app/deployer/simulator_deployer.py b/nvflare/private/fed/app/deployer/simulator_deployer.py
@@ -17,9 +17,7 @@
 import shutil
 import tempfile
 
-from nvflare.fuel.f3.cellnet.cell import Cell
-
-# from nvflare.fuel.f3.cellnet.new_cell import NewCell as Cell
+from nvflare.fuel.f3.cellnet.new_cell import NewCell as Cell
 from nvflare.fuel.f3.mpm import MainProcessMonitor as mpm
 from nvflare.fuel.utils.dict_utils import augment
 from nvflare.fuel.utils.network_utils import get_open_ports
@@ -31,6 +29,8 @@
 from .base_client_deployer import BaseClientDeployer
 from .server_deployer import ServerDeployer
 
+# from nvflare.fuel.f3.cellnet.cell import Cell
+
 
 class SimulatorDeployer(ServerDeployer):
     def __init__(self):

diff --git a/nvflare/private/fed/app/simulator/simulator_worker.py b/nvflare/private/fed/app/simulator/simulator_worker.py
@@ -24,10 +24,8 @@
 from nvflare.apis.fl_component import FLComponent
 from nvflare.apis.fl_constant import FLContextKey, WorkspaceConstants
 from nvflare.fuel.common.multi_process_executor_constants import CommunicationMetaData
-from nvflare.fuel.f3.cellnet.cell import Cell
-
-# from nvflare.fuel.f3.cellnet.new_cell import NewCell as Cell
 from nvflare.fuel.f3.cellnet.fqcn import FQCN
+from nvflare.fuel.f3.cellnet.new_cell import NewCell as Cell
 from nvflare.fuel.f3.mpm import MainProcessMonitor as mpm
 from nvflare.fuel.hci.server.authz import AuthorizationService
 from nvflare.fuel.sec.audit import AuditService
@@ -43,6 +41,9 @@
 from nvflare.security.logging import secure_format_exception
 from nvflare.security.security import EmptyAuthorizer
 
+# from nvflare.fuel.f3.cellnet.cell import Cell
+
+
 CELL_CONNECT_CHECK_TIMEOUT = 10.0
 FETCH_TASK_RUN_RETRY = 3
 

diff --git a/nvflare/private/fed/client/admin.py b/nvflare/private/fed/client/admin.py
@@ -14,9 +14,9 @@
 
 """The FedAdmin to communicate with the Admin server."""
 
-# from nvflare.fuel.f3.cellnet.new_cell import NewCell as Cell
-from nvflare.fuel.f3.cellnet.cell import Cell
+# from nvflare.fuel.f3.cellnet.cell import Cell
 from nvflare.fuel.f3.cellnet.cell import Message as CellMessage
+from nvflare.fuel.f3.cellnet.new_cell import NewCell as Cell
 from nvflare.fuel.hci.server.constants import ConnProps
 from nvflare.fuel.sec.audit import Auditor, AuditService
 from nvflare.fuel.sec.authz import AuthorizationService, AuthzContext, Person

diff --git a/nvflare/private/fed/client/fed_client.py b/nvflare/private/fed/client/fed_client.py
@@ -22,14 +22,14 @@
 from nvflare.apis.fl_component import FLComponent
 from nvflare.apis.fl_constant import FLContextKey
 from nvflare.apis.fl_context import FLContext
-from nvflare.fuel.f3.cellnet.cell import Cell
-
-# from nvflare.fuel.f3.cellnet.new_cell import NewCell as Cell
+from nvflare.fuel.f3.cellnet.new_cell import NewCell as Cell
 from nvflare.private.defs import SpecialTaskName
 from nvflare.private.event import fire_event
 
 from .fed_client_base import FederatedClientBase
 
+# from nvflare.fuel.f3.cellnet.cell import Cell
+
 
 class FederatedClient(FederatedClientBase):
     """Federated client-side implementation."""

diff --git a/nvflare/private/fed/client/fed_client_base.py b/nvflare/private/fed/client/fed_client_base.py
@@ -27,11 +27,11 @@
 from nvflare.apis.overseer_spec import SP
 from nvflare.apis.shareable import Shareable
 from nvflare.apis.signal import Signal
-from nvflare.fuel.f3.cellnet.cell import Cell
+
+# from nvflare.fuel.f3.cellnet.cell import Cell
 from nvflare.fuel.f3.cellnet.fqcn import FQCN
 from nvflare.fuel.f3.cellnet.net_agent import NetAgent
-
-# from nvflare.fuel.f3.cellnet.new_cell import NewCell as Cell
+from nvflare.fuel.f3.cellnet.new_cell import NewCell as Cell
 from nvflare.fuel.f3.drivers.driver_params import DriverParams
 from nvflare.fuel.f3.mpm import MainProcessMonitor as mpm
 from nvflare.fuel.utils.argument_utils import parse_vars

diff --git a/nvflare/private/fed/server/admin.py b/nvflare/private/fed/server/admin.py
@@ -16,11 +16,10 @@
 import time
 from typing import List, Optional
 
-from nvflare.fuel.f3.cellnet.cell import Cell
+# from nvflare.fuel.f3.cellnet.cell import Cell
 from nvflare.fuel.f3.cellnet.net_agent import NetAgent
 from nvflare.fuel.f3.cellnet.net_manager import NetManager
-
-# from nvflare.fuel.f3.cellnet.new_cell import NewCell as Cell
+from nvflare.fuel.f3.cellnet.new_cell import NewCell as Cell
 from nvflare.fuel.f3.mpm import MainProcessMonitor as mpm
 from nvflare.fuel.hci.conn import Connection
 from nvflare.fuel.hci.reg import CommandModule

diff --git a/nvflare/private/fed/server/fed_server.py b/nvflare/private/fed/server/fed_server.py
@@ -37,14 +37,15 @@
 from nvflare.apis.fl_context import FLContext
 from nvflare.apis.shareable import Shareable
 from nvflare.apis.workspace import Workspace
-from nvflare.fuel.f3.cellnet.cell import Cell, Message
+
+# from nvflare.fuel.f3.cellnet.cell import Cell, Message
+from nvflare.fuel.f3.cellnet.cell import Message
 from nvflare.fuel.f3.cellnet.cell import make_reply as make_cellnet_reply
 from nvflare.fuel.f3.cellnet.defs import MessageHeaderKey
 from nvflare.fuel.f3.cellnet.defs import ReturnCode as F3ReturnCode
 from nvflare.fuel.f3.cellnet.fqcn import FQCN
 from nvflare.fuel.f3.cellnet.net_agent import NetAgent
-
-# from nvflare.fuel.f3.cellnet.new_cell import NewCell as Cell
+from nvflare.fuel.f3.cellnet.new_cell import NewCell as Cell
 from nvflare.fuel.f3.drivers.driver_params import DriverParams
 from nvflare.fuel.f3.mpm import MainProcessMonitor as mpm
 from nvflare.fuel.utils import fobs

diff --git a/nvflare/private/fed/server/server_command_agent.py b/nvflare/private/fed/server/server_command_agent.py
@@ -18,9 +18,10 @@
 from nvflare.apis.fl_constant import FLContextKey, ServerCommandKey
 from nvflare.apis.fl_context import FLContext
 from nvflare.apis.utils.fl_context_utils import get_serializable_data
-from nvflare.fuel.f3.cellnet.cell import Cell, MessageHeaderKey, ReturnCode, make_reply
 
-# from nvflare.fuel.f3.cellnet.new_cell import NewCell as Cell
+# from nvflare.fuel.f3.cellnet.cell import Cell, MessageHeaderKey, ReturnCode, make_reply
+from nvflare.fuel.f3.cellnet.cell import MessageHeaderKey, ReturnCode, make_reply
+from nvflare.fuel.f3.cellnet.new_cell import NewCell as Cell
 from nvflare.fuel.f3.message import Message as CellMessage
 from nvflare.fuel.utils import fobs
 from nvflare.private.defs import CellChannel, CellMessageHeaderKeys, new_cell_message