Get up and running with Kimi, GLM, MiniMax, DeepSeek, gpt-oss, Qwen, Gemma and other models.
Split rocm back out of bundle (#6432)
Daniel Hiltgena017cf2fea4a
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yamlindex 2cf4d2c2a..9c1e3e138 100644--- a/.github/workflows/release.yaml+++ b/.github/workflows/release.yaml@@ -475,6 +475,7 @@ jobs:(cd dist; find . -type f | xargs sha256sum > ../sha256sum.txt)mv sha256sum.txt dist/mv dist/linux-???64 .+ mv dist/linux-amd64-rocm .cat dist/sha256sum.txt- name: Create or update Releaserun: |diff --git a/Dockerfile b/Dockerfileindex d4b869180..c46477b49 100644--- a/Dockerfile+++ b/Dockerfile@@ -95,8 +95,8 @@ ARG AMDGPU_TARGETSENV GOARCH amd64RUN --mount=type=cache,target=/root/.ccache \OLLAMA_SKIP_STATIC_GENERATE=1 OLLAMA_SKIP_CPU_GENERATE=1 bash gen_linux.sh-RUN mkdir -p ../../dist/linux-amd64/lib/ollama && \- (cd /opt/rocm/lib && tar cf - rocblas/library) | (cd ../../dist/linux-amd64/lib/ollama && tar xf - )+RUN mkdir -p ../../dist/linux-amd64-rocm/lib/ollama && \+ (cd /opt/rocm/lib && tar cf - rocblas/library) | (cd ../../dist/linux-amd64-rocm/lib/ollama && tar xf - )FROM --platform=linux/amd64 centos:7 AS cpu-builder-amd64ARG CMAKE_VERSIONdiff --git a/llm/generate/gen_linux.sh b/llm/generate/gen_linux.shindex aef03f9a5..6927dda8b 100755--- a/llm/generate/gen_linux.sh+++ b/llm/generate/gen_linux.sh@@ -260,7 +260,8 @@ if [ -z "${OLLAMA_SKIP_ROCM_GENERATE}" -a -d "${ROCM_PATH}" ]; thenecho "Building custom ROCM GPU"fiBUILD_DIR="../build/linux/${ARCH}/rocm${ROCM_VARIANT}"- ROCM_DIST_DIR="${DIST_BASE}/lib/ollama"+ # ROCm dependencies are too large to fit into a unified bundle+ ROCM_DIST_DIR="${DIST_BASE}/../linux-${GOARCH}-rocm/lib/ollama"# TODO figure out how to disable runpath (rpath)# export CMAKE_HIP_FLAGS="-fno-rtlib-add-rpath" # doesn't workexport LLAMA_SERVER_LDFLAGS="-L${ROCM_PATH}/lib -L/opt/amdgpu/lib/x86_64-linux-gnu/ -lhipblas -lrocblas -lamdhip64 -lrocsolver -lamd_comgr -lhsa-runtime64 -lrocsparse -ldrm -ldrm_amdgpu"diff --git a/scripts/build_linux.sh b/scripts/build_linux.shindex adda2ad75..6cb0d0cd0 100755--- a/scripts/build_linux.sh+++ b/scripts/build_linux.sh@@ -24,8 +24,14 @@ for TARGETARCH in ${BUILD_ARCH}; dodocker create --platform linux/$TARGETARCH --name builder-$TARGETARCH builder:$TARGETARCHrm -rf ./dist/linux-$TARGETARCHdocker cp builder-$TARGETARCH:/go/src/github.com/ollama/ollama/dist/linux-$TARGETARCH ./dist+ if echo ${TARGETARCH} | grep "amd64" > /dev/null; then+ docker cp builder-$TARGETARCH:/go/src/github.com/ollama/ollama/dist/linux-$TARGETARCH-rocm ./dist+ fidocker rm builder-$TARGETARCHecho "Compressing final linux bundle..."rm -f ./dist/ollama-linux-$TARGETARCH.tgz(cd dist/linux-$TARGETARCH && tar cf - . | ${GZIP} --best > ../ollama-linux-$TARGETARCH.tgz )+ if [ -d dist/linux-$TARGETARCH-rocm ]; then+ (cd dist/linux-$TARGETARCH-rocm && tar cf - . | ${GZIP} --best > ../ollama-linux-$TARGETARCH-rocm.tgz )+ fidonediff --git a/scripts/install.sh b/scripts/install.shindex a02a0675d..25f57565a 100644--- a/scripts/install.sh+++ b/scripts/install.sh@@ -199,6 +199,11 @@ fiif check_gpu lspci amdgpu || check_gpu lshw amdgpu; thenif [ $BUNDLE -ne 0 ]; then+ status "Downloading Linux ROCm ${ARCH} bundle"+ curl --fail --show-error --location --progress-bar \+ "https://ollama.com/download/ollama-linux-${ARCH}-rocm.tgz${VER_PARAM}" | \+ $SUDO tar -xzf - -C "$OLLAMA_INSTALL_DIR"+install_successstatus "AMD GPU ready."exit 0