Compare commits
1 Commits
3c92d93366
...
feat/7zz-c
| Author | SHA1 | Date | |
|---|---|---|---|
| 9d2404d8f6 |
@@ -112,7 +112,22 @@ services:
|
|||||||
- /mnt/HoardingCow_docker_data/Ollama/ollama:/root/.ollama
|
- /mnt/HoardingCow_docker_data/Ollama/ollama:/root/.ollama
|
||||||
environment:
|
environment:
|
||||||
- OLLAMA_VULKAN=0
|
- OLLAMA_VULKAN=0
|
||||||
|
- HSA_OVERRIDE_GFX_VERSION=9.0.6
|
||||||
|
- HCC_AMDGPU_TARGET=gfx906
|
||||||
|
- HIP_VISIBLE_DEVICES=0,1
|
||||||
|
- ROCR_VISIBLE_DEVICES=0,1
|
||||||
|
- HSA_ENABLE_SDMA=0
|
||||||
- OLLAMA_HOST=0.0.0.0
|
- OLLAMA_HOST=0.0.0.0
|
||||||
|
- OLLAMA_DEBUG=1
|
||||||
|
- OLLAMA_FLASH_ATTENTION=1
|
||||||
|
- OLLAMA_NUM_PARALLEL=2
|
||||||
|
devices:
|
||||||
|
# Map the render nodes and KFD for ROCm to work inside the container
|
||||||
|
- /dev/kfd:/dev/kfd
|
||||||
|
- /dev/dri:/dev/dri
|
||||||
|
group_add:
|
||||||
|
- "303"
|
||||||
|
- "26"
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
ai_net:
|
ai_net:
|
||||||
@@ -122,40 +137,47 @@ networks:
|
|||||||
driver: bridge
|
driver: bridge
|
||||||
name: ai_backend
|
name: ai_backend
|
||||||
|
|
||||||
llama-cpp-hermes:
|
# llama_cpp_devstral:
|
||||||
image: llama-cpp:rocm-gfx906
|
# image: ghcr.io/ggml-org/llama.cpp:server-rocm
|
||||||
container_name: llama-cpp-hermes
|
# container_name: llama_cpp_devstral
|
||||||
restart: unless-stopped
|
# restart: unless-stopped
|
||||||
networks:
|
# networks:
|
||||||
- ai_backend
|
# - ai_backend
|
||||||
ports:
|
# ports:
|
||||||
- "127.0.0.1:8300:8080"
|
# - "8300:8080"
|
||||||
ipc: host
|
# ipc: host
|
||||||
devices:
|
# devices:
|
||||||
- /dev/kfd:/dev/kfd
|
# - "/dev/kfd:/dev/kfd"
|
||||||
- /dev/dri:/dev/dri
|
# - "/dev/dri:/dev/dri"
|
||||||
group_add:
|
# group_add:
|
||||||
- "303"
|
# - "303" # video
|
||||||
- "26"
|
# - "26" # render
|
||||||
environment:
|
# environment:
|
||||||
- HSA_OVERRIDE_GFX_VERSION=9.0.6
|
# HSA_OVERRIDE_GFX_VERSION: 9.0.6
|
||||||
- HSA_ENABLE_SDMA=0
|
# HIP_VISIBLE_DEVICES: 0,1
|
||||||
- HIP_VISIBLE_DEVICES=0,1
|
# LLAMA_CACHE: /models
|
||||||
- LLAMA_CACHE=/models
|
# volumes:
|
||||||
volumes:
|
# - /mnt/HoardingCow_docker_data/Llama_cpp/models:/models
|
||||||
- /mnt/HoardingCow_docker_data/Llama_cpp/models:/models
|
# - /mnt/HoardingCow_docker_data/Llama_cpp/devstral-agent.jinja:/template.jinja
|
||||||
- /mnt/HoardingCow_docker_data/Ollama/ollama/models/blobs/sha256-17823599694fa3503ef54bf748d5078c6ce881f4d01616cafa255dc05d215a08:/model.gguf:ro
|
# command: >
|
||||||
command: >
|
# -hf unsloth/Devstral-Small-2-24B-Instruct-2512-GGUF:Devstral-Small-2-24B-Instruct-2512-Q8_0.gguf
|
||||||
-m /model.gguf
|
# -a devstral-2-small-llama_cpp
|
||||||
--host 0.0.0.0
|
# --chat-template-file /template.jinja
|
||||||
--port 8080
|
# --host 0.0.0.0
|
||||||
--gpu-layers 99
|
# --port 8080
|
||||||
--ctx-size 163840
|
# --n-gpu-layers 99
|
||||||
-ctk f16 -ctv f16
|
# --ctx-size 163840
|
||||||
--flash-attn on
|
# --batch-size 4096
|
||||||
--split-mode layer
|
# --ubatch-size 4096
|
||||||
--no-mmap
|
# --cache-type-k f16
|
||||||
--n-predict -1
|
# --cache-type-v f16
|
||||||
|
# --cache-reuse 256
|
||||||
|
# --flash-attn on
|
||||||
|
# --context-shift
|
||||||
|
# --split-mode layer
|
||||||
|
# --no-mmap
|
||||||
|
# --n-predict -1
|
||||||
|
# --parallel 2
|
||||||
|
|
||||||
# vllm:
|
# vllm:
|
||||||
# image: nalanzeyu/vllm-gfx906:v0.9.0-rocm6.3
|
# image: nalanzeyu/vllm-gfx906:v0.9.0-rocm6.3
|
||||||
|
|||||||
@@ -79,6 +79,39 @@ PYEOF
|
|||||||
COPY --chmod=0755 himalaya-ro.sh /usr/local/bin/himalaya-ro
|
COPY --chmod=0755 himalaya-ro.sh /usr/local/bin/himalaya-ro
|
||||||
|
|
||||||
|
|
||||||
|
# ---------- Install 7-Zip (7zz) for CHM extraction ----------
|
||||||
|
RUN /opt/hermes/.venv/bin/python3 /dev/stdin << 'PYEOF'
|
||||||
|
import urllib.request, tarfile, os, shutil, re, subprocess
|
||||||
|
|
||||||
|
# Scrape 7-zip.org for latest Linux x64 binary link
|
||||||
|
url = 'https://7-zip.org/download.html'
|
||||||
|
req = urllib.request.Request(url, headers={'User-Agent': 'Mozilla/5.0'})
|
||||||
|
r = urllib.request.urlopen(req, timeout=15)
|
||||||
|
html = r.read().decode()
|
||||||
|
match = re.search(r'href="(a/7z[\d]+-linux-x64\.tar\.xz)"', html)
|
||||||
|
if not match:
|
||||||
|
raise RuntimeError('Could not find 7z Linux x64 download link on 7-zip.org')
|
||||||
|
dl_url = f'https://7-zip.org/{match.group(1)}'
|
||||||
|
|
||||||
|
# Follow Himalaya pattern: download, extract, install, verify
|
||||||
|
xz = '/tmp/7z.tar.xz'
|
||||||
|
urllib.request.urlretrieve(dl_url, xz)
|
||||||
|
os.makedirs('/tmp/7z', exist_ok=True)
|
||||||
|
with tarfile.open(xz, 'r:xz') as t:
|
||||||
|
t.extractall('/tmp/7z')
|
||||||
|
shutil.move('/tmp/7z/7zz', '/usr/local/bin/7zz')
|
||||||
|
os.chmod('/usr/local/bin/7zz', 0o755)
|
||||||
|
shutil.rmtree('/tmp/7z', ignore_errors=True)
|
||||||
|
os.remove(xz)
|
||||||
|
|
||||||
|
# Verify
|
||||||
|
result = subprocess.run(['/usr/local/bin/7zz'], capture_output=True, text=True)
|
||||||
|
assert result.returncode == 0, f'7zz verify failed: {result.stderr}'
|
||||||
|
version = result.stdout.split()[2] if result.stdout else 'unknown'
|
||||||
|
print(f'7-Zip {version} installed successfully')
|
||||||
|
PYEOF
|
||||||
|
|
||||||
|
|
||||||
# ---------- Runtime ----------
|
# ---------- Runtime ----------
|
||||||
USER hermes
|
USER hermes
|
||||||
ENV HERMES_HOME=/opt/data
|
ENV HERMES_HOME=/opt/data
|
||||||
|
|||||||
@@ -1,30 +0,0 @@
|
|||||||
# llama-cpp-rocm6/Dockerfile
|
|
||||||
# Custom llama.cpp server with ROCm 6.1 + gfx906 (MI50) support.
|
|
||||||
# Build: docker build -t llama-cpp:rocm-gfx906 .
|
|
||||||
|
|
||||||
FROM rocm/dev-ubuntu-22.04:6.1.2-complete AS builder
|
|
||||||
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y curl git build-essential pkg-config cmake make && rm -rf /var/lib/apt/lists/*
|
|
||||||
ARG LLAMACPP_VERSION=b9596
|
|
||||||
RUN git clone --depth 1 --branch ${LLAMACPP_VERSION} https://github.com/ggml-org/llama.cpp.git /build
|
|
||||||
WORKDIR /build
|
|
||||||
ENV HIP_PATH=/opt/rocm ROCM_PATH=/opt/rocm PATH=/opt/rocm/bin:/opt/rocm/llvm/bin:${PATH} CMAKE_PREFIX_PATH=/opt/rocm
|
|
||||||
RUN mkdir build && cd build && \
|
|
||||||
cmake .. -DGGML_HIP=ON -DCMAKE_BUILD_TYPE=Release \
|
|
||||||
-DAMDGPU_TARGETS="gfx906:xnack-" \
|
|
||||||
-DCMAKE_POSITION_INDEPENDENT_CODE=ON \
|
|
||||||
-DGGML_CUDA=OFF -DGGML_VULKAN=OFF -DGGML_METAL=OFF \
|
|
||||||
-DBUILD_SHARED_LIBS=OFF && \
|
|
||||||
cmake --build . --target llama-server -- -j $(nproc)
|
|
||||||
|
|
||||||
FROM ubuntu:24.04
|
|
||||||
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
|
|
||||||
ca-certificates curl libstdc++6 libgomp1 libopenblas0 \
|
|
||||||
libnuma1 libelf1 libdrm2 libdrm-amdgpu1 \
|
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
|
||||||
COPY --from=builder /opt/rocm/lib/ /opt/rocm/lib/
|
|
||||||
COPY --from=builder /opt/rocm/share/ /opt/rocm/share/
|
|
||||||
COPY --from=builder /build/build/bin/llama-server /usr/local/bin/llama-server
|
|
||||||
RUN echo /opt/rocm/lib > /etc/ld.so.conf.d/rocm.conf && ldconfig
|
|
||||||
ENV HSA_OVERRIDE_GFX_VERSION=9.0.6 HCC_AMDGPU_TARGET=gfx906 HSA_ENABLE_SDMA=0
|
|
||||||
EXPOSE 8080
|
|
||||||
ENTRYPOINT ["/usr/local/bin/llama-server"]
|
|
||||||
Reference in New Issue
Block a user