Skip to content

Commit 6727461

Browse files
committed
Merge upstream master: Gemma 4 support + SWA KV fix
Merge 59 upstream commits including: - model: support gemma 4 (vision + moe, no audio) (ggml-org#21309) - kv-cache: do not quantize SWA KV cache (ggml-org#21277) - Preserve RotorQuant exclusion from Hadamard rotation
2 parents ba41d84 + a1cfb64 commit 6727461

234 files changed

Lines changed: 10750 additions & 3302 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.devops/cpu.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ RUN mkdir -p /app/full \
3636
FROM ubuntu:$UBUNTU_VERSION AS base
3737

3838
RUN apt-get update \
39-
&& apt-get install -y libgomp1 curl\
39+
&& apt-get install -y libgomp1 curl \
4040
&& apt autoremove -y \
4141
&& apt clean -y \
4242
&& rm -rf /tmp/* /var/tmp/* \

.devops/cuda-new.Dockerfile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ARG UBUNTU_VERSION=24.04
22
# This needs to generally match the container host's environment.
3-
ARG CUDA_VERSION=13.1.0
3+
ARG CUDA_VERSION=13.1.1
44
# Target the CUDA build image
55
ARG BASE_CUDA_DEV_CONTAINER=nvidia/cuda:${CUDA_VERSION}-devel-ubuntu${UBUNTU_VERSION}
66

@@ -12,7 +12,9 @@ FROM ${BASE_CUDA_DEV_CONTAINER} AS build
1212
ARG CUDA_DOCKER_ARCH=default
1313

1414
RUN apt-get update && \
15-
apt-get install -y build-essential cmake python3 python3-pip git libssl-dev libgomp1
15+
apt-get install -y gcc-14 g++-14 build-essential cmake python3 python3-pip git libssl-dev libgomp1
16+
17+
ENV CC=gcc-14 CXX=g++-14 CUDAHOSTCXX=g++-14
1618

1719
WORKDIR /app
1820

@@ -39,7 +41,7 @@ RUN mkdir -p /app/full \
3941
FROM ${BASE_CUDA_RUN_CONTAINER} AS base
4042

4143
RUN apt-get update \
42-
&& apt-get install -y libgomp1 curl\
44+
&& apt-get install -y libgomp1 curl \
4345
&& apt autoremove -y \
4446
&& apt clean -y \
4547
&& rm -rf /tmp/* /var/tmp/* \

.devops/cuda.Dockerfile

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
ARG UBUNTU_VERSION=22.04
1+
ARG UBUNTU_VERSION=24.04
22
# This needs to generally match the container host's environment.
3-
ARG CUDA_VERSION=12.4.0
3+
ARG CUDA_VERSION=12.8.1
44
# Target the CUDA build image
55
ARG BASE_CUDA_DEV_CONTAINER=nvidia/cuda:${CUDA_VERSION}-devel-ubuntu${UBUNTU_VERSION}
66

@@ -12,7 +12,9 @@ FROM ${BASE_CUDA_DEV_CONTAINER} AS build
1212
ARG CUDA_DOCKER_ARCH=default
1313

1414
RUN apt-get update && \
15-
apt-get install -y build-essential cmake python3 python3-pip git libssl-dev libgomp1
15+
apt-get install -y gcc-14 g++-14 build-essential cmake python3 python3-pip git libssl-dev libgomp1
16+
17+
ENV CC=gcc-14 CXX=g++-14 CUDAHOSTCXX=g++-14
1618

1719
WORKDIR /app
1820

@@ -39,7 +41,7 @@ RUN mkdir -p /app/full \
3941
FROM ${BASE_CUDA_RUN_CONTAINER} AS base
4042

4143
RUN apt-get update \
42-
&& apt-get install -y libgomp1 curl\
44+
&& apt-get install -y libgomp1 curl \
4345
&& apt autoremove -y \
4446
&& apt clean -y \
4547
&& rm -rf /tmp/* /var/tmp/* \
@@ -60,7 +62,8 @@ RUN apt-get update \
6062
git \
6163
python3 \
6264
python3-pip \
63-
&& pip install --upgrade pip setuptools wheel \
65+
python3-wheel \
66+
&& pip install --break-system-packages --upgrade setuptools \
6467
&& pip install --break-system-packages -r requirements.txt \
6568
&& apt autoremove -y \
6669
&& apt clean -y \

.devops/intel.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ RUN mkdir /tmp/neo/ && cd /tmp/neo/ \
5151
&& dpkg --install *.deb
5252

5353
RUN apt-get update \
54-
&& apt-get install -y libgomp1 curl\
54+
&& apt-get install -y libgomp1 curl \
5555
&& apt autoremove -y \
5656
&& apt clean -y \
5757
&& rm -rf /tmp/* /var/tmp/* \

.devops/musa.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ RUN mkdir -p /app/full \
4646
FROM ${BASE_MUSA_RUN_CONTAINER} AS base
4747

4848
RUN apt-get update \
49-
&& apt-get install -y libgomp1 curl\
49+
&& apt-get install -y libgomp1 curl \
5050
&& apt autoremove -y \
5151
&& apt clean -y \
5252
&& rm -rf /tmp/* /var/tmp/* \

.devops/openvino.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ ARG http_proxy
7878
ARG https_proxy
7979

8080
RUN apt-get update \
81-
&& apt-get install -y libgomp1 libtbb12 curl\
81+
&& apt-get install -y libgomp1 libtbb12 curl \
8282
&& apt autoremove -y \
8383
&& apt clean -y \
8484
&& rm -rf /tmp/* /var/tmp/* \

.devops/rocm.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ RUN mkdir -p /app/full \
5858
FROM ${BASE_ROCM_DEV_CONTAINER} AS base
5959

6060
RUN apt-get update \
61-
&& apt-get install -y libgomp1 curl\
61+
&& apt-get install -y libgomp1 curl \
6262
&& apt autoremove -y \
6363
&& apt clean -y \
6464
&& rm -rf /tmp/* /var/tmp/* \
@@ -79,7 +79,7 @@ RUN apt-get update \
7979
git \
8080
python3-pip \
8181
python3 \
82-
python3-wheel\
82+
python3-wheel \
8383
&& pip install --break-system-packages --upgrade setuptools \
8484
&& pip install --break-system-packages -r requirements.txt \
8585
&& apt autoremove -y \

.devops/vulkan.Dockerfile

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,17 +49,20 @@ COPY --from=build /app/full /app
4949

5050
WORKDIR /app
5151

52+
ENV PATH="/root/.venv/bin:/root/.local/bin:${PATH}"
53+
54+
# Flag for compatibility with pip
55+
ARG UV_INDEX_STRATEGY="unsafe-best-match"
5256
RUN apt-get update \
5357
&& apt-get install -y \
5458
build-essential \
59+
curl \
5560
git \
56-
python3.13 \
57-
python3.13-dev \
58-
python3-pip \
59-
python3-wheel \
60-
&& update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.13 100 \
61-
&& pip install --break-system-packages --upgrade setuptools \
62-
&& pip install --break-system-packages -r requirements.txt \
61+
ca-certificates \
62+
&& curl -LsSf https://astral.sh/uv/install.sh | sh \
63+
&& uv python install 3.13 \
64+
&& uv venv --python 3.13 /root/.venv \
65+
&& uv pip install --python /root/.venv/bin/python -r requirements.txt \
6366
&& apt autoremove -y \
6467
&& apt clean -y \
6568
&& rm -rf /tmp/* /var/tmp/* \

.editorconfig

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,6 @@ indent_style = tab
2121
[prompts/*.txt]
2222
insert_final_newline = unset
2323

24-
[tools/server/public/*]
25-
indent_size = 2
26-
27-
[tools/server/public/deps_*]
28-
trim_trailing_whitespace = unset
29-
indent_style = unset
30-
indent_size = unset
31-
3224
[tools/server/deps_*]
3325
trim_trailing_whitespace = unset
3426
indent_style = unset
@@ -61,6 +53,14 @@ charset = unset
6153
trim_trailing_whitespace = unset
6254
insert_final_newline = unset
6355

56+
[tools/server/public/**]
57+
indent_style = unset
58+
indent_size = unset
59+
end_of_line = unset
60+
charset = unset
61+
trim_trailing_whitespace = unset
62+
insert_final_newline = unset
63+
6464
[benches/**]
6565
indent_style = unset
6666
indent_size = unset

.gitattributes

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# Treat the generated single-file WebUI build as binary for diff purposes.
2+
# Git's pack-file delta compression still works (byte-level), but this prevents
3+
# git diff from printing the entire minified file on every change.
4+
tools/server/public/index.html -diff

0 commit comments

Comments
 (0)