Skip to content

Commit afe1767

Browse files
authored
[Core] Cleanup triton patch which has been fixed in vllm (#764)
### 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>
1 parent b0dbe5f commit afe1767

File tree

5 files changed

+3
-90
lines changed

5 files changed

+3
-90
lines changed

vllm_ascend/__init__.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,5 @@ def register():
2323

2424

2525
def register_model():
26-
# TODO: fixme when TritonPlaceholder fixed
27-
from vllm_ascend.utils import vllm_version_is
28-
if not (vllm_version_is("0.8.5") or vllm_version_is("0.8.5.post1")):
29-
import vllm_ascend.patch.worker.patch_main.patch_tritonplaceholder # noqa
3026
from .models import register_model
3127
register_model()

vllm_ascend/patch/__init__.py

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -158,15 +158,4 @@
158158
# - https://github.com/vllm-project/vllm-ascend/pull/395
159159
# Future Plan:
160160
# Revert it when the related pr is merged in vllm and vllm-ascend.
161-
#
162-
# ** File: worker/patch_main/patch_tritonplaceholder.py **
163-
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
164-
# 1. `triton` Module
165-
# Why:
166-
# Triton is not supported on npu currently, importing triton will break vllm-ascend
167-
# How:
168-
# ditto
169-
# Related PR (if no, explain why): vllm haven't support yet
170-
# TritonPlaceholder is only available in vllm>0.8.5.post1
171-
# Future Plan:
172-
# https://github.com/vllm-project/vllm/pull/17446
161+
#

vllm_ascend/patch/worker/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@
2222
from vllm_ascend.patch.worker import patch_0_8_5 # noqa: F401
2323
from vllm_ascend.patch.worker import patch_common # noqa: F401
2424
else:
25-
from vllm_ascend.patch.worker import patch_main # noqa: F401 # isort:skip
2625
from vllm_ascend.patch.worker import patch_common # noqa: F401
26+
from vllm_ascend.patch.worker import patch_main # noqa: F401

vllm_ascend/patch/worker/patch_main/__init__.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,4 @@
1313
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1414
# See the License for the specific language governing permissions and
1515
# limitations under the License.
16-
#
17-
import vllm_ascend.patch.worker.patch_main.patch_tritonplaceholder # noqa
16+
#

vllm_ascend/patch/worker/patch_main/patch_tritonplaceholder.py

Lines changed: 0 additions & 71 deletions
This file was deleted.

0 commit comments

Comments
 (0)