Enable RPC builds and merge PR 15405 across Dockerfiles
This commit is contained in:
@@ -14,13 +14,18 @@ RUN git clone --recursive https://github.com/ggerganov/llama.cpp.git .
|
||||
|
||||
# build + install
|
||||
RUN git clean -xdf \
|
||||
&& git config user.email "builder@localhost" \
|
||||
&& git config user.name "Container Builder" \
|
||||
&& git pull \
|
||||
&& git fetch origin pull/15405/head:pr-15405 \
|
||||
&& git merge --no-edit pr-15405 \
|
||||
&& git submodule update --recursive \
|
||||
&& HIPCXX="$(hipconfig -l)/clang" HIP_PATH="$(hipconfig -R)" \
|
||||
cmake -S . -B build \
|
||||
-DGGML_HIP=ON \
|
||||
-DAMDGPU_TARGETS=gfx1151 \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DGGML_RPC=ON \
|
||||
-DLLAMA_HIP_UMA=ON \
|
||||
&& cmake --build build --config Release -- -j$(nproc) \
|
||||
&& cmake --install build --config Release
|
||||
|
||||
@@ -20,13 +20,18 @@ RUN git clone --recursive https://github.com/ggerganov/llama.cpp.git .
|
||||
|
||||
# build + install
|
||||
RUN git clean -xdf \
|
||||
&& git config user.email "builder@localhost" \
|
||||
&& git config user.name "Container Builder" \
|
||||
&& git pull \
|
||||
&& git fetch origin pull/15405/head:pr-15405 \
|
||||
&& git merge --no-edit pr-15405 \
|
||||
&& git submodule update --recursive \
|
||||
&& HIPCXX="$(hipconfig -l)/clang" HIP_PATH="$(hipconfig -R)" \
|
||||
cmake -S . -B build \
|
||||
-DGGML_HIP=ON \
|
||||
-DAMDGPU_TARGETS=gfx1151 \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DGGML_RPC=ON \
|
||||
-DLLAMA_HIP_UMA=ON \
|
||||
-DGGML_HIP_ROCWMMA_FATTN=ON \
|
||||
&& cmake --build build --config Release -- -j$(nproc) \
|
||||
|
||||
@@ -38,12 +38,17 @@ RUN git clone --recursive https://github.com/ggerganov/llama.cpp.git .
|
||||
|
||||
# build
|
||||
RUN git clean -xdf \
|
||||
&& git config user.email "builder@localhost" \
|
||||
&& git config user.name "Container Builder" \
|
||||
&& git pull \
|
||||
&& git fetch origin pull/15405/head:pr-15405 \
|
||||
&& git merge --no-edit pr-15405 \
|
||||
&& git submodule update --recursive \
|
||||
&& cmake -S . -B build \
|
||||
-DGGML_HIP=ON \
|
||||
-DAMDGPU_TARGETS=gfx1151 \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DGGML_RPC=ON \
|
||||
-DLLAMA_HIP_UMA=ON \
|
||||
-DROCM_PATH=/opt/rocm \
|
||||
-DHIP_PATH=/opt/rocm \
|
||||
|
||||
@@ -44,12 +44,17 @@ RUN git clone --recursive https://github.com/ggerganov/llama.cpp.git .
|
||||
|
||||
# build
|
||||
RUN git clean -xdf \
|
||||
&& git config user.email "builder@localhost" \
|
||||
&& git config user.name "Container Builder" \
|
||||
&& git pull \
|
||||
&& git fetch origin pull/15405/head:pr-15405 \
|
||||
&& git merge --no-edit pr-15405 \
|
||||
&& git submodule update --recursive \
|
||||
&& cmake -S . -B build \
|
||||
-DGGML_HIP=ON \
|
||||
-DAMDGPU_TARGETS=gfx1151 \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DGGML_RPC=ON \
|
||||
-DLLAMA_HIP_UMA=ON \
|
||||
-DGGML_HIP_ROCWMMA_FATTN=ON \
|
||||
-DROCM_PATH=/opt/rocm \
|
||||
|
||||
@@ -38,12 +38,17 @@ RUN git clone --recursive https://github.com/ggerganov/llama.cpp.git .
|
||||
|
||||
# build
|
||||
RUN git clean -xdf \
|
||||
&& git config user.email "builder@localhost" \
|
||||
&& git config user.name "Container Builder" \
|
||||
&& git pull \
|
||||
&& git fetch origin pull/15405/head:pr-15405 \
|
||||
&& git merge --no-edit pr-15405 \
|
||||
&& git submodule update --recursive \
|
||||
&& cmake -S . -B build \
|
||||
-DGGML_HIP=ON \
|
||||
-DAMDGPU_TARGETS=gfx1151 \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DGGML_RPC=ON \
|
||||
-DLLAMA_HIP_UMA=ON \
|
||||
-DROCM_PATH=/opt/rocm \
|
||||
-DHIP_PATH=/opt/rocm \
|
||||
|
||||
@@ -41,6 +41,14 @@ RUN chmod +x build-rocwmma.sh && ./build-rocwmma.sh
|
||||
WORKDIR /opt/llama.cpp
|
||||
RUN git clone --recursive https://github.com/ggerganov/llama.cpp.git .
|
||||
|
||||
RUN git clean -xdf \
|
||||
&& git config user.email "builder@localhost" \
|
||||
&& git config user.name "Container Builder" \
|
||||
&& git pull \
|
||||
&& git fetch origin pull/15405/head:pr-15405 \
|
||||
&& git merge --no-edit pr-15405 \
|
||||
&& git submodule update --recursive
|
||||
|
||||
# overwrite upstream header with our local fixed version
|
||||
COPY ggml/src/ggml-cuda/hip_shfl_fix.h /opt/llama.cpp/ggml/src/ggml-cuda/hip_shfl_fix.h
|
||||
|
||||
@@ -54,6 +62,7 @@ RUN set -euo pipefail \
|
||||
-DGGML_HIP=ON \
|
||||
-DAMDGPU_TARGETS=gfx1151 \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DGGML_RPC=ON \
|
||||
-DLLAMA_HIP_UMA=ON \
|
||||
-DGGML_HIP_ROCWMMA_FATTN=ON \
|
||||
-DROCM_PATH=/opt/rocm \
|
||||
@@ -120,4 +129,3 @@ RUN printf '%s\n' \
|
||||
|
||||
# shell
|
||||
CMD ["/bin/bash"]
|
||||
|
||||
|
||||
@@ -38,12 +38,17 @@ RUN git clone --recursive https://github.com/ggerganov/llama.cpp.git .
|
||||
|
||||
# build
|
||||
RUN git clean -xdf \
|
||||
&& git config user.email "builder@localhost" \
|
||||
&& git config user.name "Container Builder" \
|
||||
&& git pull \
|
||||
&& git fetch origin pull/15405/head:pr-15405 \
|
||||
&& git merge --no-edit pr-15405 \
|
||||
&& git submodule update --recursive \
|
||||
&& cmake -S . -B build \
|
||||
-DGGML_HIP=ON \
|
||||
-DAMDGPU_TARGETS=gfx1151 \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DGGML_RPC=ON \
|
||||
-DLLAMA_HIP_UMA=ON \
|
||||
-DGGML_CUDA_ENABLE_UNIFIED_MEMORY=ON \
|
||||
-DROCM_PATH=/opt/rocm \
|
||||
|
||||
@@ -47,12 +47,17 @@ RUN chmod +x /opt/apply-rocwmma-fix.sh && /opt/apply-rocwmma-fix.sh /opt/llama.c
|
||||
|
||||
# build
|
||||
RUN git clean -xdf \
|
||||
&& git config user.email "builder@localhost" \
|
||||
&& git config user.name "Container Builder" \
|
||||
&& git pull \
|
||||
&& git fetch origin pull/15405/head:pr-15405 \
|
||||
&& git merge --no-edit pr-15405 \
|
||||
&& git submodule update --recursive \
|
||||
&& cmake -S . -B build \
|
||||
-DGGML_HIP=ON \
|
||||
-DAMDGPU_TARGETS=gfx1151 \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DGGML_RPC=ON \
|
||||
-DLLAMA_HIP_UMA=ON \
|
||||
-DGGML_CUDA_ENABLE_UNIFIED_MEMORY=ON \
|
||||
-DGGML_HIP_ROCWMMA_FATTN=ON \
|
||||
|
||||
@@ -56,12 +56,17 @@ RUN printf '%s\n' \
|
||||
WORKDIR /opt/llama.cpp
|
||||
RUN git clone --recursive https://github.com/ggerganov/llama.cpp.git . \
|
||||
&& git clean -xdf \
|
||||
&& git config user.email "builder@localhost" \
|
||||
&& git config user.name "Container Builder" \
|
||||
&& git fetch origin pull/15405/head:pr-15405 \
|
||||
&& git merge --no-edit pr-15405 \
|
||||
&& git submodule update --recursive
|
||||
|
||||
RUN cmake -S . -B build \
|
||||
-DGGML_HIP=ON \
|
||||
-DAMDGPU_TARGETS=gfx1151 \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DGGML_RPC=ON \
|
||||
-DLLAMA_HIP_UMA=ON \
|
||||
&& cmake --build build --config Release -- -j$(nproc) \
|
||||
&& cmake --install build --config Release
|
||||
|
||||
@@ -60,6 +60,10 @@ RUN chmod +x build-rocwmma.sh && ./build-rocwmma.sh
|
||||
WORKDIR /opt/llama.cpp
|
||||
RUN git clone --recursive https://github.com/ggerganov/llama.cpp.git . \
|
||||
&& git clean -xdf \
|
||||
&& git config user.email "builder@localhost" \
|
||||
&& git config user.name "Container Builder" \
|
||||
&& git fetch origin pull/15405/head:pr-15405 \
|
||||
&& git merge --no-edit pr-15405 \
|
||||
&& git submodule update --recursive
|
||||
COPY ./apply-rocwmma-fix.sh /opt/apply-rocwmma-fix.sh
|
||||
RUN chmod +x /opt/apply-rocwmma-fix.sh && /opt/apply-rocwmma-fix.sh /opt/llama.cpp
|
||||
|
||||
@@ -60,6 +60,10 @@ RUN chmod +x build-rocwmma.sh && ./build-rocwmma.sh
|
||||
WORKDIR /opt/llama.cpp
|
||||
RUN git clone --recursive https://github.com/hjc4869/llama.cpp.git . \
|
||||
&& git clean -xdf \
|
||||
&& git config user.email "builder@localhost" \
|
||||
&& git config user.name "Container Builder" \
|
||||
&& git fetch origin pull/15405/head:pr-15405 \
|
||||
&& git merge --no-edit pr-15405 \
|
||||
&& git submodule update --recursive
|
||||
COPY ./apply-rocwmma-fix.sh /opt/apply-rocwmma-fix.sh
|
||||
RUN chmod +x /opt/apply-rocwmma-fix.sh && /opt/apply-rocwmma-fix.sh /opt/llama.cpp
|
||||
|
||||
@@ -37,13 +37,18 @@ RUN git clone --recursive https://github.com/ggerganov/llama.cpp.git .
|
||||
|
||||
# build
|
||||
RUN git clean -xdf \
|
||||
&& git config user.email "builder@localhost" \
|
||||
&& git config user.name "Container Builder" \
|
||||
&& git pull \
|
||||
&& git fetch origin pull/15405/head:pr-15405 \
|
||||
&& git merge --no-edit pr-15405 \
|
||||
&& git submodule update --recursive \
|
||||
&& HIPCXX="$(hipconfig -l)/clang" HIP_PATH="$(hipconfig -R)" \
|
||||
cmake -S . -B build \
|
||||
-DGGML_HIP=ON \
|
||||
-DAMDGPU_TARGETS=gfx1151 \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DGGML_RPC=ON \
|
||||
-DLLAMA_HIP_UMA=ON \
|
||||
&& cmake --build build --config Release -- -j$(nproc) \
|
||||
&& cmake --install build --config Release
|
||||
|
||||
@@ -55,12 +55,17 @@ RUN printf '%s\n' \
|
||||
WORKDIR /opt/llama.cpp
|
||||
RUN git clone --recursive https://github.com/ggerganov/llama.cpp.git . \
|
||||
&& git clean -xdf \
|
||||
&& git config user.email "builder@localhost" \
|
||||
&& git config user.name "Container Builder" \
|
||||
&& git fetch origin pull/15405/head:pr-15405 \
|
||||
&& git merge --no-edit pr-15405 \
|
||||
&& git submodule update --recursive
|
||||
|
||||
RUN cmake -S . -B build \
|
||||
-DGGML_HIP=ON \
|
||||
-DAMDGPU_TARGETS=gfx1151 \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DGGML_RPC=ON \
|
||||
-DLLAMA_HIP_UMA=ON \
|
||||
&& cmake --build build --config Release -- -j$(nproc) \
|
||||
&& cmake --install build --config Release
|
||||
|
||||
@@ -21,11 +21,16 @@ RUN git clone --recursive https://github.com/ggerganov/llama.cpp.git .
|
||||
|
||||
# build
|
||||
RUN git clean -xdf \
|
||||
&& git config user.email "builder@localhost" \
|
||||
&& git config user.name "Container Builder" \
|
||||
&& git pull \
|
||||
&& git fetch origin pull/15405/head:pr-15405 \
|
||||
&& git merge --no-edit pr-15405 \
|
||||
&& git submodule update --recursive \
|
||||
&& cmake -S . -B build -G Ninja \
|
||||
-DGGML_VULKAN=ON \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DGGML_RPC=ON \
|
||||
-DCMAKE_INSTALL_PREFIX=/usr \
|
||||
-DLLAMA_BUILD_TESTS=OFF \
|
||||
-DLLAMA_BUILD_EXAMPLES=ON \
|
||||
|
||||
@@ -15,11 +15,16 @@ RUN git clone --recursive https://github.com/ggerganov/llama.cpp.git .
|
||||
|
||||
# build
|
||||
RUN git clean -xdf \
|
||||
&& git config user.email "builder@localhost" \
|
||||
&& git config user.name "Container Builder" \
|
||||
&& git pull \
|
||||
&& git fetch origin pull/15405/head:pr-15405 \
|
||||
&& git merge --no-edit pr-15405 \
|
||||
&& git submodule update --recursive \
|
||||
&& cmake -S . -B build -G Ninja \
|
||||
-DGGML_VULKAN=ON \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DGGML_RPC=ON \
|
||||
-DCMAKE_INSTALL_PREFIX=/usr \
|
||||
-DLLAMA_BUILD_TESTS=OFF \
|
||||
-DLLAMA_BUILD_EXAMPLES=ON \
|
||||
|
||||
Reference in New Issue
Block a user