Skip to content

Commit 7a2ae48

Browse files
reeselevinereeselevine
committed
Merge remote-tracking branch 'origin/master' into types
2 parents 57c26b1 + fb22dd0 commit 7a2ae48

File tree

198 files changed

+19279
-3747
lines changed

Some content is hidden

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

198 files changed

+19279
-3747
lines changed

‎.devops/cloud-v-pipeline‎

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎.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 & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ RUN apt-get update \
6161
python3 \
6262
python3-pip \
6363
&& pip install --upgrade pip setuptools wheel \
64-
&& pip install -r requirements.txt \
64+
&& pip install --break-system-packages -r requirements.txt \
6565
&& apt autoremove -y \
6666
&& apt clean -y \
6767
&& 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-riscv-native.yml‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
name: Build on RISCV Linux Machine by Cloud-V
2+
on:
3+
workflow_dispatch:
4+
workflow_call:
5+
6+
jobs:
7+
bianbu-riscv64-native: # Bianbu 2.2
8+
runs-on: self-hosted
9+
10+
steps:
11+
- name: Install prerequisites
12+
run: |
13+
sudo apt-get update || true
14+
sudo apt-get install -y libatomic1
15+
- uses: actions/checkout@v4
16+
- name: Setup Riscv
17+
run: |
18+
sudo apt-get update || true
19+
sudo apt-get install -y --no-install-recommends \
20+
build-essential \
21+
gcc-14-riscv64-linux-gnu \
22+
g++-14-riscv64-linux-gnu \
23+
cmake
24+
25+
- name: Build
26+
run: |
27+
cmake -B build -DLLAMA_CURL=OFF \
28+
-DCMAKE_BUILD_TYPE=Release \
29+
-DGGML_OPENMP=OFF \
30+
-DLLAMA_BUILD_EXAMPLES=ON \
31+
-DLLAMA_BUILD_TOOLS=ON \
32+
-DLLAMA_BUILD_TESTS=OFF \
33+
-DCMAKE_SYSTEM_NAME=Linux \
34+
-DCMAKE_SYSTEM_PROCESSOR=riscv64 \
35+
-DCMAKE_C_COMPILER=riscv64-linux-gnu-gcc-14 \
36+
-DCMAKE_CXX_COMPILER=riscv64-linux-gnu-g++-14 \
37+
-DCMAKE_POSITION_INDEPENDENT_CODE=ON \
38+
-DCMAKE_FIND_ROOT_PATH=/usr/lib/riscv64-linux-gnu \
39+
-DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER \
40+
-DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY \
41+
-DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=BOTH
42+
43+
cmake --build build --config Release -j $(nproc)

‎.github/workflows/build.yml‎

Lines changed: 30 additions & 34 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
@@ -443,7 +443,7 @@ jobs:
443443
444444
ubuntu-22-cmake-hip:
445445
runs-on: ubuntu-22.04
446-
container: rocm/dev-ubuntu-22.04:6.0.2
446+
container: rocm/dev-ubuntu-22.04:6.1.2
447447

448448
steps:
449449
- name: Clone
@@ -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
@@ -471,16 +471,6 @@ jobs:
471471
-DGGML_HIP=ON
472472
cmake --build build --config Release -j $(nproc)
473473
474-
- name: Build with legacy HIP support
475-
id: cmake_build_legacy_hip
476-
run: |
477-
cmake -B build2 -S . \
478-
-DCMAKE_C_COMPILER=hipcc \
479-
-DCMAKE_CXX_COMPILER=hipcc \
480-
-DGGML_HIP_ROCWMMA_FATTN=ON \
481-
-DGGML_HIP=ON
482-
cmake --build build2 --config Release -j $(nproc)
483-
484474
ubuntu-22-cmake-musa:
485475
runs-on: ubuntu-22.04
486476
container: mthreads/musa:rc4.2.0-devel-ubuntu22.04-amd64
@@ -497,7 +487,7 @@ jobs:
497487
apt-get install -y build-essential git cmake libcurl4-openssl-dev
498488
499489
- name: ccache
500-
uses: hendrikmuhs/[email protected]
490+
uses: ggml-org/[email protected]
501491
with:
502492
key: ubuntu-22-cmake-musa
503493
evict-old-files: 1d
@@ -542,7 +532,7 @@ jobs:
542532
uses: actions/checkout@v4
543533

