Commit b3791c2
authored
[BugFix]Get mamba cached block failed (vllm-project#11131)
### What this PR does / why we need it?
- Fixes vllm-project#10998
Currently issue:
block size: 1k
chunk size: 4k
condition 1:
```
full 0: 1k 2k 3k 4k(evict) -> hit 3k
mamba 1: 4k -> hit 4k
mamba 2: 4k -> hit 4k
mamba 3: 4k -> hit 4k
finally hit: 3k(min)
problem: group 2, 3, 4 load 3k failed(-704)
```
condition 2:
```
full 0: 1k 2k 3k 4k 5k 6k 7k 8k 9k 10k 11k 12k(evict) -> hit 11k
mamba 1: 4k(evict) 8k 12k -> hit 8k
mamba 2: 4k 8k(evict) 12k -> hit 4k
mamba 3: 4k 8k 12k -> hit 4k
finally hit: 4k(min)
problem: group 1 load 4k failed(-704)
```
After Fix:
condition 1:
```
full 0: 1k 2k 3k 4k(evict) -> hit [1k 2k 3k]
mamba 1: 4k -> hit [4k]
mamba 2: 4k -> hit [4k]
mamba 3: 4k -> hit [4k]
finally hit: 0(max(intersection))
```
condition 2:
```
full 0: 1k 2k 3k 4k 5k 6k 7k 8k 9k 10k 11k 12k(evict) -> hit [1k 2k 3k 4k 5k 6k 7k 8k 9k 10k 11k]
mamba 1: 4k(evict) 8k 12k -> hit [8k]
mamba 2: 4k 8k(evict) 12k -> hit [4k]
mamba 3: 4k 8k 12k -> hit [4k]
finally hit: 0(max(intersection))
```
condition 2:
```
full 0: 1k 2k 3k 4k 5k 6k 7k 8k 9k 10k 11k 12k(evict) -> hit [1k 2k 3k 4k 5k 6k 7k 8k 9k 10k 11k]
mamba 1: 4k 8k 12k -> hit [4k 8k]
mamba 2: 4k 8k(evict) 12k -> hit [4k]
mamba 3: 4k 8k 12k -> hit [4k]
finally hit: 4k(max(intersection))
```
- vLLM version: v0.23.0
- vLLM main:
vllm-project/vllm@dc68bd8
---------
Signed-off-by: Qingsong Zhang <1640410765@qq.com>1 parent b7b7f4e commit b3791c2
2 files changed
Lines changed: 107 additions & 44 deletions
File tree
- tests/ut/distributed/ascend_store
- vllm_ascend/distributed/kv_transfer/kv_pool/ascend_store
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
50 | 50 | | |
51 | 51 | | |
52 | 52 | | |
53 | | - | |
| 53 | + | |
54 | 54 | | |
55 | 55 | | |
56 | | - | |
57 | | - | |
| 56 | + | |
| 57 | + | |
58 | 58 | | |
59 | | - | |
| 59 | + | |
60 | 60 | | |
61 | 61 | | |
62 | | - | |
63 | | - | |
| 62 | + | |
| 63 | + | |
64 | 64 | | |
65 | | - | |
| 65 | + | |
66 | 66 | | |
67 | 67 | | |
68 | | - | |
69 | | - | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
70 | 103 | | |
71 | | - | |
| 104 | + | |
72 | 105 | | |
73 | | - | |
74 | | - | |
| 106 | + | |
| 107 | + | |
75 | 108 | | |
76 | 109 | | |
77 | 110 | | |
| |||
84 | 117 | | |
85 | 118 | | |
86 | 119 | | |
| 120 | + | |
87 | 121 | | |
88 | 122 | | |
89 | 123 | | |
| |||
461 | 495 | | |
462 | 496 | | |
463 | 497 | | |
| 498 | + | |
464 | 499 | | |
465 | 500 | | |
466 | 501 | | |
| |||
Lines changed: 60 additions & 32 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
78 | 78 | | |
79 | 79 | | |
80 | 80 | | |
| 81 | + | |
81 | 82 | | |
82 | 83 | | |
83 | 84 | | |
| |||
1018 | 1019 | | |
1019 | 1020 | | |
1020 | 1021 | | |
1021 | | - | |
| 1022 | + | |
| 1023 | + | |
1022 | 1024 | | |
1023 | 1025 | | |
1024 | 1026 | | |
| |||
1081 | 1083 | | |
1082 | 1084 | | |
1083 | 1085 | | |
1084 | | - | |
1085 | | - | |
1086 | | - | |
1087 | | - | |
1088 | | - | |
1089 | | - | |
1090 | | - | |
1091 | | - | |
1092 | | - | |
1093 | | - | |
| 1086 | + | |
| 1087 | + | |
| 1088 | + | |
1094 | 1089 | | |
1095 | | - | |
1096 | | - | |
1097 | | - | |
1098 | | - | |
1099 | | - | |
1100 | | - | |
1101 | | - | |
1102 | | - | |
1103 | | - | |
1104 | | - | |
| 1090 | + | |
| 1091 | + | |
| 1092 | + | |
| 1093 | + | |
| 1094 | + | |
| 1095 | + | |
| 1096 | + | |
1105 | 1097 | | |
1106 | 1098 | | |
1107 | 1099 | | |
1108 | 1100 | | |
1109 | | - | |
| 1101 | + | |
1110 | 1102 | | |
1111 | 1103 | | |
1112 | 1104 | | |
| |||
1116 | 1108 | | |
1117 | 1109 | | |
1118 | 1110 | | |
| 1111 | + | |
1119 | 1112 | | |
1120 | | - | |
| 1113 | + | |
1121 | 1114 | | |
1122 | 1115 | | |
1123 | | - | |
1124 | | - | |
| 1116 | + | |
1125 | 1117 | | |
1126 | | - | |
| 1118 | + | |
| 1119 | + | |
| 1120 | + | |
| 1121 | + | |
| 1122 | + | |
| 1123 | + | |
| 1124 | + | |
| 1125 | + | |
| 1126 | + | |
| 1127 | + | |
| 1128 | + | |
| 1129 | + | |
| 1130 | + | |
1127 | 1131 | | |
1128 | 1132 | | |
1129 | 1133 | | |
| |||
1137 | 1141 | | |
1138 | 1142 | | |
1139 | 1143 | | |
1140 | | - | |
| 1144 | + | |
| 1145 | + | |
| 1146 | + | |
| 1147 | + | |
| 1148 | + | |
| 1149 | + | |
| 1150 | + | |
| 1151 | + | |
| 1152 | + | |
1141 | 1153 | | |
1142 | | - | |
1143 | | - | |
1144 | | - | |
1145 | | - | |
1146 | | - | |
| 1154 | + | |
| 1155 | + | |
| 1156 | + | |
| 1157 | + | |
| 1158 | + | |
| 1159 | + | |
| 1160 | + | |
| 1161 | + | |
| 1162 | + | |
| 1163 | + | |
| 1164 | + | |
| 1165 | + | |
| 1166 | + | |
| 1167 | + | |
| 1168 | + | |
| 1169 | + | |
| 1170 | + | |
| 1171 | + | |
| 1172 | + | |
| 1173 | + | |
| 1174 | + | |
1147 | 1175 | | |
1148 | 1176 | | |
1149 | 1177 | | |
| |||
0 commit comments