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
4 changes: 0 additions & 4 deletions vllm_ascend/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,5 @@ def register():


def register_model():
# TODO: fixme when TritonPlaceholder fixed
from vllm_ascend.utils import vllm_version_is
if not (vllm_version_is("0.8.5") or vllm_version_is("0.8.5.post1")):
import vllm_ascend.patch.worker.patch_main.patch_tritonplaceholder # noqa
from .models import register_model
register_model()
13 changes: 1 addition & 12 deletions vllm_ascend/patch/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -158,15 +158,4 @@
# - https://github.com/vllm-project/vllm-ascend/pull/395
# Future Plan:
# Revert it when the related pr is merged in vllm and vllm-ascend.
#
# ** File: worker/patch_main/patch_tritonplaceholder.py **
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# 1. `triton` Module
# Why:
# Triton is not supported on npu currently, importing triton will break vllm-ascend
# How:
# ditto
# Related PR (if no, explain why): vllm haven't support yet
# TritonPlaceholder is only available in vllm>0.8.5.post1
# Future Plan:
# https://github.com/vllm-project/vllm/pull/17446
#
2 changes: 1 addition & 1 deletion vllm_ascend/patch/worker/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@
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
from vllm_ascend.patch.worker import patch_common # noqa: F401
from vllm_ascend.patch.worker import patch_main # noqa: F401
3 changes: 1 addition & 2 deletions vllm_ascend/patch/worker/patch_main/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,4 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
import vllm_ascend.patch.worker.patch_main.patch_tritonplaceholder # noqa
#
71 changes: 0 additions & 71 deletions vllm_ascend/patch/worker/patch_main/patch_tritonplaceholder.py

This file was deleted.