mirror of
https://github.com/PaddlePaddle/FastDeploy.git
synced 2026-04-23 00:17:25 +08:00
[Feature] [PD Disaggregation] simplify configuration for pd-disaggregated deployment, and refactor post-init and usage for all ports (#5415)
* [feat] simplify configuration for pd-disaggregated deployment, and refactor post-init and usage for all ports * [fix] fix some bugs * [fix] fix rdma port for cache manager/messager * [fix] temporarily cancel port availability check to see if it can pass ci test * [feat] simplify args for multi api server * [fix] fix dp * [fix] fix port for xpu * [fix] add tests for ports post processing & fix ci * [test] fix test_multi_api_server * [fix] fix rdma_comm_ports args for multi_api_server * [fix] fix test_common_engine * [fix] fix test_cache_transfer_manager * [chore] automatically setting FD_ENABLE_MULTI_API_SERVER * [fix] avoid api server from creating engine_args twice * [fix] fix test_run_batch * [fix] fix test_metrics * [fix] fix splitwise connector init * [test] add test_rdma_transfer and test_expert_service * [fix] fix code syntax * [fix] fix test_rdma_transfer and build wheel with rdma script
This commit is contained in:
@@ -55,7 +55,7 @@ class SplitwiseConnector:
|
||||
self.current_request_ids = dict()
|
||||
self.enable_decode_cache_task = envs.FD_ENABLE_CACHE_TASK == "1"
|
||||
|
||||
if self.cfg.cache_config.pd_comm_port is not None:
|
||||
if self.cfg.scheduler_config.splitwise_role != "mixed":
|
||||
self.zmq_ctx = zmq.Context()
|
||||
self.push_sockets: Dict[str, zmq.Socket] = {}
|
||||
self.pull_socket = None
|
||||
@@ -71,8 +71,8 @@ class SplitwiseConnector:
|
||||
self.router_socket.setsockopt(zmq.LINGER, 0)
|
||||
self.router_socket.setsockopt(zmq.SNDHWM, 1000)
|
||||
self.router_socket.setsockopt(zmq.ROUTER_MANDATORY, 1)
|
||||
self.router_socket.bind(f"tcp://*:{self.cfg.cache_config.pd_comm_port[0]}")
|
||||
self.logger.info(f"_init_network: bind {self.cfg.cache_config.pd_comm_port}")
|
||||
self.logger.info(f"_init_network: bind {self.cfg.cache_config.local_pd_comm_port}")
|
||||
self.router_socket.bind(f"tcp://*:{self.cfg.cache_config.local_pd_comm_port}")
|
||||
|
||||
self.poller = zmq.Poller()
|
||||
self.poller.register(self.router_socket, zmq.POLLIN)
|
||||
|
||||
Reference in New Issue
Block a user