Skip to content

Commit dcc5a02

Browse files
jan-service-accountjan-service-account
authored
Merge pull request #205 from menloresearch/update-dev-from-master-2025-08-16-00-11
Sync master with upstream release b6178
2 parents 4b9dac4 + 5e6229a commit dcc5a02

File tree

85 files changed

+11534
-477
lines changed

Some content is hidden

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

85 files changed

+11534
-477
lines changed

‎.devops/cpu.Dockerfile‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,15 @@ FROM ubuntu:$UBUNTU_VERSION AS build
44

55
ARG TARGETARCH
66

7-
ARG GGML_CPU_ARM_ARCH=armv8-a
8-
97
RUN apt-get update && \
108
apt-get install -y build-essential git cmake libcurl4-openssl-dev
119

1210
WORKDIR /app
1311

1412
COPY . .
1513

16-
RUN if [ "$TARGETARCH" = "amd64" ]; then \
14+
RUN if [ "$TARGETARCH" = "amd64" ] || [ "$TARGETARCH" = "arm64" ]; then \
1715
cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DGGML_NATIVE=OFF -DLLAMA_BUILD_TESTS=OFF -DGGML_BACKEND_DL=ON -DGGML_CPU_ALL_VARIANTS=ON; \
18-
elif [ "$TARGETARCH" = "arm64" ]; then \
19-
cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DGGML_NATIVE=OFF -DLLAMA_BUILD_TESTS=OFF -DGGML_CPU_ARM_ARCH=${GGML_CPU_ARM_ARCH}; \
2016
else \
2117
echo "Unsupported architecture"; \
2218
exit 1; \

