Skip to content

Commit c98f134

Browse files
authored
[fix]Sync changes from the release branch to develop. including docs、version and dockerfile (#621)
1 parent d71ea0e commit c98f134

File tree

6 files changed

+24
-5
lines changed

6 files changed

+24
-5
lines changed

docker/Dockerfile-NPU

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Set to other image if needed
2-
FROM quay.io/ascend/vllm-ascend:v0.9.2rc1
2+
FROM quay.io/ascend/vllm-ascend:v0.9.2rc1-openeuler
33

44
ARG PIP_INDEX_URL="https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple"
55

@@ -14,4 +14,12 @@ RUN export PLATFORM="ascend" && \
1414
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/Ascend/ascend-toolkit/latest/`uname -i`-linux/devlib && \
1515
pip install -v -e /workspace/unified-cache-management --no-build-isolation
1616

17+
# Apply patch for vLLM
18+
RUN cd /vllm-workspace/vllm \
19+
&& git apply /workspace/unified-cache-management/ucm/integration/vllm/patch/0.9.2/vllm-adapt.patch
20+
21+
# Apply patch for vLLM-ascend
22+
RUN cd /vllm-workspace/vllm-ascend \
23+
&& git apply /workspace/unified-cache-management/ucm/integration/vllm/patch/0.9.2/vllm-ascend-adapt.patch
24+
1725
CMD ["/bin/bash"]

docs/source/getting-started/quickstart_vllm.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ Download the pre-built `vllm/vllm-openai:v0.9.2` docker image and build unified-
9191
export PLATFORM=cuda
9292
pip install uc-manager
9393
```
94+
> **Note:** If installing via `pip install`, you need to manually add the `config.yaml` file, similar to `unified-cache-management/examples/ucm_config_example.yaml`, because PyPI packages do not include YAML files.
9495

9596
## Step 2: Configuration
9697

docs/source/getting-started/quickstart_vllm_ascend.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ Install by pip or find the pre-build wheels on [Pypi](https://pypi.org/project/u
3030
export PLATFORM=ascend
3131
pip install uc-manager
3232
```
33+
> **Note:** If installing via `pip install`, you need to manually add the `config.yaml` file, similar to `unified-cache-management/examples/ucm_config_example.yaml`, because PyPI packages do not include YAML files.
3334
3435
### Option 3: Setup from docker
3536
Download the pre-built `vllm-ascend` docker image and build unified-cache-management docker image by commands below:
@@ -39,6 +40,14 @@ Download the pre-built `vllm-ascend` docker image and build unified-cache-manage
3940
cd unified-cache-management
4041
docker build -t ucm-vllm:latest -f ./docker/Dockerfile-NPU ./
4142
```
43+
vllm-ascend provides two variants: **Ubuntu** and **openEuler**.
44+
The `Dockerfile-NPU` uses the **openEuler** variant by default.
45+
46+
If you want to use the **Ubuntu** variant, please remove the `-openeuler` suffix and use the following image instead:
47+
48+
```text
49+
quay.io/ascend/vllm-ascend:v0.9.2rc1
50+
```
4251
Then run your container using following command. You can add or remove Docker parameters as needed.
4352
```bash
4453
# Update DEVICE according to your device (/dev/davinci[0-7])

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,4 +80,5 @@ performance.
8080
:::{toctree}
8181
:maxdepth: 1
8282
nfs_store
83+
pipeline_store
8384
:::

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -227,12 +227,12 @@ This log indicates that the **Cache Store** has received a **load or dump task**
227227
| `subtask_number` | Number of subtasks executed in this operation |
228228
| `size` | Total size of data transferred in bytes (across all tasks) |
229229

230-
```test
230+
```text
231231
[UC][D] Cache task({task_id},{operation},{subtask_number},{size}) finished, cost {time}ms. [PID,TID]
232232
```
233233
This log indicates that a load or dump task in the **Cache Store** has completed, along with its execution time **in ms**.
234234

235-
```test
235+
```text
236236
[UC][D] Posix task({task_id},{operation},{subtask_number},{size}) dispatching. [PID,TID]
237237
```
238238
This log indicates that the **Posix Store** has received a **load or dump task**
@@ -243,7 +243,7 @@ This log indicates that the **Posix Store** has received a **load or dump task**
243243
| `subtask_number` | Number of subtasks executed in this operation |
244244
| `size` | Total size of data transferred in bytes (across all tasks) |
245245

246-
```test
246+
```text
247247
[UC][D] Posix task({task_id},{operation},{subtask_number},{size}) finished, cost {time}ms. [PID,TID]
248248
```
249249
This log indicates that a load or dump task in the **Posix Store** has completed, along with its execution time in **in ms**.

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ def build_cmake(self, ext: CMakeExtension):
139139

140140
setup(
141141
name="uc-manager",
142-
version="0.2.0rc2",
142+
version="0.2.0",
143143
description="Unified Cache Management",
144144
author="Unified Cache Team",
145145
packages=find_packages(),

0 commit comments

Comments
 (0)