Skip to content

Commit 182cf13

Browse files
committed
fix(build): simplify make commands for windows-gpu and remove unused build steps
1 parent ecf6dcc commit 182cf13

1 file changed

Lines changed: 3 additions & 7 deletions

File tree

.github/workflows/main.yml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,7 @@ jobs:
3434
- os: windows-latest
3535
arch: x86_64
3636
name: windows-gpu
37-
make: LLAMA="-DGGML_BACKEND_DL=ON -G \"Ninja Multi-Config\" -DGGML_NATIVE=OFF -DGGML_CPU=OFF -DGGML_CUDA=ON -DGGML_HIP=ON -DGGML_SYCL=ON"
38-
make-cuda: LLAMA_ARGS="--target ggml-cuda" LLAMA="-G \"Ninja Multi-Config\" -DGGML_BACKEND_DL=ON -DGGML_NATIVE=OFF -DGGML_CPU=OFF -DGGML_CUDA=ON"
39-
make-hip: LLAMA_ARGS="--target ggml-hip" LLAMA="-G \"Ninja\" -DGGML_BACKEND_DL=ON -DGGML_NATIVE=OFF -DGGML_CPU=OFF -DGGML_HIP=ON -DGGML_HIP_ROCWMMA_FATTN=ON -DAMDGPU_TARGETS=\"gfx1100;gfx1101;gfx1102;gfx1030;gfx1031;gfx1032\" -DCMAKE_C_COMPILER=\"%HIP_PATH%/bin/clang.exe\" -DCMAKE_CXX_COMPILER=\"%HIP_PATH%/bin/clang++.exe\" -DCMAKE_CXX_FLAGS=\"-I../../rocwmma/library/include/ -Wno-ignored-attributes -Wno-nested-anon-types\""
40-
make-sycl: LLAMA_ARGS="--target ggml-sycl" LLAMA="-G \"Ninja\" -DGGML_BACKEND_DL=ON -DCMAKE_C_COMPILER=cl -DCMAKE_CXX_COMPILER=icx -DGGML_NATIVE=OFF -DGGML_CPU=OFF -DGGML_SYCL=ON"
37+
make: LLAMA="-DGGML_BACKEND_DL=ON -DGGML_NATIVE=OFF -DGGML_CPU=OFF"
4138

4239
# Android builds
4340
- os: ubuntu-latest
@@ -306,16 +303,15 @@ jobs:
306303
ls -la build/llama.cpp/bin/
307304
fi
308305
309-
- name: build llama.cpp main library (msvc)
306+
- name: windows build llama.cpp
310307
if: matrix.name == 'windows-gpu' && steps.cache-llama.outputs.cache-hit != 'true'
311308
shell: cmd
312309
run: |
313-
call "C:\Program Files (x86)\Intel\oneAPI\setvars.bat" intel64
314310
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
315311
set "PATH=%VCToolsInstallDir%bin\Hostx64\x64;%WindowsSdkBinPath%x64;%PATH%"
316312
set "PATH=%PATH:C:\msys64\usr\bin;=%"
317313
set "PATH=%PATH:C:\msys64\mingw64\bin;=%"
318-
make build/llama.cpp.stamp ${{ matrix.make }}
314+
make build/llama.cpp.stamp ${{ matrix.make && matrix.make || ''}}
319315
320316
- name: copy backend modules to dist
321317
if: false #matrix.name == 'windows-gpu'

0 commit comments

Comments
 (0)