mirror of
				https://github.com/PaddlePaddle/FastDeploy.git
				synced 2025-11-01 04:12:58 +08:00 
			
		
		
		
	[FDConfig]Remove splitwise_role and engine_worker_queue_port in FDConfig (#4147)
	
		
			
	
		
	
	
		
	
		
			Some checks failed
		
		
	
	
		
			
				
	
				CE Compile Job / ce_job_pre_check (push) Has been cancelled
				
			
		
			
				
	
				CE Compile Job / print_ce_job_pre_check_outputs (push) Has been cancelled
				
			
		
			
				
	
				CE Compile Job / FD-Clone-Linux (push) Has been cancelled
				
			
		
			
				
	
				CE Compile Job / Show Code Archive Output (push) Has been cancelled
				
			
		
			
				
	
				CE Compile Job / BUILD_SM8090 (push) Has been cancelled
				
			
		
			
				
	
				CE Compile Job / BUILD_SM8689 (push) Has been cancelled
				
			
		
			
				
	
				CE Compile Job / CE_UPLOAD (push) Has been cancelled
				
			
		
			
				
	
				Deploy GitHub Pages / deploy (push) Has been cancelled
				
			
		
		
	
	
				
					
				
			
		
			Some checks failed
		
		
	
	CE Compile Job / ce_job_pre_check (push) Has been cancelled
				
			CE Compile Job / print_ce_job_pre_check_outputs (push) Has been cancelled
				
			CE Compile Job / FD-Clone-Linux (push) Has been cancelled
				
			CE Compile Job / Show Code Archive Output (push) Has been cancelled
				
			CE Compile Job / BUILD_SM8090 (push) Has been cancelled
				
			CE Compile Job / BUILD_SM8689 (push) Has been cancelled
				
			CE Compile Job / CE_UPLOAD (push) Has been cancelled
				
			Deploy GitHub Pages / deploy (push) Has been cancelled
				
			* remove splitwise_role and engine_worker_queue_port * fix xpu * fix xpu * fix xpu * fix unittest * resolve conflct
This commit is contained in:
		| @@ -40,7 +40,7 @@ class InternalAdapter: | ||||
|             target=self._recv_external_module_control_instruct, daemon=True | ||||
|         ) | ||||
|         self.recv_external_instruct_thread.start() | ||||
|         if cfg.splitwise_role != "mixed": | ||||
|         if cfg.scheduler_config.splitwise_role != "mixed": | ||||
|             self.response_external_instruct_thread = threading.Thread( | ||||
|                 target=self._response_external_module_control_instruct, daemon=True | ||||
|             ) | ||||
| @@ -54,7 +54,7 @@ class InternalAdapter: | ||||
|  | ||||
|         available_block_num = self.engine.resource_manager.available_block_num() | ||||
|         server_info = { | ||||
|             "splitwise_role": self.cfg.splitwise_role, | ||||
|             "splitwise_role": self.cfg.scheduler_config.splitwise_role, | ||||
|             "block_size": int(self.cfg.cache_config.block_size), | ||||
|             "block_num": int(available_block_num), | ||||
|             "max_block_num": int(self.cfg.cache_config.total_block_num), | ||||
|   | ||||
| @@ -206,7 +206,7 @@ class SplitwiseConnector: | ||||
|                             "cache_info": { | ||||
|                                 "ipc": { | ||||
|                                     "ip": "0.0.0.0", | ||||
|                                     "port": self.cfg.engine_worker_queue_port[self.idx], | ||||
|                                     "port": self.cfg.parallel_config.engine_worker_queue_port[self.idx], | ||||
|                                     "current_id": current_id, | ||||
|                                 }, | ||||
|                             }, | ||||
| @@ -289,7 +289,9 @@ class SplitwiseConnector: | ||||
|         if port not in self.connect_innode_instances: | ||||
|             self.create_connection(port) | ||||
|         for task in tasks: | ||||
|             task.disaggregate_info["cache_info"]["ipc"]["port"] = self.cfg.engine_worker_queue_port[self.idx] | ||||
|             task.disaggregate_info["cache_info"]["ipc"]["port"] = self.cfg.parallel_config.engine_worker_queue_port[ | ||||
|                 self.idx | ||||
|             ] | ||||
|         self.connect_innode_instances[port].put_disaggregated_tasks(("decode", tasks)) | ||||
|         for task in tasks: | ||||
|             task.disaggregate_info["cache_info"]["ipc"]["port"] = port | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 YuanRisheng
					YuanRisheng