From 3c085567b8e7b1e1457b5aeeb1879d2e82b0095e Mon Sep 17 00:00:00 2001
From: SZCJW <792430652@qq.com>
Date: Sun, 7 Jun 2026 13:23:39 +0800
Subject: [PATCH] x

---
 docker/Dockerfile | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index aafbcb7..fdfb009 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -190,10 +190,6 @@ RUN set -ex && \
     printf 'set(amd_comgr_FOUND TRUE)\nset(amd_comgr_VERSION "2.8.0")\nif(NOT TARGET amd_comgr)\n  add_library(amd_comgr INTERFACE IMPORTED)\n  set_target_properties(amd_comgr PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "/opt/rocm/include")\nendif()\n' \
         > /opt/rocm/lib/cmake/amd_comgr/amd_comgr-config.cmake && \
     echo "amd_comgr-config.cmake created (minimal)." && \
-    # 诊断：打印 LoadHIP.cmake 第 179 行附近内容
-    echo "=== LoadHIP.cmake line 170-190 ===" && \
-    sed -n '170,190p' ${VENV}/lib/python${PYTHON_VER}/site-packages/torch/share/cmake/Caffe2/public/LoadHIP.cmake && \
-    echo "=== end ===" && \
     # 创建 HIP cmake config（apt 安装的 hip-dev 缺少 find_package 需要的配置）
     mkdir -p /opt/rocm/lib/cmake/hip && \
     printf 'set(HIP_FOUND TRUE)\nset(HIP_VERSION "7.2.1")\nset(HIP_PLATFORM amd)\nset(HIP_COMPILER /opt/rocm/llvm/bin/clang++)\nset(HIP_RUNTIME rocm)\nset(HIP_INCLUDE_DIRS /opt/rocm/include)\nset(HIP_LIBRARIES /opt/rocm/lib/libamdhip64.so)\nif(NOT TARGET hip::host)\n  add_library(hip::host INTERFACE IMPORTED)\n  set_target_properties(hip::host PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${HIP_INCLUDE_DIRS}")\nendif()\nif(NOT TARGET hip::device)\n  add_library(hip::device INTERFACE IMPORTED)\n  set_target_properties(hip::device PROPERTIES INTERFACE_COMPILE_OPTIONS "${HIP_COMPILER}")\nendif()\n' \
@@ -207,6 +203,7 @@ RUN set -ex && \
     fi && \
     mkdir -p /opt/vllm_build && \
     export HIP_PLATFORM=amd HIP_PATH=/opt/rocm ROCM_PATH=/opt/rocm && \
+    CMAKE_EC=0; \
     cmake -S /opt/vllm -B /opt/vllm_build -G Ninja \
         -DCMAKE_BUILD_TYPE=RelWithDebInfo \
         -DVLLM_TARGET_DEVICE=rocm \
@@ -218,7 +215,16 @@ RUN set -ex && \
         -DHIP_COMPILER=/opt/rocm/llvm/bin/clang++ \
         -DHIP_PATH=/opt/rocm \
         -DHIP_INCLUDE_DIR=/opt/rocm/include \
-        -DCMAKE_PREFIX_PATH="/opt/rocm;${VENV}/lib/python${PYTHON_VER}/site-packages/torch/share/cmake" && \
+        -DCMAKE_PREFIX_PATH="/opt/rocm;${VENV}/lib/python${PYTHON_VER}/site-packages/torch/share/cmake" \
+        >/tmp/cmake.log 2>&1 || CMAKE_EC=$?; \
+    cat /tmp/cmake.log; \
+    if [ $CMAKE_EC -ne 0 ]; then \
+        echo ""; \
+        echo "========== CMake FAILED (exit=$CMAKE_EC) =========="; \
+        echo "=== grep CMake Error / fatal ==="; \
+        grep -i 'cmake error\|CMake Error\|fatal' /tmp/cmake.log || true; \
+        exit $CMAKE_EC; \
+    fi && \
     cd /opt/vllm_build && ninja -j8 && \
     cp /opt/vllm_build/*.abi3.so /opt/vllm/vllm/ && \
     echo "vllm C++ build complete (layer cached)."