Merge branch 'master' into release/1.37

This commit is contained in:
Jintao Huang
2026-05-15 14:09:10 +08:00
2 changed files with 6 additions and 3 deletions

View File

@@ -28,8 +28,8 @@ RUN pip config set global.index-url https://mirrors.aliyun.com/pypi/simple && \
# ---------- Install vllm + vllm-ascend ----------
RUN source /usr/local/Ascend/ascend-toolkit/set_env.sh && \
if [ -f /usr/local/Ascend/nnal/atb/set_env.sh ]; then source /usr/local/Ascend/nnal/atb/set_env.sh; fi && \
git clone --depth 1 --branch v0.14.0 https://github.com/vllm-project/vllm && \
git clone --depth 1 --branch v0.14.0rc1 https://github.com/vllm-project/vllm-ascend.git
git clone --depth 1 --branch v0.18.0 https://github.com/vllm-project/vllm && \
git clone --depth 1 --branch v0.18.0 https://github.com/vllm-project/vllm-ascend.git
RUN ARCH=$(uname -m) && \
source /usr/local/Ascend/ascend-toolkit/set_env.sh && \

View File

@@ -245,7 +245,10 @@ def pipeline(task: str = None,
if preprocessor is not None:
cfg.preprocessor = preprocessor
return build_pipeline(cfg, task_name=task)
return build_pipeline(
cfg,
task_name=task,
default_args={'trust_remote_code': trust_remote_code})
def add_default_pipeline_info(task: str,