x

docker/Dockerfile

@@ -281,10 +281,10 @@ RUN set -ex && \
     ${VENV}/bin/pip install --no-cache-dir regex && \
     ${VENV}/bin/python /opt/patch_vllm_platform.py && \
     ${VENV}/bin/python -c "import torch; v=torch.__version__; assert 'rocm' in v, f'PyTorch overwritten: {v}'; print('PyTorch OK:', v)" && \
+    ${VENV}/bin/pip uninstall -y triton triton-rocm 2>/dev/null; \
     ${VENV}/bin/pip install --no-cache-dir --force-reinstall \
         torch==2.11.0+rocm7.2 torchvision pytorch-triton-rocm \
         --index-url ${TORCH_INDEX} && \
-    ${VENV}/bin/pip uninstall -y triton triton-rocm 2>/dev/null; \
     ${VENV}/bin/python -c "import vllm; print('vllm import OK:', vllm.__version__)" && \
     rm -rf /opt/vllm_build
 
@@ -294,12 +294,14 @@ RUN set -ex && \
 RUN set -ex && \
     ${VENV}/bin/pip install --no-cache-dir 'mineru[core]' && \
     ${VENV}/bin/python /opt/apply_mineru_patches.py && \
-    # mineru[core] 会把 ROCm PyTorch 替换成 CUDA 版，按教程顺序恢复
+    # mineru[core] 会把 ROCm PyTorch 替换成 CUDA 版 + 安装 CUDA triton
+    # 必须先卸载 CUDA triton，再装回 ROCm 版
+    ${VENV}/bin/pip uninstall -y triton triton-rocm 2>/dev/null; \
     export http_proxy=${GIT_PROXY} https_proxy=${GIT_PROXY} && \
     ${VENV}/bin/pip install --no-cache-dir --force-reinstall \
         torch==2.11.0+rocm7.2 torchvision pytorch-triton-rocm \
         --index-url ${TORCH_INDEX} && \
-    ${VENV}/bin/pip uninstall -y triton triton-rocm 2>/dev/null; \
+    ${VENV}/bin/python -c "import triton.language; print('triton OK')" && \
     ${VENV}/bin/python -c "import torch; v=torch.__version__; assert 'rocm' in v, f'PyTorch overwritten: {v}'; print('PyTorch OK:', v)"
 
 # ===========================================================================