Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,13 @@ vllm-ascend has main branch and dev branch.
- **main**: main branch,corresponds to the vLLM main branch, and is continuously monitored for quality through Ascend CI.
- **vX.Y.Z-dev**: development branch, created with part of new releases of vLLM. For example, `v0.7.1-dev` is the dev branch for vLLM `v0.7.1` version.

Below is maintained branches:

| Branch | Status | Note |
|------------|--------------|--------------------------------------|
| main | Maintained | CI commitment for vLLM main branch |
| v0.7.3-dev | Maintained | CI commitment for vLLM 0.7.3 version |

Please refer to [Versioning policy](docs/source/developer_guide/versioning_policy.md) for more details.

## License
Expand Down
7 changes: 7 additions & 0 deletions README.zh.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,13 @@ vllm-ascend有主干分支和开发分支。
- **main**: 主干分支,与vLLM的主干分支对应,并通过昇腾CI持续进行质量看护。
- **vX.Y.Z-dev**: 开发分支,随vLLM部分新版本发布而创建,比如`v0.7.1-dev`是vllm-asend针对vLLM `v0.7.1`版本的开发分支。

下面是维护中的分支:

| 分支 | 状态 | 备注 |
|------------|------------|---------------------|
| main | Maintained | 基于vLLM main分支CI看护 |
| v0.7.3-dev | Maintained | 基于vLLM v0.7.3版本CI看护 |

请参阅[版本策略](docs/source/developer_guide/versioning_policy.zh.md)了解更多详细信息。

## 贡献
Expand Down
17 changes: 9 additions & 8 deletions docs/source/developer_guide/versioning_policy.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,12 @@ Note that vllm-ascend will only be released for a certain vLLM release version r

Usually, each minor version of vLLM (such as 0.7) will correspond to a vllm-ascend version branch and support its latest version (for example, we plan to support version 0.7.3) as following shown:

| Branch | Status | Note |
|-----------|------------|--------------------------------------|
| main | Maintained | CI commitment for vLLM main branch |
| v0.7.1-dev | Maintained | CI commitment for vLLM 0.7.1 version |
| Branch | Status | Note |
|------------|--------------|--------------------------------------|
| main | Maintained | CI commitment for vLLM main branch |
| v0.7.3-dev | Maintained | CI commitment for vLLM 0.7.3 version |
| v0.7.1-dev | Unmaintained | Replaced by v0.7.3-dev |


## Release Compatibility Matrix

Expand All @@ -57,8 +59,7 @@ Following is the Release Compatibility Matrix for vLLM Ascend Plugin:

### Next final release (`v0.7.x`) window

| Date | Event |
|---------|-----------|
| February 2025 | Release candidates (RC1), v0.7.1rc1 |
| March 2025 | Release candidates (RC2), v0.7.1rc2 or v0.7.3rc1 |
| Date | Event |
|------------|------------------------------------------------------------------|
| March 2025 | Release candidates, v0.7.3rc1 |
| March 2025 | Final release passes, match vLLM v0.7.x latest: v0.7.1 or v0.7.3 |
18 changes: 9 additions & 9 deletions docs/source/developer_guide/versioning_policy.zh.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,11 @@ vllm-ascend有主干和开发两种分支。

通常来说,vLLM每个minor版本(比如0.7)均会对应一个vllm-ascend版本分支,并支持其最新的版本(例如我们计划支持0.7.3版本)。如下所示:

| 分支 | 状态 | 备注 |
|-----------|------------|--------------------------------------|
| main | Maintained | 基于vLLM main分支CI看护 |
| v0.7.1-dev | Maintained | 基于vLLM 0.7.1版本CI看护 |
| 分支 | 状态 | 备注 |
|------------|--------------|---------------------|
| main | Maintained | 基于vLLM main分支CI看护 |
| v0.7.3-dev | Maintained | 基于vLLM v0.7.3版本CI看护 |
| v0.7.1-dev | Unmaintained | 被v0.7.3-dev分支代替 |

## 版本配套

Expand All @@ -57,8 +58,7 @@ vLLM Ascend Plugin (`vllm-ascend`) 的关键配套关系如下:

### 下一个正式版(`v0.7.x`)发布窗口

| 时间 | 事件 |
|------------|-----------------------------------|
| 2025年02月 | RC版本(RC1), v0.7.1rc1 |
| 2025年03月 | RC版本(RC2), v0.7.1rc2 or v0.7.3rc1 |
| 2025年03月 | 正式版, 匹配0.7.x最新的vLLM版本: v0.7.1 or v0.7.3 |
| 时间 | 事件 |
|----------|-------------------------------|
| 2025年03月 | RC版本, v0.7.3rc1 |
| 2025年03月 | 正式版, 匹配0.7.3最新的vLLM版本: v0.7.3 |