Skip to content

Commit c3c5aaa

Browse files
ThireusThireus
authored
Merge branch 'ggml-org:master' into ug/port-sweep-bench
2 parents ad6e499 + b143fbc commit c3c5aaa

Some content is hidden

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

43 files changed

+11765
-337
lines changed

‎.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: 29 additions & 23 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
@@ -1070,7 +1070,8 @@ jobs:
10701070
write-host "Downloading AMD HIP SDK Installer"
10711071
Invoke-WebRequest -Uri "https://download.amd.com/developer/eula/rocm-hub/AMD-Software-PRO-Edition-24.Q3-WinSvr2022-For-HIP.exe" -OutFile "${env:RUNNER_TEMP}\rocm-install.exe"
10721072
write-host "Installing AMD HIP SDK"
1073-
Start-Process "${env:RUNNER_TEMP}\rocm-install.exe" -ArgumentList '-install' -NoNewWindow -Wait
1073+
$proc = Start-Process "${env:RUNNER_TEMP}\rocm-install.exe" -ArgumentList '-install' -NoNewWindow -PassThru
1074+
$proc.WaitForExit(600000)
10741075
write-host "Completed AMD HIP SDK installation"
10751076
10761077
- name: Verify ROCm
@@ -1079,7 +1080,7 @@ jobs:
10791080
& 'C:\Program Files\AMD\ROCm\*\bin\clang.exe' --version
10801081
10811082
- name: Install ccache
1082-
uses: hendrikmuhs/[email protected]
1083+
uses: ggml-org/[email protected]
10831084
with:
10841085
key: ${{ github.job }}
10851086
evict-old-files: 1d
@@ -1113,6 +1114,11 @@ jobs:
11131114
- name: Checkout code
11141115
uses: actions/checkout@v4
11151116

1117+
- name: Setup Xcode
1118+
uses: maxim-lobanov/setup-xcode@v1
1119+
with:
1120+
xcode-version: latest-stable
1121+
11161122
- name: Build
11171123
id: cmake_build
11181124
run: |
@@ -1146,7 +1152,7 @@ jobs:
11461152
uses: actions/checkout@v4
11471153

11481154
- name: ccache
1149-
uses: hendrikmuhs/[email protected]
1155+
uses: ggml-org/[email protected]
11501156
with:
11511157
key: android-build
11521158
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: 16 additions & 11 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
@@ -557,7 +557,8 @@ jobs:
557557
write-host "Downloading AMD HIP SDK Installer"
558558
Invoke-WebRequest -Uri "https://download.amd.com/developer/eula/rocm-hub/AMD-Software-PRO-Edition-24.Q3-WinSvr2022-For-HIP.exe" -OutFile "${env:RUNNER_TEMP}\rocm-install.exe"
559559
write-host "Installing AMD HIP SDK"
560-
Start-Process "${env:RUNNER_TEMP}\rocm-install.exe" -ArgumentList '-install' -NoNewWindow -Wait
560+
$proc = Start-Process "${env:RUNNER_TEMP}\rocm-install.exe" -ArgumentList '-install' -NoNewWindow -PassThru
561+
$proc.WaitForExit(600000)
561562
write-host "Completed AMD HIP SDK installation"
562563
563564
- name: Verify ROCm
@@ -600,14 +601,18 @@ jobs:
600601
name: llama-bin-win-hip-${{ matrix.name }}-x64.zip
601602

602603
ios-xcode-build:
603-
runs-on: macos-latest
604+
runs-on: macos-15
604605

605606
steps:
606607
- name: Checkout code
607608
uses: actions/checkout@v4
608609
with:
609610
fetch-depth: 0
610611

612+
- name: Setup Xcode
613+
run: |
614+
sudo xcode-select -s /Applications/Xcode_16.4.app
615+
611616
- name: Build
612617
id: cmake_build
613618
run: |

‎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

‎common/chat.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2061,8 +2061,8 @@ static common_chat_params common_chat_templates_apply_jinja(
20612061
params.enable_thinking = inputs.enable_thinking;
20622062
params.grammar = inputs.grammar;
20632063
params.now = inputs.now;
2064-
params.add_bos = inputs.add_bos;
2065-
params.add_eos = inputs.add_eos;
2064+
params.add_bos = tmpls->add_bos;
2065+
params.add_eos = tmpls->add_eos;
20662066

20672067
params.extra_context = json::object();
20682068
for (auto el : inputs.chat_template_kwargs) {

0 commit comments

Comments
 (0)