Skip to content

Commit 729effe

Browse files
committed
make : shim cmake
1 parent 1a1fcd3 commit 729effe

File tree

2 files changed

+16
-1100
lines changed

2 files changed

+16
-1100
lines changed

.github/workflows/build.yml

Lines changed: 12 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ jobs:
2828
-w /workspace ${{ env.ubuntu_image }} /bin/sh -c '
2929
set -e
3030
apt update
31-
apt install -y build-essential libsdl2-dev
32-
make
33-
make stream'
31+
apt install -y build-essential libsdl2-dev cmake
32+
cmake -B build
33+
cmake --build build --config Release -j $(nproc)'
3434
3535
macOS-latest:
3636
runs-on: macOS-latest
@@ -42,12 +42,12 @@ jobs:
4242
- name: Dependencies
4343
run: |
4444
brew update
45-
brew install sdl2
45+
brew install sdl2 cmake
4646
4747
- name: Build
4848
run: |
49-
make
50-
make stream
49+
cmake -B build
50+
cmake --build build --config Release
5151
5252
freeBSD-latest:
5353
runs-on: macos-12
@@ -63,9 +63,9 @@ jobs:
6363
version: '13.3'
6464
run: |
6565
sudo pkg update
66-
sudo pkg install -y gmake sdl2
67-
gmake
68-
gmake stream
66+
sudo pkg install -y gmake sdl2 cmake
67+
cmake -B build
68+
cmake --build build --config Release
6969
7070
ubuntu-latest-gcc:
7171
runs-on: ubuntu-latest
@@ -280,21 +280,6 @@ jobs:
280280
mingw-w64-${{matrix.env}}-SDL2
281281
mingw-w64-${{matrix.env}}-openblas
282282
283-
- name: Build using make
284-
shell: msys2 {0}
285-
run: |
286-
make -j $(nproc)
287-
288-
- name: Clean after building using make
289-
shell: msys2 {0}
290-
run: |
291-
make clean
292-
293-
- name: Build using make w/ OpenBLAS
294-
shell: msys2 {0}
295-
run: |
296-
make GGML_OPENBLAS=1 -j $(nproc)
297-
298283
- name: Build using CMake
299284
shell: msys2 {0}
300285
run: |
@@ -664,5 +649,6 @@ jobs:
664649
- name: Test quantize
665650
run: |
666651
./models/download-ggml-model.sh tiny.en
667-
make quantize
668-
./quantize models/ggml-tiny.en.bin models/ggml-tiny.en-q4_0.bin q4_0
652+
cmake -B build
653+
cmake --build build --config Release
654+
./build/bin/quantize models/ggml-tiny.en.bin models/ggml-tiny.en-q4_0.bin q4_0

0 commit comments

Comments
 (0)