Remove managers' unused fields (#25433)
This commit is contained in:
@@ -149,13 +149,9 @@ class TransferBuffer:
|
|||||||
Overlapping buffer preparation and transfer operations to improve throughput.
|
Overlapping buffer preparation and transfer operations to improve throughput.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
def __init__(
|
def __init__(self, stop_event, buffer_count: int = 3) -> None:
|
||||||
self, stop_event, buffer_count: int = 3, max_buffer_size: int = 1024
|
|
||||||
) -> None:
|
|
||||||
self.stop_event = stop_event
|
self.stop_event = stop_event
|
||||||
self.buffers = Queue(maxsize=buffer_count)
|
self.buffers = Queue(maxsize=buffer_count)
|
||||||
# todo: adjust the buffer size based on throughput profile of the system
|
|
||||||
self.max_buffer_size = max_buffer_size
|
|
||||||
|
|
||||||
def full(self) -> bool:
|
def full(self) -> bool:
|
||||||
return self.buffers.full()
|
return self.buffers.full()
|
||||||
@@ -322,9 +318,7 @@ class HiCacheController:
|
|||||||
|
|
||||||
self.stop_event = threading.Event()
|
self.stop_event = threading.Event()
|
||||||
self.write_buffer = TransferBuffer(self.stop_event)
|
self.write_buffer = TransferBuffer(self.stop_event)
|
||||||
self.load_buffer = TransferBuffer(
|
self.load_buffer = TransferBuffer(self.stop_event, buffer_count=10)
|
||||||
self.stop_event, buffer_count=10, max_buffer_size=100
|
|
||||||
)
|
|
||||||
|
|
||||||
self.write_stream = device_module.Stream()
|
self.write_stream = device_module.Stream()
|
||||||
self.load_stream = device_module.Stream()
|
self.load_stream = device_module.Stream()
|
||||||
|
|||||||
@@ -135,9 +135,6 @@ class DataParallelController:
|
|||||||
)
|
)
|
||||||
self.run_scheduler_process_func = run_scheduler_process_func
|
self.run_scheduler_process_func = run_scheduler_process_func
|
||||||
|
|
||||||
# For DP balance
|
|
||||||
self.global_balance_id = 0
|
|
||||||
|
|
||||||
# Init inter-process communication
|
# Init inter-process communication
|
||||||
self.context = zmq.Context(1 + server_args.dp_size)
|
self.context = zmq.Context(1 + server_args.dp_size)
|
||||||
if server_args.node_rank == 0:
|
if server_args.node_rank == 0:
|
||||||
|
|||||||
@@ -1560,7 +1560,6 @@ class ShmPointerMMData:
|
|||||||
self.shm_name = state["shm_name"]
|
self.shm_name = state["shm_name"]
|
||||||
self.shape = state["shape"]
|
self.shape = state["shape"]
|
||||||
self.dtype = state["dtype"]
|
self.dtype = state["dtype"]
|
||||||
self.shm = None
|
|
||||||
self._shm_handle = shared_memory.SharedMemory(name=self.shm_name)
|
self._shm_handle = shared_memory.SharedMemory(name=self.shm_name)
|
||||||
# Zero-copy view into shared memory (no clone, no unlink)
|
# Zero-copy view into shared memory (no clone, no unlink)
|
||||||
self.tensor = torch.frombuffer(self._shm_handle.buf, dtype=self.dtype).reshape(
|
self.tensor = torch.frombuffer(self._shm_handle.buf, dtype=self.dtype).reshape(
|
||||||
|
|||||||
@@ -37,7 +37,6 @@ import zmq
|
|||||||
import zmq.asyncio
|
import zmq.asyncio
|
||||||
|
|
||||||
from sglang.srt.disaggregation.utils import DisaggregationMode, TransferBackend
|
from sglang.srt.disaggregation.utils import DisaggregationMode, TransferBackend
|
||||||
from sglang.srt.managers.communicator import FanOutCommunicator
|
|
||||||
from sglang.srt.managers.disagg_service import start_disagg_service
|
from sglang.srt.managers.disagg_service import start_disagg_service
|
||||||
from sglang.srt.managers.io_struct import (
|
from sglang.srt.managers.io_struct import (
|
||||||
BaseBatchReq,
|
BaseBatchReq,
|
||||||
@@ -558,10 +557,6 @@ class TokenizerWorker(TokenizerManager):
|
|||||||
self.disaggregation_transfer_backend = TransferBackend(
|
self.disaggregation_transfer_backend = TransferBackend(
|
||||||
self.server_args.disaggregation_transfer_backend
|
self.server_args.disaggregation_transfer_backend
|
||||||
)
|
)
|
||||||
# Communicator
|
|
||||||
self.register_multi_tokenizer_communicator = FanOutCommunicator(
|
|
||||||
self.send_to_scheduler, 2
|
|
||||||
)
|
|
||||||
|
|
||||||
# Register this worker with the router for pause/continue broadcasting
|
# Register this worker with the router for pause/continue broadcasting
|
||||||
reg = TokenizerWorkerRegistration(worker_ipc_name=self.tokenizer_ipc_name)
|
reg = TokenizerWorkerRegistration(worker_ipc_name=self.tokenizer_ipc_name)
|
||||||
|
|||||||
@@ -130,9 +130,6 @@ def _compute_pad_value(hash: int) -> int:
|
|||||||
|
|
||||||
|
|
||||||
class BaseFinishReason:
|
class BaseFinishReason:
|
||||||
def __init__(self, is_error: bool = False):
|
|
||||||
self.is_error = is_error
|
|
||||||
|
|
||||||
def to_json(self):
|
def to_json(self):
|
||||||
raise NotImplementedError()
|
raise NotImplementedError()
|
||||||
|
|
||||||
@@ -187,7 +184,7 @@ class FINISH_LENGTH(BaseFinishReason):
|
|||||||
|
|
||||||
class FINISH_ABORT(BaseFinishReason):
|
class FINISH_ABORT(BaseFinishReason):
|
||||||
def __init__(self, message=None, status_code=None, err_type=None):
|
def __init__(self, message=None, status_code=None, err_type=None):
|
||||||
super().__init__(is_error=True)
|
super().__init__()
|
||||||
self.message = message or "Aborted"
|
self.message = message or "Aborted"
|
||||||
self.status_code = status_code
|
self.status_code = status_code
|
||||||
self.err_type = err_type
|
self.err_type = err_type
|
||||||
@@ -623,7 +620,6 @@ class Req(ReqDllmMixin):
|
|||||||
):
|
):
|
||||||
# Input and output info
|
# Input and output info
|
||||||
self.rid = rid
|
self.rid = rid
|
||||||
self.origin_input_text = origin_input_text
|
|
||||||
self.origin_input_ids_unpadded = (
|
self.origin_input_ids_unpadded = (
|
||||||
origin_input_ids_unpadded
|
origin_input_ids_unpadded
|
||||||
if origin_input_ids_unpadded
|
if origin_input_ids_unpadded
|
||||||
@@ -777,8 +773,6 @@ class Req(ReqDllmMixin):
|
|||||||
self.logprob_start_len = 0
|
self.logprob_start_len = 0
|
||||||
self.top_logprobs_num = top_logprobs_num
|
self.top_logprobs_num = top_logprobs_num
|
||||||
self.token_ids_logprob = token_ids_logprob
|
self.token_ids_logprob = token_ids_logprob
|
||||||
self.temp_scaled_logprobs = False
|
|
||||||
self.top_p_normalized_logprobs = False
|
|
||||||
|
|
||||||
# Logprobs (return values)
|
# Logprobs (return values)
|
||||||
# True means the input logprob has been already sent to detokenizer.
|
# True means the input logprob has been already sent to detokenizer.
|
||||||
|
|||||||
@@ -398,7 +398,6 @@ class TokenizerManager(TokenizerControlMixin, TokenizerManagerScoreMixin):
|
|||||||
self.dump_request_list: List[Tuple] = []
|
self.dump_request_list: List[Tuple] = []
|
||||||
self.crash_dump_request_list: deque[Tuple] = deque()
|
self.crash_dump_request_list: deque[Tuple] = deque()
|
||||||
self.crash_dump_performed = False # Flag to ensure dump is only called once
|
self.crash_dump_performed = False # Flag to ensure dump is only called once
|
||||||
self.straggler_request_list: List[Tuple] = []
|
|
||||||
|
|
||||||
# Initialize performance metrics loggers with proper skip names
|
# Initialize performance metrics loggers with proper skip names
|
||||||
_, obj_skip_names, out_skip_names = self.request_logger.metadata
|
_, obj_skip_names, out_skip_names = self.request_logger.metadata
|
||||||
|
|||||||
Reference in New Issue
Block a user