Skip to content

Re-patch TritonPlaceholder on main to make CI happy#753

Merged
Yikun merged 1 commit intovllm-project:mainfrom
Yikun:triton-main
May 5, 2025
Merged

Re-patch TritonPlaceholder on main to make CI happy#753
Yikun merged 1 commit intovllm-project:mainfrom
Yikun:triton-main

Conversation

@Yikun
Copy link
Copy Markdown
Member

@Yikun Yikun commented May 5, 2025 •
edited
Loading

What this PR does / why we need it?

Re-patch TritonPlaceholder on main to make CI happy

Related:

Does this PR introduce any user-facing change?

No

How was this patch tested?

All CI passed include main

@Yikun Yikun force-pushed the triton-main branch 2 times, most recently from ae88126 to d427bcd Compare May 5, 2025 13:56
@Yikun
Re-patch TritonPlaceholder on main to make CI happy
05095aa 
Signed-off-by: Yikun Jiang <yikunkero@gmail.com>
Yikun
Yikun commented May 5, 2025
View reviewed changes
vllm_ascend/patch/worker/__init__.py
from vllm_ascend.patch.worker import patch_0_8_5 # noqa: F401
from vllm_ascend.patch.worker import patch_common # noqa: F401
else:
from vllm_ascend.patch.worker import patch_main # noqa: F401 # isort:skip
Copy link
Copy Markdown
Member Author

@Yikun Yikun May 5, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Try move patch_main before patch_common to resolve:

https://github.com/vllm-project/vllm-ascend/actions/runs/14837426407/job/41651814910

