Frank
124175218f
The llama.cpp hunk (ggml_cuda_node_launches_nothing) was needed on main's tree; the branch restructured that file and compiles clean, so only the apt-list and cmake-3.31 hunks remain. Regenerated from the host clone.
41 lines
1.3 KiB
Diff
41 lines
1.3 KiB
Diff
diff --git a/Dockerfile.rocm b/Dockerfile.rocm
|
|
index 4ea7a1d7..0e22355b 100644
|
|
--- a/Dockerfile.rocm
|
|
+++ b/Dockerfile.rocm
|
|
@@ -59,18 +59,17 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
|
|
curl \
|
|
git \
|
|
git-lfs \
|
|
- hipblas-dev \
|
|
- hipblaslt-dev \
|
|
- hipcub-dev \
|
|
libcurl4-openssl-dev \
|
|
ninja-build \
|
|
pkg-config \
|
|
python3 \
|
|
- rocblas-dev \
|
|
- rocprim-dev \
|
|
- rocwmma-dev \
|
|
&& rm -rf /var/lib/apt/lists/*
|
|
|
|
+# Ubuntu jammy ships cmake 3.22, which predates the block command that
|
|
+# ROCm 7.14 hipblaslt-config.cmake requires (CMake >= 3.25). Install the
|
|
+# official 3.31 binary; /usr/local/bin precedes /usr/bin on PATH.
|
|
+RUN curl -fsSL https://github.com/Kitware/CMake/releases/download/v3.31.6/cmake-3.31.6-linux-x86_64.tar.gz | tar -xz -C /usr/local --strip-components=1
|
|
+
|
|
WORKDIR /src
|
|
|
|
# COPY ordering mirrors the CUDA Dockerfile: C++ build inputs first so the
|
|
@@ -152,11 +151,8 @@ ENV PATH=/opt/rocm/bin:${PATH}
|
|
RUN apt-get update && apt-get install -y --no-install-recommends \
|
|
ca-certificates \
|
|
curl \
|
|
- hipblas \
|
|
- hipblaslt \
|
|
libgomp1 \
|
|
pciutils \
|
|
- rocblas \
|
|
&& rm -rf /var/lib/apt/lists/*
|
|
|
|
# uv (pinned) manages Python 3.12 + resolves the luce + pflash
|