biondizzle/vllm
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

[Bugfix][V1] Fix 'NoneType' object has no attribute 'hash_value' (#11157)

Browse Source 
Signed-off-by: Cody Yu <hao.yu.cody@gmail.com>
This commit is contained in:
Cody Yu
2024-12-12 22:30:06 -08:00
committed by GitHub
parent 00c1bde5d8
commit 34f1a806d5
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
vllm/v1/core/kv_cache_manager.py
View File

@@ -164,13 +164,14 @@ class KVCacheManager:
new_full_blocks = req_blocks[ new_full_blocks = req_blocks[
num_computed_full_blocks:num_full_blocks_after_append] num_computed_full_blocks:num_full_blocks_after_append]
self._cache_full_blocks( if new_full_blocks:
request=request, self._cache_full_blocks(
blk_start_idx=num_computed_full_blocks, request=request,
full_blocks=new_full_blocks, blk_start_idx=num_computed_full_blocks,
prev_block=req_blocks[num_computed_full_blocks - 1] full_blocks=new_full_blocks,
if num_computed_full_blocks >= 1 else None, prev_block=req_blocks[num_computed_full_blocks - 1]
) if num_computed_full_blocks >= 1 else None,
)
return new_blocks return new_blocks
@@ -375,8 +376,13 @@ class KVCacheManager:
prev_block: The previous block in the chain. prev_block: The previous block in the chain.
""" """
# Update the new blocks with the block hashes through the chain. # Update the new blocks with the block hashes through the chain.
prev_block_hash_value = (prev_block.block_hash.hash_value prev_block_hash_value = None
if prev_block is not None else None) if prev_block is not None:
# Previous block must have a block hash because it must be
# a full, cached block.
assert prev_block.block_hash is not None
prev_block_hash_value = prev_block.block_hash.hash_value
for i, blk in enumerate(full_blocks): for i, blk in enumerate(full_blocks):
blk_idx = blk_start_idx + i blk_idx = blk_start_idx + i