ERROR 05-05 13:28:54 [registry.py:356] Traceback (most recent call last):
ERROR 05-05 13:28:54 [registry.py:356]   File "/__w/vllm-ascend/vllm-ascend/vllm-empty/vllm/model_executor/models/registry.py", line 354, in _try_inspect_model_cls
ERROR 05-05 13:28:54 [registry.py:356]     return model.inspect_model_cls()
ERROR 05-05 13:28:54 [registry.py:356]   File "/__w/vllm-ascend/vllm-ascend/vllm-empty/vllm/model_executor/models/registry.py", line 325, in inspect_model_cls
ERROR 05-05 13:28:54 [registry.py:356]     return _run_in_subprocess(
ERROR 05-05 13:28:54 [registry.py:356]   File "/__w/vllm-ascend/vllm-ascend/vllm-empty/vllm/model_executor/models/registry.py", line 590, in _run_in_subprocess
ERROR 05-05 13:28:54 [registry.py:356]     raise RuntimeError(f"Error raised in subprocess:\n"
ERROR 05-05 13:28:54 [registry.py:356] RuntimeError: Error raised in subprocess:
ERROR 05-05 13:28:54 [registry.py:356] /usr/local/python3.10/lib/python3.10/runpy.py:126: RuntimeWarning: 'vllm.model_executor.models.registry' found in sys.modules after import of package 'vllm.model_executor.models', but prior to execution of 'vllm.model_executor.models.registry'; this may result in unpredictable behaviour
ERROR 05-05 13:28:54 [registry.py:356]   warn(RuntimeWarning(msg))
ERROR 05-05 13:28:54 [registry.py:356] Traceback (most recent call last):
ERROR 05-05 13:28:54 [registry.py:356]   File "/usr/local/python3.10/lib/python3.10/runpy.py", line 196, in _run_module_as_main
ERROR 05-05 13:28:54 [registry.py:356]     return _run_code(code, main_globals, None,
ERROR 05-05 13:28:54 [registry.py:356]   File "/usr/local/python3.10/lib/python3.10/runpy.py", line 86, in _run_code
ERROR 05-05 13:28:54 [registry.py:356]     exec(code, run_globals)
ERROR 05-05 13:28:54 [registry.py:356]   File "/__w/vllm-ascend/vllm-ascend/vllm-empty/vllm/model_executor/models/registry.py", line 611, in <module>
ERROR 05-05 13:28:54 [registry.py:356]     _run()
ERROR 05-05 13:28:54 [registry.py:356]   File "/__w/vllm-ascend/vllm-ascend/vllm-empty/vllm/model_executor/models/registry.py", line 600, in _run
ERROR 05-05 13:28:54 [registry.py:356]     load_general_plugins()
ERROR 05-05 13:28:54 [registry.py:356]   File "/__w/vllm-ascend/vllm-ascend/vllm-empty/vllm/plugins/__init__.py", line 82, in load_general_plugins
ERROR 05-05 13:28:54 [registry.py:356]     func()
ERROR 05-05 13:28:54 [registry.py:356]   File "/__w/vllm-ascend/vllm-ascend/vllm_ascend/__init__.py", line 29, in register_model
ERROR 05-05 13:28:54 [registry.py:356]     import vllm_ascend.patch.worker.patch_main.patch_tritonplaceholder  # noqa
ERROR 05-05 13:28:54 [registry.py:356]   File "/__w/vllm-ascend/vllm-ascend/vllm_ascend/patch/worker/__init__.py", line 25, in <module>
ERROR 05-05 13:28:54 [registry.py:356]     from vllm_ascend.patch.worker import patch_common  # noqa: F401
ERROR 05-05 13:28:54 [registry.py:356]   File "/__w/vllm-ascend/vllm-ascend/vllm_ascend/patch/worker/patch_common/__init__.py", line 19, in <module>
ERROR 05-05 13:28:54 [registry.py:356]     import vllm_ascend.patch.worker.patch_common.patch_minicpm  # noqa
ERROR 05-05 13:28:54 [registry.py:356]   File "/__w/vllm-ascend/vllm-ascend/vllm_ascend/patch/worker/patch_common/patch_minicpm.py", line 19, in <module>
ERROR 05-05 13:28:54 [registry.py:356]     from vllm.model_executor.models.minicpm import MiniCPMAttention
ERROR 05-05 13:28:54 [registry.py:356]   File "/__w/vllm-ascend/vllm-ascend/vllm-empty/vllm/model_executor/models/minicpm.py", line 39, in <module>
ERROR 05-05 13:28:54 [registry.py:356]     from vllm.model_executor.layers.fused_moe import fused_moe
ERROR 05-05 13:28:54 [registry.py:356]   File "/__w/vllm-ascend/vllm-ascend/vllm-empty/vllm/model_executor/layers/fused_moe/fused_moe.py", line 9, in <module>
ERROR 05-05 13:28:54 [registry.py:356]     import triton
ERROR 05-05 13:28:54 [registry.py:356] ModuleNotFoundError: No module named 'triton'
ERROR 05-05 13:28:54 [registry.py:356]

@MengqingCao
Copy link
Copy Markdown
Collaborator

MengqingCao commented May 5, 2025

LSTM, Thanks for this fix!

@Yikun Yikun marked this pull request as ready for review May 5, 2025 15:22
@Yikun Yikun merged commit d7e1110 into vllm-project:main May 5, 2025
14 checks passed
@Yikun
Copy link
Copy Markdown
Member Author

Yikun commented May 5, 2025

@MengqingCao @wangxiyuan Thanks, merged to main

Yikun added a commit to Yikun/vllm-ascend that referenced this pull request May 6, 2025
@Yikun
Revert "Re-patch TritonPlaceholder on main to make CI happy (vllm-pro…
60e6a8e 
…ject#753)"

This reverts commit d7e1110.
@Yikun Yikun mentioned this pull request May 6, 2025
Merged
Yikun added a commit to Yikun/vllm-ascend that referenced this pull request May 6, 2025
@Yikun
Revert "Re-patch TritonPlaceholder on main to make CI happy (vllm-pro…
907ae14 
…ject#753)"

This reverts commit d7e1110.

Signed-off-by: Yikun Jiang <yikunkero@gmail.com>
Yikun added a commit that referenced this pull request May 6, 2025
@Yikun
[Core] Cleanup triton patch which has been fixed in vllm (#764)
afe1767 
### What this PR does / why we need it?
- Revert "Re-patch TritonPlaceholder on main to make CI happy (#753)"
because upstream main CI already merged:
vllm-project/vllm#17446
- Keep 0.8.5.post1 compatible

### Does this PR introduce _any_ user-facing change?
No

### How was this patch tested?
CI passed

---------

Signed-off-by: Yikun Jiang <yikunkero@gmail.com>
@yiz-liu yiz-liu mentioned this pull request May 7, 2025
Merged
chopper0126 pushed a commit to chopper0126/vllm-ascend that referenced this pull request Oct 16, 2025
@Yikun
Re-patch TritonPlaceholder on main to make CI happy (vllm-project#753)
03f28a6 
### What this PR does / why we need it?
Re-patch TritonPlaceholder on main to make CI happy
- Add triton patch back until
vllm-project/vllm#17446 resolved
- Move patch_main before patch_common to resolve minicpm triton import
issue
- Add `0.8.5` and `0.8.5.post1` to make patch work on 0.8.5 all versions

Related:
- vllm-project#704
- vllm-project#690

### Does this PR introduce _any_ user-facing change?
No

### How was this patch tested?
All CI passed include main

Signed-off-by: Yikun Jiang <yikunkero@gmail.com>
chopper0126 pushed a commit to chopper0126/vllm-ascend that referenced this pull request Oct 16, 2025
@Yikun
[Core] Cleanup triton patch which has been fixed in vllm (vllm-projec…
2f8723b 
…t#764)

### What this PR does / why we need it?
- Revert "Re-patch TritonPlaceholder on main to make CI happy (vllm-project#753)"
because upstream main CI already merged:
vllm-project/vllm#17446
- Keep 0.8.5.post1 compatible

### Does this PR introduce _any_ user-facing change?
No

### How was this patch tested?
CI passed

---------

Signed-off-by: Yikun Jiang <yikunkero@gmail.com>
Angazenn pushed a commit to Angazenn/vllm-ascend that referenced this pull request Oct 21, 2025
@Yikun @Angazenn
Re-patch TritonPlaceholder on main to make CI happy (vllm-project#753)
979c078 
### What this PR does / why we need it?
Re-patch TritonPlaceholder on main to make CI happy
- Add triton patch back until
vllm-project/vllm#17446 resolved
- Move patch_main before patch_common to resolve minicpm triton import
issue
- Add `0.8.5` and `0.8.5.post1` to make patch work on 0.8.5 all versions

Related:
- vllm-project#704
- vllm-project#690

### Does this PR introduce _any_ user-facing change?
No

### How was this patch tested?
All CI passed include main

Signed-off-by: Yikun Jiang <yikunkero@gmail.com>
Angazenn pushed a commit to Angazenn/vllm-ascend that referenced this pull request Oct 21, 2025
@Yikun @Angazenn
[Core] Cleanup triton patch which has been fixed in vllm (vllm-projec…
75f9edf 
…t#764)

### What this PR does / why we need it?
- Revert "Re-patch TritonPlaceholder on main to make CI happy (vllm-project#753)"
because upstream main CI already merged:
vllm-project/vllm#17446
- Keep 0.8.5.post1 compatible

### Does this PR introduce _any_ user-facing change?
No

### How was this patch tested?
CI passed

---------

Signed-off-by: Yikun Jiang <yikunkero@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@wangxiyuan wangxiyuan wangxiyuan approved these changes

Assignees

No one assigned

Labels

module:core

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@Yikun @MengqingCao @wangxiyuan