Skip to content

Commit 5bde20b

Browse files
[BugFix] fix config bugs (#4370)
* Update expert_service.py * Update common_engine.py * Update expert_service.py * Update expert_service.py * Update expert_service.py --------- Co-authored-by: Jiang-Jia-Jun <[email protected]>
1 parent 7f94f06 commit 5bde20b

File tree

2 files changed

+30
-29
lines changed

2 files changed

+30
-29
lines changed

fastdeploy/engine/common_engine.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,13 @@ def __init__(self, cfg, start_queue=True):
6868
cfg (Config): Config object containing all the configuration parameters.
6969
"""
7070
self.cfg = cfg
71-
if isinstance(self.cfg.cache_config.cache_queue_port, str):
72-
self.cfg.cache_config.cache_queue_port = self.cfg.cache_config.cache_queue_port.split(",")
73-
if isinstance(self.cfg.cache_config.cache_queue_port, list):
74-
self.cfg.cache_config.cache_queue_port = int(
75-
self.cfg.cache_config.cache_queue_port[self.cfg.parallel_config.local_data_parallel_id]
76-
)
71+
if cfg.scheduler_config.splitwise_role != "mixed" or cfg.cache_config.enable_prefix_caching:
72+
if isinstance(self.cfg.cache_config.cache_queue_port, str):
73+
self.cfg.cache_config.cache_queue_port = self.cfg.cache_config.cache_queue_port.split(",")
74+
if isinstance(self.cfg.cache_config.cache_queue_port, list):
75+
self.cfg.cache_config.cache_queue_port = int(
76+
self.cfg.cache_config.cache_queue_port[self.cfg.parallel_config.local_data_parallel_id]
77+
)
7778

7879
if self.cfg.parallel_config.enable_expert_parallel:
7980
self.llm_logger = get_logger(

fastdeploy/engine/expert_service.py

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -103,29 +103,6 @@ def start(
103103

104104
llm_logger.info(f"start expert service {local_data_parallel_id}")
105105

106-
if self.cfg.scheduler_config.splitwise_role != "mixed" or self.cfg.cache_config.enable_prefix_caching:
107-
if self.do_profile:
108-
get_profile_block_num = np.zeros([1], dtype=np.int32)
109-
while True:
110-
try:
111-
self.get_profile_block_num_signal = IPCSignal(
112-
name="get_profile_block_num",
113-
array=get_profile_block_num,
114-
dtype=np.int32,
115-
suffix=int(self.cfg.engine_worker_queue_port[0]),
116-
create=False,
117-
)
118-
break
119-
except:
120-
time.sleep(1)
121-
self.reset_kvcache_blocks()
122-
ipc_signal_suffix_cache = self.cfg.parallel_config.engine_worker_queue_port[local_data_parallel_id]
123-
self.cache_manager_processes = self.engine.start_cache_service(
124-
self.cfg.local_device_ids, ipc_signal_suffix_cache
125-
)
126-
if self.cfg.scheduler_config.splitwise_role != "mixed":
127-
self.engine.split_mode_get_tasks()
128-
129106
if self.cfg.scheduler_config.name == "splitwise":
130107
self.cfg.init_cache_info()
131108
role = self.cfg.scheduler_config.splitwise_role
@@ -155,6 +132,29 @@ def start(
155132
)
156133
self.launched_expert_service_signal.value[local_rank] = 1
157134

135+
if self.cfg.scheduler_config.splitwise_role != "mixed" or self.cfg.cache_config.enable_prefix_caching:
136+
if self.do_profile:
137+
get_profile_block_num = np.zeros([1], dtype=np.int32)
138+
while True:
139+
try:
140+
self.get_profile_block_num_signal = IPCSignal(
141+
name="get_profile_block_num",
142+
array=get_profile_block_num,
143+
dtype=np.int32,
144+
suffix=int(self.cfg.parallel_config.engine_worker_queue_port[0]),
145+
create=False,
146+
)
147+
break
148+
except:
149+
time.sleep(1)
150+
self.reset_kvcache_blocks()
151+
ipc_signal_suffix_cache = self.cfg.parallel_config.engine_worker_queue_port[local_data_parallel_id]
152+
self.cache_manager_processes = self.engine.start_cache_service(
153+
self.cfg.local_device_ids,
154+
ipc_signal_suffix_cache,
155+
create_cache_tensor=(self.cfg.scheduler_config.splitwise_role != "mixed"),
156+
)
157+
158158
console_logger.info(
159159
f"Worker processes(rank {local_rank}) are launched with {time.time() - start_time} seconds."
160160
)

0 commit comments

Comments
 (0)