File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -221,13 +221,10 @@ jobs:
221221 run : choco install ninja
222222 shell : pwsh
223223
224- - name : windows build sqlite-ai with cuda
224+ - name : windows build ggml- cuda
225225 if : matrix.name == 'windows-cuda'
226- run : |
227- call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
228- set CMAKE_GENERATOR=Ninja
229- D:\a\_temp\msys64\usr\bin\make.exe extension ${{ matrix.make && matrix.make || ''}}
230- shell : cmd
226+ run : make build/llama.cpp.stamp LLAMA="-G \"Ninja Multi-Config\" -DGGML_NATIVE=OFF -DGGML_CPU=OFF -DGGML_CUDA=ON" LLAMA_ARGS="--target ggml-cuda"
227+ shell : pwsh
231228
232229 - name : windows install hip toolkit
233230 if : matrix.name == 'windows-hip'
Original file line number Diff line number Diff line change @@ -224,23 +224,27 @@ test: $(TARGET)
224224
225225# Build submodules
226226ifeq ($(PLATFORM ) ,windows)
227- ARGS = --parallel $(CPUS )
227+ ifneq (,$(findstring Ninja,$(LLAMA)))
228+ ARGS = -j $(CPUS )
229+ else
230+ ARGS = --parallel $(CPUS )
231+ endif
228232else
229233 ARGS = -- -j$(CPUS )
230234endif
231235build/llama.cpp.stamp :
232236 cmake -B $(BUILD_LLAMA ) $(LLAMA_OPTIONS ) $(LLAMA_DIR )
233- cmake --build $(BUILD_LLAMA ) --config Release $(ARGS )
237+ cmake --build $(BUILD_LLAMA ) --config Release $(LLAMA_ARGS ) $( ARGS )
234238 touch $@
235239
236240build/whisper.cpp.stamp :
237241 cmake -B $(BUILD_WHISPER ) $(WHISPER_OPTIONS ) $(WHISPER_DIR )
238- cmake --build $(BUILD_WHISPER ) --config Release $(ARGS )
242+ cmake --build $(BUILD_WHISPER ) --config Release $(WHISPER_ARGS ) $( ARGS )
239243 touch $@
240244
241245build/miniaudio.stamp :
242246 cmake -B $(BUILD_MINIAUDIO ) $(MINIAUDIO_OPTIONS ) $(MINIAUDIO_DIR )
243- cmake --build $(BUILD_MINIAUDIO ) --config Release $(ARGS )
247+ cmake --build $(BUILD_MINIAUDIO ) --config Release $(MINIAUDIO_ARGS ) $( ARGS )
244248 touch $@
245249
246250$(LLAMA_LIBS ) : build/llama.cpp.stamp
You can’t perform that action at this time.
0 commit comments