Skip to content

Commit 8f1adf1

Browse files
tastelikefeettastelikefeet
committed
Merge branch 'master' into feat/modelscope
* master: (123 commits) cuda : add f32 to bf16 copy op (ggml-org#12806) llava: improve clip_ctx destructor to not memleak load_image_size (ggml-org#12834) llama : fix FA when KV cache is not used (i.e. embeddings) (ggml-org#12825) server : fix thread.join() on exit (ggml-org#12831) llava: add more helper functions to check projector types in clip context (ggml-org#12824) arg : Including limits file on AIX (ggml-org#12822) server : webui : Improve Chat Input with Auto-Sizing Textarea (ggml-org#12785) Revert "sycl:remove redundant memcopy in function ggml_backend_sycl_buffer_set_tensor" (ggml-org#12812) gguf-py : support lazy tensor splitting (ggml-org#12809) llama : Support llama 4 text-only (ggml-org#12791) opencl: better identify Adreno GPU (ggml-org#12760) hellaswag: display estimated score confidence interval (ggml-org#12797) cuda : fix HIP and MUSA BF16 (#0) sync : ggml ggml : simplify Arm fp16 CPU logic (ggml/1177) CUDA: don't convert BF16 weights to FP32 (ggml/1174) cpu: move all the operators into a separate c++ file (except mul_mat) (ggml/1167) sycl: remove redundant memcopy in function ggml_backend_sycl_buffer_set_tensor (ggml-org#12734) ci : no curl on ggml-ci (ggml-org#12796) cmake : enable curl by default (ggml-org#12761) ... # Conflicts: # common/arg.cpp # common/common.cpp # common/common.h
2 parents c9aca3e + 7538246 commit 8f1adf1

File tree

221 files changed

+25187
-23737
lines changed

Some content is hidden

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

221 files changed

+25187
-23737
lines changed

‎.devops/cpu.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ WORKDIR /app
1414
COPY . .
1515

1616
RUN if [ "$TARGETARCH" = "amd64" ]; then \
17-
cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DLLAMA_CURL=ON -DGGML_NATIVE=OFF -DGGML_BACKEND_DL=ON -DGGML_CPU_ALL_VARIANTS=ON; \
17+
cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DGGML_NATIVE=OFF -DGGML_BACKEND_DL=ON -DGGML_CPU_ALL_VARIANTS=ON; \
1818
elif [ "$TARGETARCH" = "arm64" ]; then \
19-
cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DLLAMA_CURL=ON -DGGML_NATIVE=OFF -DGGML_CPU_ARM_ARCH=${GGML_CPU_ARM_ARCH}; \
19+
cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DGGML_NATIVE=OFF -DGGML_CPU_ARM_ARCH=${GGML_CPU_ARM_ARCH}; \
2020
else \
2121
echo "Unsupported architecture"; \
2222
exit 1; \

‎.devops/cuda.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ COPY . .
2121
RUN if [ "${CUDA_DOCKER_ARCH}" != "default" ]; then \
2222
export CMAKE_ARGS="-DCMAKE_CUDA_ARCHITECTURES=${CUDA_DOCKER_ARCH}"; \
2323
fi && \
24-
cmake -B build -DGGML_NATIVE=OFF -DGGML_CUDA=ON -DLLAMA_CURL=ON ${CMAKE_ARGS} -DCMAKE_EXE_LINKER_FLAGS=-Wl,--allow-shlib-undefined . && \
24+
cmake -B build -DGGML_NATIVE=OFF -DGGML_CUDA=ON ${CMAKE_ARGS} -DCMAKE_EXE_LINKER_FLAGS=-Wl,--allow-shlib-undefined . && \
2525
cmake --build build --config Release -j$(nproc)
2626

2727
RUN mkdir -p /app/lib && \

‎.devops/intel.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ RUN if [ "${GGML_SYCL_F16}" = "ON" ]; then \
1717
&& export OPT_SYCL_F16="-DGGML_SYCL_F16=ON"; \
1818
fi && \
1919
echo "Building with dynamic libs" && \
20-
cmake -B build -DGGML_NATIVE=OFF -DGGML_SYCL=ON -DCMAKE_C_COMPILER=icx -DCMAKE_CXX_COMPILER=icpx -DLLAMA_CURL=ON ${OPT_SYCL_F16} && \
20+
cmake -B build -DGGML_NATIVE=OFF -DGGML_SYCL=ON -DCMAKE_C_COMPILER=icx -DCMAKE_CXX_COMPILER=icpx ${OPT_SYCL_F16} && \
2121
cmake --build build --config Release -j$(nproc)
2222

2323
RUN mkdir -p /app/lib && \

‎.devops/musa.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ COPY . .
3535
RUN if [ "${MUSA_DOCKER_ARCH}" != "default" ]; then \
3636
export CMAKE_ARGS="-DMUSA_ARCHITECTURES=${MUSA_DOCKER_ARCH}"; \
3737
fi && \
38-
cmake -B build -DGGML_NATIVE=OFF -DGGML_MUSA=ON -DLLAMA_CURL=ON ${CMAKE_ARGS} -DCMAKE_EXE_LINKER_FLAGS=-Wl,--allow-shlib-undefined . && \
38+
cmake -B build -DGGML_NATIVE=OFF -DGGML_MUSA=ON ${CMAKE_ARGS} -DCMAKE_EXE_LINKER_FLAGS=-Wl,--allow-shlib-undefined . && \
3939
cmake --build build --config Release -j$(nproc)
4040

4141
RUN mkdir -p /app/lib && \

‎.devops/rocm.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ WORKDIR /app
4040
COPY . .
4141

4242
RUN HIPCXX="$(hipconfig -l)/clang" HIP_PATH="$(hipconfig -R)" \
43-
cmake -S . -B build -DGGML_HIP=ON -DAMDGPU_TARGETS=$ROCM_DOCKER_ARCH -DCMAKE_BUILD_TYPE=Release -DLLAMA_CURL=ON \
43+
cmake -S . -B build -DGGML_HIP=ON -DAMDGPU_TARGETS=$ROCM_DOCKER_ARCH -DCMAKE_BUILD_TYPE=Release \
4444
&& cmake --build build --config Release -j$(nproc)
4545

4646
RUN mkdir -p /app/lib \

‎.github/actions/windows-setup-curl/action.yml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: 'Windows - Setup CURL'
2+
description: 'Composite action, to be reused in other workflow'
3+
inputs:
4+
curl_version:
5+
description: 'CURL version'
6+
required: false
7+
default: '8.6.0_6'
8+
outputs:
9+
curl_path:
10+
description: "Path to the downloaded libcurl"
11+
value: ${{ steps.get_libcurl.outputs.curl_path }}
12+
13+
runs:
14+
using: "composite"
15+
steps:
16+
- name: libCURL
17+
id: get_libcurl
18+
shell: powershell
19+
env:
20+
CURL_VERSION: ${{ inputs.curl_version }}
21+
run: |
22+
curl.exe -o $env:RUNNER_TEMP/curl.zip -L "https://curl.se/windows/dl-${env:CURL_VERSION}/curl-${env:CURL_VERSION}-win64-mingw.zip"
23+
mkdir $env:RUNNER_TEMP/libcurl
24+
tar.exe -xvf $env:RUNNER_TEMP/curl.zip --strip-components=1 -C $env:RUNNER_TEMP/libcurl
25+
echo "curl_path=$env:RUNNER_TEMP/libcurl" >> $env:GITHUB_OUTPUT

‎.github/workflows/bench.yml.disabled

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@ jobs:
104104
cmake -B build \
105105
-DGGML_NATIVE=OFF \
106106
-DLLAMA_BUILD_SERVER=ON \
107-
-DLLAMA_CURL=ON \
108107
-DLLAMA_CUBLAS=ON \
109108
-DCUDAToolkit_ROOT=/usr/local/cuda \
110109
-DCMAKE_CUDA_COMPILER=/usr/local/cuda/bin/nvcc \

‎.github/workflows/build-linux-cross.yml

Lines changed: 124 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,124 @@
1+
name: Build on Linux using cross-compiler
2+
on:
3+
workflow_dispatch:
4+
workflow_call:
5+
6+
jobs:
7+
ubuntu-latest-riscv64-cpu-cross:
8+
runs-on: ubuntu-latest
9+
10+
steps:
11+
- uses: actions/checkout@v4
12+
- name: Setup Riscv
13+
run: |
14+
sudo dpkg --add-architecture riscv64
15+
sudo sed -i 's|http://azure.archive.ubuntu.com/ubuntu|http://ports.ubuntu.com/ubuntu-ports|g' \
16+
/etc/apt/sources.list /etc/apt/apt-mirrors.txt
17+
sudo apt-get clean
18+
sudo apt-get update
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+
libcurl4-openssl-dev:riscv64
24+
25+
- name: Build
26+
run: |
27+
cmake -B build -DCMAKE_BUILD_TYPE=Release \
28+
-DGGML_OPENMP=OFF \
29+
-DLLAMA_BUILD_EXAMPLES=ON \
30+
-DLLAMA_BUILD_TESTS=OFF \
31+
-DCMAKE_SYSTEM_NAME=Linux \
32+
-DCMAKE_SYSTEM_PROCESSOR=riscv64 \
33+
-DCMAKE_C_COMPILER=riscv64-linux-gnu-gcc-14 \
34+
-DCMAKE_CXX_COMPILER=riscv64-linux-gnu-g++-14 \
35+
-DCMAKE_POSITION_INDEPENDENT_CODE=ON \
36+
-DCMAKE_FIND_ROOT_PATH=/usr/lib/riscv64-linux-gnu \
37+
-DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER \
38+
-DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY \
39+
-DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=BOTH
40+
41+
cmake --build build --config Release -j $(nproc)
42+
43+
ubuntu-latest-riscv64-vulkan-cross:
44+
runs-on: ubuntu-latest
45+
46+
steps:
47+
- uses: actions/checkout@v4
48+
with:
49+
fetch-depth: 0
50+
51+
- name: Setup Riscv
52+
run: |
53+
sudo dpkg --add-architecture riscv64
54+
sudo sed -i 's|http://azure.archive.ubuntu.com/ubuntu|http://ports.ubuntu.com/ubuntu-ports|g' \
55+
/etc/apt/sources.list /etc/apt/apt-mirrors.txt
56+
sudo apt-get clean
57+
sudo apt-get update
58+
sudo apt-get install -y --no-install-recommends \
59+
build-essential \
60+
glslc \
61+
gcc-14-riscv64-linux-gnu \
62+
g++-14-riscv64-linux-gnu \
63+
libvulkan-dev:riscv64 \
64+
libcurl4-openssl-dev:riscv64
65+
66+
- name: Build
67+
run: |
68+
cmake -B build -DCMAKE_BUILD_TYPE=Release \
69+
-DGGML_VULKAN=ON \
70+
-DGGML_OPENMP=OFF \
71+
-DLLAMA_BUILD_EXAMPLES=ON \
72+
-DLLAMA_BUILD_TESTS=OFF \
73+
-DCMAKE_SYSTEM_NAME=Linux \
74+
-DCMAKE_SYSTEM_PROCESSOR=riscv64 \
75+
-DCMAKE_C_COMPILER=riscv64-linux-gnu-gcc-14 \
76+
-DCMAKE_CXX_COMPILER=riscv64-linux-gnu-g++-14 \
77+
-DCMAKE_POSITION_INDEPENDENT_CODE=ON \
78+
-DCMAKE_FIND_ROOT_PATH=/usr/lib/riscv64-linux-gnu \
79+
-DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER \
80+
-DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY \
81+
-DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=BOTH
82+
83+
cmake --build build --config Release -j $(nproc)
84+
85+
ubuntu-latest-arm64-vulkan-cross:
86+
runs-on: ubuntu-latest
87+
88+
steps:
89+
- uses: actions/checkout@v4
90+
with:
91+
fetch-depth: 0
92+
93+
- name: Setup Arm64
94+
run: |
95+
sudo dpkg --add-architecture arm64
96+
sudo sed -i 's|http://azure.archive.ubuntu.com/ubuntu|http://ports.ubuntu.com/ubuntu-ports|g' \
97+
/etc/apt/sources.list /etc/apt/apt-mirrors.txt
98+
sudo apt-get clean
99+
sudo apt-get update
100+
sudo apt-get install -y --no-install-recommends \
101+
build-essential \
102+
glslc \
103+
crossbuild-essential-arm64 \
104+
libvulkan-dev:arm64 \
105+
libcurl4-openssl-dev:arm64
106+
107+
- name: Build
108+
run: |
109+
cmake -B build -DCMAKE_BUILD_TYPE=Release \
110+
-DGGML_VULKAN=ON \
111+
-DGGML_OPENMP=OFF \
112+
-DLLAMA_BUILD_EXAMPLES=ON \
113+
-DLLAMA_BUILD_TESTS=OFF \
114+
-DCMAKE_SYSTEM_NAME=Linux \
115+
-DCMAKE_SYSTEM_PROCESSOR=aarch64 \
116+
-DCMAKE_C_COMPILER=aarch64-linux-gnu-gcc \
117+
-DCMAKE_CXX_COMPILER=aarch64-linux-gnu-g++ \
118+
-DCMAKE_POSITION_INDEPENDENT_CODE=ON \
119+
-DCMAKE_FIND_ROOT_PATH=/usr/lib/aarch64-linux-gnu \
120+
-DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER \
121+
-DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY \
122+
-DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=BOTH
123+
124+
cmake --build build --config Release -j $(nproc)

0 commit comments

Comments
 (0)