[CI] upgrade vllm to 0.8.5

.github/workflows/vllm_ascend_test.yaml

@@ -48,7 +48,7 @@ jobs:
       max-parallel: 2
       matrix:
         os: [linux-arm64-npu-1, linux-arm64-npu-4]
-        vllm_verison: [main, v0.8.4]
+        vllm_verison: [main, v0.8.5]
     concurrency:
       group: >
         ${{ 

Dockerfile

@@ -37,7 +37,7 @@ RUN pip config set global.index-url ${PIP_INDEX_URL}
 
 # Install vLLM
 ARG VLLM_REPO=https://github.com/vllm-project/vllm.git
-ARG VLLM_TAG=v0.8.4
+ARG VLLM_TAG=v0.8.5
 RUN git clone --depth 1 $VLLM_REPO --branch $VLLM_TAG /workspace/vllm
 # In x86, triton will be installed by vllm. But in Ascend, triton doesn't work correctly. we need to uninstall it.
 RUN VLLM_TARGET_DEVICE="empty" python3 -m pip install -v -e /workspace/vllm/ --extra-index https://download.pytorch.org/whl/cpu/ && \

Dockerfile.openEuler

@@ -34,7 +34,7 @@ COPY . /workspace/vllm-ascend/
 
 # Install vLLM
 ARG VLLM_REPO=https://github.com/vllm-project/vllm.git
-ARG VLLM_TAG=v0.8.4
+ARG VLLM_TAG=v0.8.5
 
 RUN git clone --depth 1 $VLLM_REPO --branch $VLLM_TAG /workspace/vllm
 # In x86, triton will be installed by vllm. But in Ascend, triton doesn't work correctly. we need to uninstall it.

vllm_ascend/__init__.py

@@ -23,9 +23,5 @@ def register():
 
 
 def register_model():
-    # TODO: fixme when TritonPlaceholder fixed
-    from vllm_ascend.utils import vllm_version_is
-    if vllm_version_is("0.8.4"):
-        import vllm_ascend.patch.worker.patch_0_8_4.patch_tritonplaceholder  # noqa
     from .models import register_model
     register_model()

vllm_ascend/patch/__init__.py

@@ -24,9 +24,9 @@
 #           each worker's `__init__` function.
 #
 # Then in each kind of patch, there are three folders:
-# - patch_0_8_4: contains the patches applied when vllm version is 0.8.4.
+# - patch_0_8_5: contains the patches applied when vllm version is 0.8.5.
 # - patch_main: contains the patches applied when vllm version is main branch.
-# - patch_common: contains the patches applied in both 0.8.4 and main branch.
+# - patch_common: contains the patches applied in both 0.8.5 and main branch.
 #
 # In the future, with the vllm version upgrade, the new patch folder such as
 # patch_0_8_5, patch_0_8_6, etc. will be added to manage the patch for different
@@ -42,18 +42,6 @@
 # --------------------------------
 # * Platform Patch:
 # =================
-# ** File: platform/patch_0_8_4/patch_config.py**
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#   1. `vllm.config.ModelConfig.__init__()`
-#    Why:
-#       It is hard coded for sleep mode to support cuda platform only
-#    How：
-#       Using a new method to check if sleep mode is available
-#    Related PR (if no, explain why): 1. refused by vllm. 2. vllm doesn't support 3. prepare to submit....
-#       https://github.com/vllm-project/vllm/pull/16562
-#    Future Plan:
-#       This patch is only used for 084 and can't be revert. just keep as it is.
-#
 # ** File: platform/patch_common/patch_distributed.py**
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #   1. `vllm.distributed.parallel_state.destroy_model_parallel()`
@@ -100,33 +88,6 @@
 #
 # * Worker Patch:
 # ===============
-# ** File: worker/patch_0_8_4/patch_metrics.py **
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#   1. `vllm.spec_decode.metrics.AsyncMetricsCollector.init_tensors` and
-#       `vllm.spec_decode.metrics.AsyncMetricsCollector._copy_rejsample_metrics_async`
-#    Why:
-#       There are cuda hard code (torch.cuda.Stream) in `AsyncMetricsCollector.init_tensors` and
-#       `AsyncMetricsCollector._copy_rejsample_metrics_async`
-#    How：
-#       Replace it with the corresponding npu method
-#    Related PR (if no, explain why): 1. refused by vllm. 2. vllm doesn't support 3. prepare to submit....
-#       https://github.com/vllm-project/vllm/pull/14411
-#    Future Plan:
-#       Revert it when the related pr is merged in vllm.
-#
-# ** File: worker/patch_0_8_4/patch_spec_decode_worker.py **
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#   1. `vllm.spec_decode.spec_decode_worker.SpecDecodeWorker._configure_model_sampler_for_spec_decode`
-#    Why:
-#       vLLM `Remove Sampler from Model Code` so vllm-ascend needs a patch to run in v0.8.4.
-#    How：
-#       Use vLLM 0.8.4 method tp patch it.
-#    Related PR (if no, explain why): 1. refused by vllm. 2. vllm doesn't support 3. prepare to submit....
-#       - https://github.com/vllm-project/vllm/pull/17084
-#       - https://github.com/vllm-project/vllm-ascend/pull/636
-#    Future Plan:
-#       Follow v0.8.4 version strategy.
-#
 # ** File: worker/patch_common/patch_metrics.py **
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #   1. `vllm.spec_decode.metrics.AsyncMetricsCollector.maybe_collect_rejsample_metrics`
@@ -197,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_0_8_4/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): 1. refused by vllm. 2. vllm doesn't support 3. prepare to submit....
-#       TritonPlaceholder is only available in vllm>0.8.4
-#    Future Plan:
-#       Revert it when branch main doesn't maintain v0.8.4.
+#

vllm_ascend/patch/platform/__init__.py

@@ -17,8 +17,8 @@
 from vllm_ascend.utils import vllm_version_is
 
 # Import specific patches for different versions
-if vllm_version_is("0.8.4"):
-    from vllm_ascend.patch.platform import patch_0_8_4  # noqa: F401
+if vllm_version_is("0.8.5"):
+    from vllm_ascend.patch.platform import patch_0_8_5  # noqa: F401
     from vllm_ascend.patch.platform import patch_common  # noqa: F401
 else:
     from vllm_ascend.patch.platform import patch_common  # noqa: F401

vllm_ascend/patch/platform/patch_0_8_4/__init__.py → vllm_ascend/patch/platform/patch_0_8_5/__init__.py

@@ -14,5 +14,3 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-
-import vllm_ascend.patch.platform.patch_0_8_4.patch_config  # noqa

vllm_ascend/patch/worker/__init__.py

@@ -18,8 +18,8 @@
 from vllm_ascend.utils import vllm_version_is
 
 # Import specific patches for different versions
-if vllm_version_is("0.8.4"):
-    from vllm_ascend.patch.worker import patch_0_8_4  # noqa: F401
+if vllm_version_is("0.8.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_common  # noqa: F401