[Core] Deprecating block manager v1 and make block manager v2 default (#8704)
Removing the block manager v1. This is the initial piece of prefix-caching-centric design. In order to achieve prefix-caching-centric design, we need to simplify the code path so that we only use v2 block manager (which has much higher performance on prefix caching).
This commit is contained in:
@@ -4,28 +4,6 @@ from vllm.utils import (STR_NOT_IMPL_ENC_DEC_PREFIX_CACHE,
|
||||
STR_NOT_IMPL_ENC_DEC_SWA)
|
||||
|
||||
|
||||
def _get_block_mgr_sliding_window_attr(block_mgr):
|
||||
'''
|
||||
BlockManagerV1 and BlockManagerV2 have slightly different
|
||||
members related to sliding window attention (SWA). This
|
||||
function extracts the appropriate member to use for determining
|
||||
whether SWA is enabled.
|
||||
|
||||
Arguments:
|
||||
|
||||
* block_mgr: BlockManagerV1 or BlockManagerV2 instance
|
||||
'''
|
||||
|
||||
if hasattr(block_mgr, 'block_sliding_window'):
|
||||
return block_mgr.block_sliding_window
|
||||
if hasattr(block_mgr, 'max_block_sliding_window'):
|
||||
return block_mgr.max_block_sliding_window
|
||||
|
||||
raise AttributeError("Block manager instance has neither " + \
|
||||
"block_sliding_window nor " + \
|
||||
"max_block_sliding_window attributes.")
|
||||
|
||||
|
||||
def check_no_caching_or_swa_for_blockmgr_encdec(
|
||||
block_mgr, seq_group: SequenceGroup) -> None:
|
||||
'''
|
||||
@@ -41,7 +19,7 @@ def check_no_caching_or_swa_for_blockmgr_encdec(
|
||||
'''
|
||||
|
||||
if seq_group.is_encoder_decoder():
|
||||
if _get_block_mgr_sliding_window_attr(block_mgr) is not None:
|
||||
if block_mgr.max_block_sliding_window is not None:
|
||||
raise NotImplementedError(STR_NOT_IMPL_ENC_DEC_SWA)
|
||||
|
||||
if block_mgr.enable_caching:
|
||||
|
||||
Reference in New Issue
Block a user