Skip to content

Commit 2e4085b

Browse files
committed
Merge branch 'master' of github.com:riseproject-dev/llama.cpp into 10x/rvv-floating-kernels
2 parents 5a8944a + 2376b77 commit 2e4085b

File tree

139 files changed

+60568
-25810
lines changed

Some content is hidden

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

139 files changed

+60568
-25810
lines changed

.devops/cann.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ RUN source /usr/local/Ascend/ascend-toolkit/set_env.sh --force \
4949
# -- Organize build artifacts for copying in later stages --
5050
# Create a lib directory to store all .so files
5151
RUN mkdir -p /app/lib && \
52-
find build -name "*.so" -exec cp {} /app/lib \;
52+
find build -name "*.so*" -exec cp -P {} /app/lib \;
5353

5454
# Create a full directory to store all executables and Python scripts
5555
RUN mkdir -p /app/full && \

.devops/cpu.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ RUN if [ "$TARGETARCH" = "amd64" ] || [ "$TARGETARCH" = "arm64" ]; then \
2020
cmake --build build -j $(nproc)
2121

2222
RUN mkdir -p /app/lib && \
23-
find build -name "*.so" -exec cp {} /app/lib \;
23+
find build -name "*.so*" -exec cp -P {} /app/lib \;
2424

2525
RUN mkdir -p /app/full \
2626
&& cp build/bin/* /app/full \

.devops/cuda.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ RUN if [ "${CUDA_DOCKER_ARCH}" != "default" ]; then \
2525
cmake --build build --config Release -j$(nproc)
2626

2727
RUN mkdir -p /app/lib && \
28-
find build -name "*.so" -exec cp {} /app/lib \;
28+
find build -name "*.so*" -exec cp -P {} /app/lib \;
2929

3030
RUN mkdir -p /app/full \
3131
&& cp build/bin/* /app/full \

.devops/intel.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ RUN if [ "${GGML_SYCL_F16}" = "ON" ]; then \
2121
cmake --build build --config Release -j$(nproc)
2222

2323
RUN mkdir -p /app/lib && \
24-
find build -name "*.so" -exec cp {} /app/lib \;
24+
find build -name "*.so*" -exec cp -P {} /app/lib \;
2525

2626
RUN mkdir -p /app/full \
2727
&& cp build/bin/* /app/full \

.devops/musa.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ RUN if [ "${MUSA_DOCKER_ARCH}" != "default" ]; then \
3232
cmake --build build --config Release -j$(nproc)
3333

3434
RUN mkdir -p /app/lib && \
35-
find build -name "*.so" -exec cp {} /app/lib \;
35+
find build -name "*.so*" -exec cp -P {} /app/lib \;
3636

3737
RUN mkdir -p /app/full \
3838
&& cp build/bin/* /app/full \

.devops/rocm.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ RUN HIPCXX="$(hipconfig -l)/clang" HIP_PATH="$(hipconfig -R)" \
4545
&& cmake --build build --config Release -j$(nproc)
4646

4747
RUN mkdir -p /app/lib \
48-
&& find build -name "*.so" -exec cp {} /app/lib \;
48+
&& find build -name "*.so*" -exec cp -P {} /app/lib \;
4949

5050
RUN mkdir -p /app/full \
5151
&& cp build/bin/* /app/full \

.devops/vulkan.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ RUN cmake -B build -DGGML_NATIVE=OFF -DGGML_VULKAN=ON -DLLAMA_BUILD_TESTS=OFF -D
2020
cmake --build build --config Release -j$(nproc)
2121

2222
RUN mkdir -p /app/lib && \
23-
find build -name "*.so" -exec cp {} /app/lib \;
23+
find build -name "*.so*" -exec cp -P {} /app/lib \;
2424

2525
RUN mkdir -p /app/full \
2626
&& cp build/bin/* /app/full \

.github/copilot-instructions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ llama.cpp is a large-scale C/C++ project for efficient LLM (Large Language Model
99
- **Size**: ~200k+ lines of code across 1000+ files
1010
- **Architecture**: Modular design with main library (`libllama`) and 40+ executable tools/examples
1111
- **Core dependency**: ggml tensor library (vendored in `ggml/` directory)
12-
- **Backends supported**: CPU (AVX/NEON optimized), CUDA, Metal, Vulkan, SYCL, ROCm, MUSA
12+
- **Backends supported**: CPU (AVX/NEON/RVV optimized), CUDA, Metal, Vulkan, SYCL, ROCm, MUSA
1313
- **License**: MIT
1414

1515
## Build Instructions

.github/workflows/build-amd.yml

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

.github/workflows/build.yml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1599,6 +1599,34 @@ jobs:
15991599
run: |
16001600
bash ./ci/run.sh ~/results/llama.cpp /mnt/llama.cpp
16011601
1602+
ggml-ci-x64-amd-vulkan:
1603+
runs-on: [self-hosted, Linux, X64, AMD]
1604+
1605+
steps:
1606+
- name: Clone
1607+
id: checkout
1608+
uses: actions/checkout@v4
1609+
1610+
- name: Test
1611+
id: ggml-ci
1612+
run: |
1613+
vulkaninfo --summary
1614+
GG_BUILD_VULKAN=1 bash ./ci/run.sh ~/results/llama.cpp /mnt/llama.cpp
1615+
1616+
ggml-ci-x64-amd-rocm:
1617+
runs-on: [self-hosted, Linux, X64, AMD]
1618+
1619+
steps:
1620+
- name: Clone
1621+
id: checkout
1622+
uses: actions/checkout@v4
1623+
1624+
- name: Test
1625+
id: ggml-ci
1626+
run: |
1627+
amd-smi static
1628+
GG_BUILD_ROCM=1 GG_BUILD_AMDGPU_TARGETS="gfx1101" bash ./ci/run.sh ~/results/llama.cpp /mnt/llama.cpp
1629+
16021630
ggml-ci-mac-metal:
16031631
runs-on: [self-hosted, macOS, ARM64]
16041632

0 commit comments

Comments
 (0)