Skip to content

Commit 8648c52

Browse files
ggerganovslaren
andauthored
make : deprecate (ggml-org#10514)
* make : deprecate ggml-ci * ci : disable Makefile builds ggml-ci * docs : remove make references [no ci] * ci : disable swift build ggml-ci * docs : remove obsolete make references, scripts, examples ggml-ci * basic fix for compare-commits.sh * update build.md * more build.md updates * more build.md updates * more build.md updates * Update Makefile Co-authored-by: Diego Devesa <[email protected]> --------- Co-authored-by: slaren <[email protected]>
1 parent 64ed209 commit 8648c52

File tree

11 files changed

+138
-1010
lines changed

11 files changed

+138
-1010
lines changed

.github/workflows/build.yml

Lines changed: 29 additions & 134 deletions
Original file line numberDiff line numberDiff line change
@@ -160,66 +160,6 @@ jobs:
160160
path: llama-${{ steps.tag.outputs.name }}-bin-macos-x64.zip
161161
name: llama-bin-macos-x64.zip
162162

163-
ubuntu-focal-make:
164-
runs-on: ubuntu-20.04
165-
env:
166-
LLAMA_NODE_AVAILABLE: true
167-
LLAMA_PYTHON_AVAILABLE: true
168-
169-
steps:
170-
- name: Clone
171-
id: checkout
172-
uses: actions/checkout@v4
173-
174-
- name: Dependencies
175-
id: depends
176-
run: |
177-
sudo apt-get update
178-
sudo apt-get install build-essential gcc-8
179-
180-
- uses: actions/setup-node@v4
181-
with:
182-
node-version: "20"
183-
184-
- uses: actions/setup-python@v5
185-
with:
186-
python-version: "3.11"
187-
188-
- name: Build
189-
id: make_build
190-
env:
191-
LLAMA_FATAL_WARNINGS: 1
192-
run: |
193-
CC=gcc-8 make -j $(nproc)
194-
195-
- name: Test
196-
id: make_test
197-
run: |
198-
CC=gcc-8 make tests -j $(nproc)
199-
make test -j $(nproc)
200-
201-
ubuntu-focal-make-curl:
202-
runs-on: ubuntu-20.04
203-
204-
steps:
205-
- name: Clone
206-
id: checkout
207-
uses: actions/checkout@v4
208-
209-
- name: Dependencies
210-
id: depends
211-
run: |
212-
sudo apt-get update
213-
sudo apt-get install build-essential gcc-8 libcurl4-openssl-dev
214-
215-
- name: Build
216-
id: make_build
217-
env:
218-
LLAMA_FATAL_WARNINGS: 1
219-
LLAMA_CURL: 1
220-
run: |
221-
CC=gcc-8 make -j $(nproc)
222-
223163
ubuntu-latest-cmake:
224164
runs-on: ubuntu-latest
225165

@@ -517,36 +457,6 @@ jobs:
517457
cmake -DGGML_SYCL=ON -DCMAKE_C_COMPILER=icx -DCMAKE_CXX_COMPILER=icpx -DGGML_SYCL_F16=ON ..
518458
cmake --build . --config Release -j $(nproc)
519459
520-
# TODO: build with GGML_NO_METAL because test-backend-ops fail on "Apple Paravirtual device" and I don't know
521-
# how to debug it.
522-
# ref: https://github.com/ggerganov/llama.cpp/actions/runs/7131777249/job/19420981052#step:5:1124
523-
macOS-latest-make:
524-
runs-on: macos-latest
525-
526-
steps:
527-
- name: Clone
528-
id: checkout
529-
uses: actions/checkout@v4
530-
531-
- name: Dependencies
532-
id: depends
533-
continue-on-error: true
534-
run: |
535-
brew update
536-
537-
- name: Build
538-
id: make_build
539-
env:
540-
LLAMA_FATAL_WARNINGS: 1
541-
run: |
542-
GGML_NO_METAL=1 make -j $(sysctl -n hw.logicalcpu)
543-
544-
- name: Test
545-
id: make_test
546-
run: |
547-
GGML_NO_METAL=1 make tests -j $(sysctl -n hw.logicalcpu)
548-
GGML_NO_METAL=1 make test -j $(sysctl -n hw.logicalcpu)
549-
550460
# TODO: build with GGML_METAL=OFF because test-backend-ops fail on "Apple Paravirtual device" and I don't know
551461
# how to debug it.
552462
# ref: https://github.com/ggerganov/llama.cpp/actions/runs/7132125951/job/19422043567?pr=4359#step:5:6584
@@ -642,33 +552,35 @@ jobs:
642552
-DCMAKE_XCODE_ATTRIBUTE_DEVELOPMENT_TEAM=ggml
643553
cmake --build . --config Release -j $(sysctl -n hw.logicalcpu) -- CODE_SIGNING_ALLOWED=NO
644554
645-
macOS-latest-swift:
646-
runs-on: macos-latest
647-
648-
strategy:
649-
matrix:
650-
destination: ['generic/platform=macOS', 'generic/platform=iOS', 'generic/platform=tvOS']
651-
652-
steps:
653-
- name: Clone
654-
id: checkout
655-
uses: actions/checkout@v4
656-
657-
- name: Dependencies
658-
id: depends
659-
continue-on-error: true
660-
run: |
661-
brew update
662-
663-
- name: xcodebuild for swift package
664-
id: xcodebuild
665-
run: |
666-
xcodebuild -scheme llama -destination "${{ matrix.destination }}"
667-
668-
- name: Build Swift Example
669-
id: make_build_swift_example
670-
run: |
671-
make swift
555+
# TODO: tmp disabled. see for possible re-enable:
556+
# https://github.com/ggerganov/llama.cpp/pull/10525
557+
# macOS-latest-swift:
558+
# runs-on: macos-latest
559+
#
560+
# strategy:
561+
# matrix:
562+
# destination: ['generic/platform=macOS', 'generic/platform=iOS', 'generic/platform=tvOS']
563+
#
564+
# steps:
565+
# - name: Clone
566+
# id: checkout
567+
# uses: actions/checkout@v4
568+
#
569+
# - name: Dependencies
570+
# id: depends
571+
# continue-on-error: true
572+
# run: |
573+
# brew update
574+
#
575+
# - name: xcodebuild for swift package
576+
# id: xcodebuild
577+
# run: |
578+
# xcodebuild -scheme llama -destination "${{ matrix.destination }}"
579+
#
580+
# - name: Build Swift Example
581+
# id: make_build_swift_example
582+
# run: |
583+
# make swift
672584

673585
windows-msys2:
674586
runs-on: windows-latest
@@ -695,21 +607,6 @@ jobs:
695607
mingw-w64-${{matrix.env}}-cmake
696608
mingw-w64-${{matrix.env}}-openblas
697609
698-
- name: Build using make
699-
shell: msys2 {0}
700-
run: |
701-
make -j $(nproc)
702-
703-
- name: Clean after building using make
704-
shell: msys2 {0}
705-
run: |
706-
make clean
707-
708-
- name: Build using make w/ OpenBLAS
709-
shell: msys2 {0}
710-
run: |
711-
make GGML_OPENBLAS=1 -j $(nproc)
712-
713610
- name: Build using CMake
714611
shell: msys2 {0}
715612
run: |
@@ -1257,9 +1154,7 @@ jobs:
12571154
runs-on: ubuntu-latest
12581155

12591156
needs:
1260-
- ubuntu-focal-make
12611157
- ubuntu-latest-cmake
1262-
- macOS-latest-make
12631158
- macOS-latest-cmake
12641159
- windows-latest-cmake
12651160
- windows-2019-cmake-cuda

Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
ifndef LLAMA_MAKEFILE
2+
$(error The Makefile build is deprecated. Use the CMake build instead. For more details, see https://github.com/ggerganov/llama.cpp/blob/master/docs/build.md)
3+
endif
4+
15
# Define the default target now so that it is always the first target
26
BUILD_TARGETS = \
37
libllava.a \

docs/backend/BLIS.md

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,6 @@ We recommend using openmp since it's easier to modify the cores being used.
2727

2828
### llama.cpp compilation
2929

30-
Makefile:
31-
32-
```bash
33-
make GGML_BLIS=1 -j
34-
# make GGML_BLIS=1 llama-benchmark-matmult
35-
```
36-
3730
CMake:
3831

3932
```bash

0 commit comments

Comments
 (0)