Skip to content

Commit 260dfe7

Browse files
Lijiachen1018lijiachen19
andauthored
[cleancode]remove uc connector (#460)
remove uc connector Co-authored-by: lijiachen19 <lijiachen19@huawei.com>
1 parent 43bdf01 commit 260dfe7

File tree

11 files changed

+24
-1453
lines changed

11 files changed

+24
-1453
lines changed

.github/workflows/unifiedcache_test.yml

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -18,40 +18,3 @@ jobs:
1818

1919
call-lint:
2020
uses: ./.github/workflows/pre-commit.yml
21-
22-
unit-test:
23-
needs: call-lint
24-
name: Run Unittests
25-
runs-on: ubuntu-latest
26-
steps:
27-
- name: Free disk space
28-
run: |
29-
sudo rm -rf /usr/share/dotnet
30-
sudo rm -rf /opt/ghc
31-
sudo rm -rf "/usr/local/share/boost"
32-
sudo rm -rf "$AGENT_TOOLSDIRECTORY"
33-
docker system prune -af
34-
df -h
35-
36-
- name: Checkout unified-cache-management repo
37-
uses: actions/checkout@v4
38-
39-
- name: Run unit test inside vLLM container
40-
run: |
41-
docker run --rm \
42-
-e VLLM_USE_PRECOMPILED=1 \
43-
-e PLATFORM=cuda \
44-
-v ${{ github.workspace }}:/workspace/unified-cache-management \
45-
-w /workspace/unified-cache-management \
46-
--entrypoint /bin/bash \
47-
vllm/vllm-openai:v0.9.2 \
48-
-c "
49-
set -euo pipefail
50-
pip install -v -e . --no-build-isolation
51-
cd \$(pip show vllm | grep Location | awk '{print \$2}') &&
52-
git apply /workspace/unified-cache-management/ucm/integration/vllm/patch/0.9.2/vllm-adapt-pc.patch
53-
git apply /workspace/unified-cache-management/ucm/integration/vllm/patch/0.9.2/vllm-adapt-aggre.patch
54-
git apply /workspace/unified-cache-management/ucm/integration/vllm/patch/0.9.2/vllm-adapt-sparse.patch
55-
cd /workspace/unified-cache-management
56-
python3 -m unittest discover -s test
57-
"

docs/source/getting-started/installation_gpu.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ export PLATFORM=cuda
5151
pip install -v -e . --no-build-isolation
5252
```
5353

54-
**Note:** Patches are now applied automatically via dynamic patching when you import the unified-cache-management package. You no longer need to manually apply patches using `git apply`. The patches are automatically applied when you use the `UnifiedCacheConnectorV1` connector.
54+
**Note:** Patches are now applied automatically via dynamic patching when you import the unified-cache-management package. You no longer need to manually apply patches using `git apply`. The patches are automatically applied when you use the `UCMConnector` connector.
5555

5656

5757
## Setup from docker

docs/source/user-guide/pd-disaggregation/1p1d.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ vllm serve /home/models/Qwen2.5-7B-Instruct \
2626
--block-size 128 \
2727
--kv-transfer-config \
2828
'{
29-
"kv_connector": "UnifiedCacheConnectorV1",
30-
"kv_connector_module_path": "ucm.integration.vllm.uc_connector",
29+
"kv_connector": "UCMConnector",
30+
"kv_connector_module_path": "ucm.integration.vllm.ucm_connector",
3131
"kv_role": "kv_producer",
3232
"kv_connector_extra_config": {
3333
"ucm_connector_name": "UcmNfsStore",
@@ -55,8 +55,8 @@ vllm serve /home/models/Qwen2.5-7B-Instruct \
5555
--block-size 128 \
5656
--kv-transfer-config \
5757
'{
58-
"kv_connector": "UnifiedCacheConnectorV1",
59-
"kv_connector_module_path": "ucm.integration.vllm.uc_connector",
58+
"kv_connector": "UCMConnector",
59+
"kv_connector_module_path": "ucm.integration.vllm.ucm_connector",
6060
"kv_role": "kv_consumer",
6161
"kv_connector_extra_config": {
6262
"ucm_connector_name": "UcmNfsStore",

docs/source/user-guide/pd-disaggregation/npgd.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ vllm serve /home/models/Qwen2.5-7B-Instruct \
3333
--dtype bfloat16 \
3434
--kv-transfer-config \
3535
'{
36-
"kv_connector": "UnifiedCacheConnectorV1",
37-
"kv_connector_module_path": "ucm.integration.vllm.uc_connector",
36+
"kv_connector": "UCMConnector",
37+
"kv_connector_module_path": "ucm.integration.vllm.ucm_connector",
3838
"kv_role": "kv_producer",
3939
"kv_connector_extra_config": {
4040
"ucm_connector_name": "UcmNfsStore",
@@ -63,8 +63,8 @@ vllm serve /home/models/Qwen2.5-7B-Instruct \
6363
--dtype bfloat16 \
6464
--kv-transfer-config \
6565
'{
66-
"kv_connector": "UnifiedCacheConnectorV1",
67-
"kv_connector_module_path": "ucm.integration.vllm.uc_connector",
66+
"kv_connector": "UCMConnector",
67+
"kv_connector_module_path": "ucm.integration.vllm.ucm_connector",
6868
"kv_role": "kv_consumer",
6969
"kv_connector_extra_config": {
7070
"ucm_connector_name": "UcmNfsStore",

docs/source/user-guide/pd-disaggregation/xpyd.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ vllm serve /home/models/Qwen2.5-7B-Instruct \
2626
--block-size 128 \
2727
--kv-transfer-config \
2828
'{
29-
"kv_connector": "UnifiedCacheConnectorV1",
30-
"kv_connector_module_path": "ucm.integration.vllm.uc_connector",
29+
"kv_connector": "UCMConnector",
30+
"kv_connector_module_path": "ucm.integration.vllm.ucm_connector",
3131
"kv_role": "kv_producer",
3232
"kv_connector_extra_config": {
3333
"ucm_connector_name": "UcmNfsStore",
@@ -54,8 +54,8 @@ vllm serve /home/models/Qwen2.5-7B-Instruct \
5454
--block-size 128 \
5555
--kv-transfer-config \
5656
'{
57-
"kv_connector": "UnifiedCacheConnectorV1",
58-
"kv_connector_module_path": "ucm.integration.vllm.uc_connector",
57+
"kv_connector": "UCMConnector",
58+
"kv_connector_module_path": "ucm.integration.vllm.ucm_connector",
5959
"kv_role": "kv_producer",
6060
"kv_connector_extra_config": {
6161
"ucm_connector_name": "UcmNfsStore",
@@ -83,8 +83,8 @@ vllm serve /home/models/Qwen2.5-7B-Instruct \
8383
--block-size 128 \
8484
--kv-transfer-config \
8585
'{
86-
"kv_connector": "UnifiedCacheConnectorV1",
87-
"kv_connector_module_path": "ucm.integration.vllm.uc_connector",
86+
"kv_connector": "UCMConnector",
87+
"kv_connector_module_path": "ucm.integration.vllm.ucm_connector",
8888
"kv_role": "kv_consumer",
8989
"kv_connector_extra_config": {
9090
"ucm_connector_name": "UcmNfsStore",
@@ -110,8 +110,8 @@ vllm serve /home/models/Qwen2.5-7B-Instruct \
110110
--block-size 128 \
111111
--kv-transfer-config \
112112
'{
113-
"kv_connector": "UnifiedCacheConnectorV1",
114-
"kv_connector_module_path": "ucm.integration.vllm.uc_connector",
113+
"kv_connector": "UCMConnector",
114+
"kv_connector_module_path": "ucm.integration.vllm.ucm_connector",
115115
"kv_role": "kv_consumer",
116116
"kv_connector_extra_config": {
117117
"ucm_connector_name": "UcmNfsStore",

docs/source/user-guide/prefix-cache/nfs_store.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,8 @@ vllm serve /home/models/Qwen2.5-14B-Instruct \
135135
--port 7800 \
136136
--kv-transfer-config \
137137
'{
138-
"kv_connector": "UnifiedCacheConnectorV1",
139-
"kv_connector_module_path": "ucm.integration.vllm.uc_connector",
138+
"kv_connector": "UCMConnector",
139+
"kv_connector_module_path": "ucm.integration.vllm.ucm_connector",
140140
"kv_role": "kv_both",
141141
"kv_connector_extra_config": {"UCM_CONFIG_FILE": "/workspace/unified-cache-management/examples/ucm_config_example.yaml"}
142142
}'

docs/source/user-guide/sparse-attention/gsa.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ Similar to UCM's `offline_inference_esa.py` examples. We only need to specify `u
8888
...
8989
ktc = KVTransferConfig(
9090
kv_connector=name,
91-
kv_connector_module_path="ucm.integration.vllm.uc_connector",
91+
kv_connector_module_path="ucm.integration.vllm.ucm_connector",
9292
kv_role="kv_both",
9393
kv_connector_extra_config={
9494
"ucm_connector_name": "UcmNfsStore",
@@ -121,7 +121,7 @@ vllm serve /home/models/DeepSeek-R1-Distill-Qwen-32B \
121121
--kv-transfer-config \
122122
'{
123123
"kv_connector": name,
124-
"kv_connector_module_path": "ucm.integration.vllm.uc_connector",
124+
"kv_connector_module_path": "ucm.integration.vllm.ucm_connector",
125125
"kv_role": "kv_both",
126126
"kv_connector_extra_config": {
127127
"ucm_connector_name": "UcmNfsStore",

examples/ucm_config_example.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ load_only_first_rank: false
3232
# GSA: {}
3333

3434

35-
# Whether to use layerwise loading/saving (optional, default: True for UnifiedCacheConnectorV1)
35+
# Whether to use layerwise loading/saving (optional, default: True for UCMConnector)
3636
# use_layerwise: true
3737
# hit_ratio: 0.9
3838

0 commit comments

Comments
 (0)