Commit c1cb831
committed
merge: integrate PR #4742 - re-introduce kvbm-kernels
Merged PR #4742 (oandreeva/kvbm-kernels) which re-introduces the KVBM kernels
library after it was reverted from main.
Key changes:
- Added lib/kvbm-kernels with CUDA tensor kernel operations
- Integrated kernels module into kvbm bindings (kept alongside v2 module)
- Updated workspace to include kvbm-kernels
- Added prebuilt CUDA binaries and static libraries for x86_64
- Updated vLLM Dockerfile with CUDA dev tools
- Moved vectorized_copy.fatbin to kvbm-kernels library
Conflicts resolved:
- Cargo.toml: Added kvbm-kernels to workspace members
- lib/bindings/kvbm/Cargo.toml: Added kvbm_kernels dependency to block-manager feature
- lib/bindings/kvbm/src/lib.rs: Added kernels module alongside existing v2 module
- lib/bindings/kvbm/python/kvbm/__init__.py: Exported both kernels and v2 modules
- Cargo.lock files: Accepted PR version and will regenerate
Signed-off-by: Ryan Olson <[email protected]>File tree
28 files changed
+3775
-37
lines changed- .github/workflows
- .sandbox
- container
- lib
- bindings/kvbm
- python/kvbm
- src
- tests
- kvbm-kernels
- cuda
- prebuilt
- src
- llm
- src/block_manager/block/transfer
- tests/kvbm_integration
28 files changed
+3775
-37
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
8 | 8 | | |
9 | 9 | | |
10 | 10 | | |
| 11 | + | |
11 | 12 | | |
12 | 13 | | |
13 | 14 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
92 | 92 | | |
93 | 93 | | |
94 | 94 | | |
95 | | - | |
| 95 | + | |
96 | 96 | | |
97 | 97 | | |
98 | 98 | | |
| |||
117 | 117 | | |
118 | 118 | | |
119 | 119 | | |
120 | | - | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
121 | 124 | | |
122 | 125 | | |
123 | 126 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
67 | 67 | | |
68 | 68 | | |
69 | 69 | | |
70 | | - | |
71 | | - | |
| 70 | + | |
| 71 | + | |
72 | 72 | | |
73 | 73 | | |
74 | 74 | | |
| |||
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
21 | 21 | | |
22 | 22 | | |
23 | 23 | | |
| 24 | + | |
24 | 25 | | |
25 | 26 | | |
26 | 27 | | |
| |||
59 | 60 | | |
60 | 61 | | |
61 | 62 | | |
| 63 | + | |
62 | 64 | | |
63 | 65 | | |
64 | 66 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
651 | 651 | | |
652 | 652 | | |
653 | 653 | | |
| 654 | + | |
| 655 | + | |
| 656 | + | |
| 657 | + | |
| 658 | + | |
| 659 | + | |
| 660 | + | |
654 | 661 | | |
655 | 662 | | |
656 | 663 | | |
| |||
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
21 | 21 | | |
22 | 22 | | |
23 | 23 | | |
24 | | - | |
| 24 | + | |
25 | 25 | | |
26 | 26 | | |
27 | 27 | | |
| |||
31 | 31 | | |
32 | 32 | | |
33 | 33 | | |
| 34 | + | |
34 | 35 | | |
35 | 36 | | |
36 | 37 | | |
| |||
73 | 74 | | |
74 | 75 | | |
75 | 76 | | |
76 | | - | |
| 77 | + | |
77 | 78 | | |
78 | 79 | | |
79 | 80 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
16 | 16 | | |
17 | 17 | | |
18 | 18 | | |
| 19 | + | |
19 | 20 | | |
20 | 21 | | |
21 | | - | |
| 22 | + | |
0 commit comments