‎.devops/cuda.Dockerfile‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,7 @@ RUN apt-get update \
6060
git \
6161
python3 \
6262
python3-pip \
63-
&& pip install --upgrade pip setuptools wheel \
64-
&& pip install -r requirements.txt \
63+
&& pip install --break-system-packages -r requirements.txt \
6564
&& apt autoremove -y \
6665
&& apt clean -y \
6766
&& rm -rf /tmp/* /var/tmp/* \

‎.github/ISSUE_TEMPLATE/010-bug-compilation.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ body:
4040
attributes:
4141
label: GGML backends
4242
description: Which GGML backends do you know to be affected?
43-
options: [AMX, BLAS, CPU, CUDA, HIP, Metal, Musa, RPC, SYCL, Vulkan, OpenCL]
43+
options: [AMX, BLAS, CPU, CUDA, HIP, Metal, Musa, RPC, SYCL, Vulkan, OpenCL, zDNN]
4444
multiple: true
4545
validations:
4646
required: true

‎.github/ISSUE_TEMPLATE/011-bug-results.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ body:
4242
attributes:
4343
label: GGML backends
4444
description: Which GGML backends do you know to be affected?
45-
options: [AMX, BLAS, CPU, CUDA, HIP, Metal, Musa, RPC, SYCL, Vulkan, OpenCL]
45+
options: [AMX, BLAS, CPU, CUDA, HIP, Metal, Musa, RPC, SYCL, Vulkan, OpenCL, zDNN]
4646
multiple: true
4747
validations:
4848
required: true

‎.github/labeler.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@ Vulkan:
2222
- any-glob-to-any-file:
2323
- ggml/include/ggml-vulkan.h
2424
- ggml/src/ggml-vulkan/**
25+
IBM zDNN:
26+
- changed-files:
27+
- any-glob-to-any-file:
28+
- ggml/include/ggml-zdnn.h
29+
- ggml/src/ggml-zdnn/**
2530
documentation:
2631
- changed-files:
2732
- any-glob-to-any-file:

‎.github/workflows/build.yml‎

Lines changed: 27 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
uses: actions/checkout@v4
6565

6666
- name: ccache
67-
uses: hendrikmuhs/[email protected]
67+
uses: ggml-org/[email protected]
6868
with:
6969
key: macOS-latest-cmake-arm64
7070
evict-old-files: 1d
@@ -104,7 +104,7 @@ jobs:
104104
uses: actions/checkout@v4
105105

106106
- name: ccache
107-
uses: hendrikmuhs/[email protected]
107+
uses: ggml-org/[email protected]
108108
with:
109109
key: macOS-latest-cmake-x64
110110
evict-old-files: 1d
@@ -144,7 +144,7 @@ jobs:
144144
uses: actions/checkout@v4
145145

146146
- name: ccache
147-
uses: hendrikmuhs/[email protected]
147+
uses: ggml-org/[email protected]
148148
with:
149149
key: macOS-latest-cmake-arm64-webgpu
150150
evict-old-files: 1d
@@ -199,7 +199,7 @@ jobs:
199199
uses: actions/checkout@v4
200200

201201
- name: ccache
202-
uses: hendrikmuhs/[email protected]
202+
uses: ggml-org/[email protected]
203203
with:
204204
key: ubuntu-cpu-cmake
205205
evict-old-files: 1d
@@ -251,7 +251,7 @@ jobs:
251251
uses: actions/checkout@v4
252252

253253
- name: ccache
254-
uses: hendrikmuhs/[email protected]
254+
uses: ggml-org/[email protected]
255255
with:
256256
key: ubuntu-latest-cmake-sanitizer-${{ matrix.sanitizer }}
257257
evict-old-files: 1d
@@ -330,7 +330,7 @@ jobs:
330330
uses: actions/checkout@v4
331331

332332
- name: ccache
333-
uses: hendrikmuhs/[email protected]
333+
uses: ggml-org/[email protected]
334334
with:
335335
key: ubuntu-latest-cmake-rpc
336336
evict-old-files: 1d
@@ -363,7 +363,7 @@ jobs:
363363
uses: actions/checkout@v4
364364

365365
- name: ccache
366-
uses: hendrikmuhs/[email protected]
366+
uses: ggml-org/[email protected]
367367
with:
368368
key: ubuntu-22-cmake-vulkan
369369
evict-old-files: 1d
@@ -400,7 +400,7 @@ jobs:
400400
uses: actions/checkout@v4
401401

402402
- name: ccache
403-
uses: hendrikmuhs/[email protected]
403+
uses: ggml-org/[email protected]
404404
with:
405405
key: ubuntu-22-cmake-webgpu
406406
evict-old-files: 1d
@@ -457,7 +457,7 @@ jobs:
457457
sudo apt-get install -y build-essential git cmake rocblas-dev hipblas-dev libcurl4-openssl-dev
458458
459459
- name: ccache
460-
uses: hendrikmuhs/[email protected]
460+
uses: ggml-org/[email protected]
461461
with:
462462
key: ubuntu-22-cmake-hip
463463
evict-old-files: 1d
@@ -487,7 +487,7 @@ jobs:
487487
apt-get install -y build-essential git cmake libcurl4-openssl-dev
488488
489489
- name: ccache
490-
uses: hendrikmuhs/[email protected]
490+
uses: ggml-org/[email protected]
491491
with:
492492
key: ubuntu-22-cmake-musa
493493
evict-old-files: 1d
@@ -532,7 +532,7 @@ jobs:
532532
uses: actions/checkout@v4
533533

534534
- name: ccache
535-
uses: hendrikmuhs/[email protected]
535+
uses: ggml-org/[email protected]
536536
with:
537537
key: ubuntu-22-cmake-sycl
538538
evict-old-files: 1d
@@ -580,7 +580,7 @@ jobs:
580580
uses: actions/checkout@v4
581581

582582
- name: ccache
583-
uses: hendrikmuhs/[email protected]
583+
uses: ggml-org/[email protected]
584584
with:
585585
key: ubuntu-22-cmake-sycl-fp16
586586
evict-old-files: 1d
@@ -611,7 +611,7 @@ jobs:
611611
uses: actions/checkout@v4
612612

613613
- name: ccache
614-
uses: hendrikmuhs/[email protected]
614+
uses: ggml-org/[email protected]
615615
with:
616616
key: macOS-latest-cmake-ios
617617
evict-old-files: 1d
@@ -648,7 +648,7 @@ jobs:
648648
uses: actions/checkout@v4
649649

650650
- name: ccache
651-
uses: hendrikmuhs/[email protected]
651+
uses: ggml-org/[email protected]
652652
with:
653653
key: macOS-latest-cmake-tvos
654654
evict-old-files: 1d
@@ -720,7 +720,7 @@ jobs:
720720
uses: actions/checkout@v4
721721

722722
- name: ccache
723-
uses: hendrikmuhs/[email protected]
723+
uses: ggml-org/[email protected]
724724
with:
725725
key: macOS-latest-swift
726726
evict-old-files: 1d
@@ -766,7 +766,7 @@ jobs:
766766
uses: actions/checkout@v4
767767

768768
- name: ccache
769-
uses: hendrikmuhs/[email protected]
769+
uses: ggml-org/[email protected]
770770
with:
771771
key: windows-msys2
772772
variant: ccache
@@ -834,7 +834,7 @@ jobs:
834834
uses: actions/checkout@v4
835835

836836
- name: ccache
837-
uses: hendrikmuhs/[email protected]
837+
uses: ggml-org/[email protected]
838838
with:
839839
key: windows-latest-cmake-${{ matrix.build }}
840840
variant: ccache
@@ -948,7 +948,7 @@ jobs:
948948
apt install -y cmake build-essential ninja-build libgomp1 git libcurl4-openssl-dev
949949
950950
- name: ccache
951-
uses: hendrikmuhs/[email protected]
951+
uses: ggml-org/[email protected]
952952
with:
953953
key: ubuntu-latest-cmake-cuda
954954
evict-old-files: 1d
@@ -977,7 +977,7 @@ jobs:
977977
uses: actions/checkout@v4
978978

979979
- name: Install ccache
980-
uses: hendrikmuhs/[email protected]
980+
uses: ggml-org/[email protected]
981981
with:
982982
key: windows-cuda-${{ matrix.cuda }}
983983
variant: ccache
@@ -1033,7 +1033,7 @@ jobs:
10331033
uses: actions/checkout@v4
10341034

10351035
- name: ccache
1036-
uses: hendrikmuhs/[email protected]
1036+
uses: ggml-org/[email protected]
10371037
with:
10381038
key: windows-latest-cmake-sycl
10391039
variant: ccache
@@ -1079,7 +1079,7 @@ jobs:
10791079
& 'C:\Program Files\AMD\ROCm\*\bin\clang.exe' --version
10801080
10811081
- name: Install ccache
1082-
uses: hendrikmuhs/[email protected]
1082+
uses: ggml-org/[email protected]
10831083
with:
10841084
key: ${{ github.job }}
10851085
evict-old-files: 1d
@@ -1113,6 +1113,11 @@ jobs:
11131113
- name: Checkout code
11141114
uses: actions/checkout@v4
11151115

1116+
- name: Setup Xcode
1117+
uses: maxim-lobanov/setup-xcode@v1
1118+
with:
1119+
xcode-version: latest-stable
1120+
11161121
- name: Build
11171122
id: cmake_build
11181123
run: |
@@ -1146,7 +1151,7 @@ jobs:
11461151
uses: actions/checkout@v4
11471152

11481153
- name: ccache
1149-
uses: hendrikmuhs/[email protected]
1154+
uses: ggml-org/[email protected]
11501155
with:
11511156
key: android-build
11521157
evict-old-files: 1d

‎.github/workflows/copilot-setup-steps.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
uses: actions/checkout@v4
3030

3131
- name: ccache
32-
uses: hendrikmuhs/[email protected]
32+
uses: ggml-org/[email protected]
3333
with:
3434
key: copilot-setup-steps
3535
evict-old-files: 1d

‎.github/workflows/release.yml‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
fetch-depth: 0
3333

3434
- name: ccache
35-
uses: hendrikmuhs/[email protected]
35+
uses: ggml-org/[email protected]
3636
with:
3737
key: macOS-latest-cmake-arm64
3838
evict-old-files: 1d
@@ -85,7 +85,7 @@ jobs:
8585
fetch-depth: 0
8686

8787
- name: ccache
88-
uses: hendrikmuhs/[email protected]
88+
uses: ggml-org/[email protected]
8989
with:
9090
key: macOS-latest-cmake-x64
9191
evict-old-files: 1d
@@ -147,7 +147,7 @@ jobs:
147147
fetch-depth: 0
148148

149149
- name: ccache
150-
uses: hendrikmuhs/[email protected]
150+
uses: ggml-org/[email protected]
151151
with:
152152
key: ubuntu-cpu-cmake
153153
evict-old-files: 1d
@@ -198,7 +198,7 @@ jobs:
198198
fetch-depth: 0
199199

200200
- name: ccache
201-
uses: hendrikmuhs/[email protected]
201+
uses: ggml-org/[email protected]
202202
with:
203203
key: ubuntu-22-cmake-vulkan
204204
evict-old-files: 1d
@@ -256,7 +256,7 @@ jobs:
256256
fetch-depth: 0
257257

258258
- name: ccache
259-
uses: hendrikmuhs/[email protected]
259+
uses: ggml-org/[email protected]
260260
with:
261261
key: windows-latest-cmake-cpu-${{ matrix.arch }}
262262
variant: ccache
@@ -328,7 +328,7 @@ jobs:
328328
uses: actions/checkout@v4
329329

330330
- name: ccache
331-
uses: hendrikmuhs/[email protected]
331+
uses: ggml-org/[email protected]
332332
with:
333333
key: windows-latest-cmake-${{ matrix.backend }}-${{ matrix.arch }}
334334
variant: ccache
@@ -398,7 +398,7 @@ jobs:
398398
uses: actions/checkout@v4
399399

400400
- name: Install ccache
401-
uses: hendrikmuhs/[email protected]
401+
uses: ggml-org/[email protected]
402402
with:
403403
key: windows-cuda-${{ matrix.cuda }}
404404
variant: ccache
@@ -471,7 +471,7 @@ jobs:
471471
uses: actions/checkout@v4
472472

473473
- name: ccache
474-
uses: hendrikmuhs/[email protected]
474+
uses: ggml-org/[email protected]
475475
with:
476476
key: windows-latest-cmake-sycl
477477
variant: ccache
@@ -545,7 +545,7 @@ jobs:
545545
git clone https://github.com/rocm/rocwmma --branch rocm-6.2.4 --depth 1
546546
547547
- name: ccache
548-
uses: hendrikmuhs/[email protected]
548+
uses: ggml-org/[email protected]
549549
with:
550550
key: windows-latest-cmake-hip-${{ matrix.name }}-x64
551551
evict-old-files: 1d
@@ -600,14 +600,18 @@ jobs:
600600
name: llama-bin-win-hip-${{ matrix.name }}-x64.zip
601601

602602
ios-xcode-build:
603-
runs-on: macos-latest
603+
runs-on: macos-15
604604

605605
steps:
606606
- name: Checkout code
607607
uses: actions/checkout@v4
608608
with:
609609
fetch-depth: 0
610610

611+
- name: Setup Xcode
612+
run: |
613+
sudo xcode-select -s /Applications/Xcode_16.4.app
614+
611615
- name: Build
612616
id: cmake_build
613617
run: |

‎CMakeLists.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ if (NOT XCODE AND NOT MSVC AND NOT CMAKE_BUILD_TYPE)
1212
set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" "MinSizeRel" "RelWithDebInfo")
1313
endif()
1414

15+
message("CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}")
16+
1517
# Add path to modules
1618
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/")
1719

‎CODEOWNERS‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@
1010
/ggml/src/ggml-opt.cpp @JohannesGaessler
1111
/ggml/src/gguf.cpp @JohannesGaessler
1212
/ggml/src/ggml-vulkan/ @0cc4m
13+
/ggml/src/ggml-zdnn/ @taronaeo

0 commit comments

Comments
 (0)