Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 13 additions & 10 deletions tensorrt_llm/_torch/pyexecutor/resource_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -1290,18 +1290,20 @@ def _free_blocks(self, block_list: list):

class ResourceManager:

def __init__(self, resource_managers: dict[str, BaseResourceManager]):
def __init__(self, resource_managers: dict[ResourceManagerType,
BaseResourceManager]):
self.resource_managers = OrderedDict(resource_managers)

def __call__(self, name: str):
return self.resource_managers[name]
def __call__(self, type: ResourceManagerType):
return self.resource_managers[type]

def register_resource_manager(self, name: str,
def register_resource_manager(self, type: ResourceManagerType,
resource_manager: BaseResourceManager):
self.resource_managers[name] = resource_manager
self.resource_managers[type] = resource_manager

def get_resource_manager(self, name: str) -> BaseResourceManager:
return self.resource_managers.get(name)
def get_resource_manager(
self, type: ResourceManagerType) -> Optional[BaseResourceManager]:
return self.resource_managers.get(type)

@nvtx_range("prepare_resources")
def prepare_resources(self, scheduled_batch: ScheduledRequests):
Expand All @@ -1312,8 +1314,8 @@ def prepare_resources(self, scheduled_batch: ScheduledRequests):
@nvtx_range("update_resources")
def update_resources(self,
scheduled_batch: ScheduledRequests,
attn_metadata: "AttentionMetadata" = None,
kv_cache_dtype_byte_size: float = None):
attn_metadata: Optional["AttentionMetadata"] = None,
kv_cache_dtype_byte_size: Optional[float] = None):
for _, resource_manager in self.resource_managers.items():
if hasattr(resource_manager, "update_resources"):
if isinstance(resource_manager, KVCacheManager):
Expand All @@ -1328,7 +1330,8 @@ def free_resources(self, request: LlmRequest):
if hasattr(resource_manager, "free_resources"):
resource_manager.free_resources(request)

def reorder_pipeline(self, resource_manager_list: list[str]):
def reorder_pipeline(self,
resource_manager_list: list[ResourceManagerType]):
assert set(resource_manager_list) == set(self.resource_managers.keys())
for resource_manager in resource_manager_list:
self.resource_managers.move_to_end(resource_manager)
Expand Down