544534
- name: ccache
545-
uses: hendrikmuhs/[email protected]
535+
uses: ggml-org/[email protected]
546536
with:
547537
key: ubuntu-22-cmake-sycl
548538
evict-old-files: 1d
@@ -590,7 +580,7 @@ jobs:
590580
uses: actions/checkout@v4
591581

592582
- name: ccache
593-
uses: hendrikmuhs/[email protected]
583+
uses: ggml-org/[email protected]
594584
with:
595585
key: ubuntu-22-cmake-sycl-fp16
596586
evict-old-files: 1d
@@ -621,7 +611,7 @@ jobs:
621611
uses: actions/checkout@v4
622612

623613
- name: ccache
624-
uses: hendrikmuhs/[email protected]
614+
uses: ggml-org/[email protected]
625615
with:
626616
key: macOS-latest-cmake-ios
627617
evict-old-files: 1d
@@ -658,7 +648,7 @@ jobs:
658648
uses: actions/checkout@v4
659649

660650
- name: ccache
661-
uses: hendrikmuhs/[email protected]
651+
uses: ggml-org/[email protected]
662652
with:
663653
key: macOS-latest-cmake-tvos
664654
evict-old-files: 1d
@@ -730,7 +720,7 @@ jobs:
730720
uses: actions/checkout@v4
731721

732722
- name: ccache
733-
uses: hendrikmuhs/[email protected]
723+
uses: ggml-org/[email protected]
734724
with:
735725
key: macOS-latest-swift
736726
evict-old-files: 1d
@@ -776,7 +766,7 @@ jobs:
776766
uses: actions/checkout@v4
777767

778768
- name: ccache
779-
uses: hendrikmuhs/[email protected]
769+
uses: ggml-org/[email protected]
780770
with:
781771
key: windows-msys2
782772
variant: ccache
@@ -844,7 +834,7 @@ jobs:
844834
uses: actions/checkout@v4
845835

846836
- name: ccache
847-
uses: hendrikmuhs/[email protected]
837+
uses: ggml-org/[email protected]
848838
with:
849839
key: windows-latest-cmake-${{ matrix.build }}
850840
variant: ccache
@@ -958,7 +948,7 @@ jobs:
958948
apt install -y cmake build-essential ninja-build libgomp1 git libcurl4-openssl-dev
959949
960950
- name: ccache
961-
uses: hendrikmuhs/[email protected]
951+
uses: ggml-org/[email protected]
962952
with:
963953
key: ubuntu-latest-cmake-cuda
964954
evict-old-files: 1d
@@ -987,7 +977,7 @@ jobs:
987977
uses: actions/checkout@v4
988978

989979
- name: Install ccache
990-
uses: hendrikmuhs/[email protected]
980+
uses: ggml-org/[email protected]
991981
with:
992982
key: windows-cuda-${{ matrix.cuda }}
993983
variant: ccache
@@ -1043,7 +1033,7 @@ jobs:
10431033
uses: actions/checkout@v4
10441034

10451035
- name: ccache
1046-
uses: hendrikmuhs/[email protected]
1036+
uses: ggml-org/[email protected]
10471037
with:
10481038
key: windows-latest-cmake-sycl
10491039
variant: ccache
@@ -1080,7 +1070,8 @@ jobs:
10801070
write-host "Downloading AMD HIP SDK Installer"
10811071
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"
10821072
write-host "Installing AMD HIP SDK"
1083-
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)
10841075
write-host "Completed AMD HIP SDK installation"
10851076
10861077
- name: Verify ROCm
@@ -1089,7 +1080,7 @@ jobs:
10891080
& 'C:\Program Files\AMD\ROCm\*\bin\clang.exe' --version
10901081
10911082
- name: Install ccache
1092-
uses: hendrikmuhs/[email protected]
1083+
uses: ggml-org/[email protected]
10931084
with:
10941085
key: ${{ github.job }}
10951086
evict-old-files: 1d
@@ -1123,6 +1114,11 @@ jobs:
11231114
- name: Checkout code
11241115
uses: actions/checkout@v4
11251116

1117+
- name: Setup Xcode
1118+
uses: maxim-lobanov/setup-xcode@v1
1119+
with:
1120+
xcode-version: latest-stable
1121+
11261122
- name: Build
11271123
id: cmake_build
11281124
run: |
@@ -1156,7 +1152,7 @@ jobs:
11561152
uses: actions/checkout@v4
11571153

11581154
- name: ccache
1159-
uses: hendrikmuhs/[email protected]
1155+
uses: ggml-org/[email protected]
11601156
with:
11611157
key: android-build
11621158
evict-old-files: 1d

0 commit comments

Comments
 (0)