Skip to content

Commit aad5a77

Browse files
GioeeGioee
committed
fix(build): update Windows build conditions to use 'windows-latest' and disable 'windows-gpu' steps
1 parent 182cf13 commit aad5a77

1 file changed

Lines changed: 28 additions & 134 deletions

File tree

‎.github/workflows/main.yml‎

Lines changed: 28 additions & 134 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ jobs:
101101
echo "basekit-url=$BASEKIT_URL_HASH" >> $GITHUB_OUTPUT
102102
103103
- uses: msys2/setup-msys2@v2.27.0
104-
if: matrix.name == 'windows'
104+
if: matrix.os == 'windows-latest'
105105
with:
106106
msystem: mingw64
107107
install: >-
@@ -155,7 +155,7 @@ jobs:
155155
sudo apt-get install -y --no-install-recommends build-essential glslc crossbuild-essential-arm64 libvulkan-dev:arm64
156156
157157
- name: cache cuda toolkit
158-
if: matrix.name == 'windows-gpu'
158+
if: false #matrix.name == 'windows-gpu'
159159
id: cache-cuda
160160
uses: actions/cache@v4
161161
with:
@@ -164,13 +164,13 @@ jobs:
164164
key: cuda-${{ matrix.name }}-${{ matrix.os }}-${{ matrix.arch }}-${{ env.CUDA_VERSION }}
165165

166166
- name: windows install cuda
167-
if: matrix.name == 'windows-gpu' && steps.cache-cuda.outputs.cache-hit != 'true'
167+
if: false #matrix.name == 'windows-gpu' && steps.cache-cuda.outputs.cache-hit != 'true'
168168
uses: ./modules/llama.cpp/.github/actions/windows-setup-cuda
169169
with:
170170
cuda_version: ${{ env.CUDA_VERSION }}
171171

172172
- name: windows setup cuda toolkit
173-
if: matrix.name == 'windows-gpu'
173+
if: false #matrix.name == 'windows-gpu'
174174
run: |
175175
echo "C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v${{ env.CUDA_VERSION }}\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
176176
echo "C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v${{ env.CUDA_VERSION }}\libnvvp" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
@@ -179,7 +179,7 @@ jobs:
179179
shell: pwsh
180180

181181
- name: cache hip toolkit
182-
if: matrix.name == 'windows-gpu'
182+
if: false #matrix.name == 'windows-gpu'
183183
id: cache-hip
184184
uses: actions/cache@v4
185185
with:
@@ -189,7 +189,7 @@ jobs:
189189
key: hip-toolkit-${{ env.HIP_TOOLKIT_VERSION }}-rocwmma-${{ env.ROCWMMA_VERSION }}
190190

191191
- name: windows install hip toolkit
192-
if: matrix.name == 'windows-gpu' && steps.cache-hip.outputs.cache-hit != 'true'
192+
if: false #matrix.name == 'windows-gpu' && steps.cache-hip.outputs.cache-hit != 'true'
193193
run: |
194194
git clone https://github.com/rocm/rocwmma --branch rocm-${{ env.ROCWMMA_VERSION }} --depth 1
195195
$ErrorActionPreference = "Stop"
@@ -201,7 +201,7 @@ jobs:
201201
shell: pwsh
202202

203203
- name: setup hip environment
204-
if: matrix.name == 'windows-gpu'
204+
if: false #matrix.name == 'windows-gpu'
205205
run: |
206206
& 'C:\Program Files\AMD\ROCm\*\bin\clang.exe' --version
207207
$HIP_PWSH = "$(Resolve-Path 'C:\Program Files\AMD\ROCm\*\bin\clang.exe' | split-path | split-path)"
@@ -213,7 +213,7 @@ jobs:
213213
shell: pwsh
214214

215215
- name: cache intel oneapi toolkit
216-
if: matrix.name == 'windows-gpu'
216+
if: false #matrix.name == 'windows-gpu'
217217
id: cache-oneapi
218218
uses: actions/cache@v4
219219
with:
@@ -222,7 +222,7 @@ jobs:
222222
key: oneapi-${{ matrix.name }}-${{ matrix.os }}-${{ matrix.arch }}-${{ steps.submodule-hashes.outputs.dpcpp-mkl }}-${{ steps.submodule-hashes.outputs.basekit-url }}
223223

224224
- name: windows install intel oneapi toolkit for sycl
225-
if: matrix.name == 'windows-gpu' && steps.cache-oneapi.outputs.cache-hit != 'true'
225+
if: false #matrix.name == 'windows-gpu' && steps.cache-oneapi.outputs.cache-hit != 'true'
226226
run: modules/llama.cpp/scripts/install-oneapi.bat $WINDOWS_BASEKIT_URL $WINDOWS_DPCPP_MKL
227227

228228
- name: windows-gpu install ninja and sqlite
@@ -303,136 +303,52 @@ jobs:
303303
ls -la build/llama.cpp/bin/
304304
fi
305305
306-
- name: windows build llama.cpp
307-
if: matrix.name == 'windows-gpu' && steps.cache-llama.outputs.cache-hit != 'true'
308-
shell: cmd
309-
run: |
310-
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
311-
set "PATH=%VCToolsInstallDir%bin\Hostx64\x64;%WindowsSdkBinPath%x64;%PATH%"
312-
set "PATH=%PATH:C:\msys64\usr\bin;=%"
313-
set "PATH=%PATH:C:\msys64\mingw64\bin;=%"
314-
make build/llama.cpp.stamp ${{ matrix.make && matrix.make || ''}}
315-
316306
- name: copy backend modules to dist
317307
if: false #matrix.name == 'windows-gpu'
318308
shell: msys2 {0}
319309
run: |
320310
mkdir -p dist
321311
cp build/llama.cpp/bin/*.dll dist/ 2>/dev/null || echo "No backend DLLs found, continuing..."
322312
323-
- name: build llama.cpp (mingw/windows)
324-
if: matrix.name == 'windows' && steps.cache-llama.outputs.cache-hit != 'true'
313+
- name: windows build llama.cpp
314+
if: matrix.os == 'windows-latest' && steps.cache-llama.outputs.cache-hit != 'true'
325315
shell: msys2 {0}
326316
run: make build/llama.cpp.stamp ${{ matrix.make && matrix.make || ''}}
327317
env:
328318
VULKAN_SDK: "C:/msys64/mingw64"
329319

330-
- name: build llama.cpp (mingw/unix)
331-
if: contains(matrix.os, 'windows') == false && steps.cache-llama.outputs.cache-hit != 'true'
320+
- name: unix build llama.cpp
321+
if: matrix.os != 'windows-latest' && steps.cache-llama.outputs.cache-hit != 'true'
332322
run: make build/llama.cpp.stamp ${{ matrix.make && matrix.make || ''}}
333323

334-
- name: build whisper.cpp (sycl/msvc)
335-
if: false #matrix.name == 'windows-gpu' && steps.cache-whisper.outputs.cache-hit != 'true'
336-
shell: cmd
337-
run: |
338-
call "C:\Program Files (x86)\Intel\oneAPI\setvars.bat" intel64 --force
339-
make build/whisper.cpp.stamp ${{ matrix.make && matrix.make || ''}}
340-
341-
- name: build whisper.cpp (cuda/hip/msvc)
342-
if: false #matrix.name == 'windows-gpu' && steps.cache-whisper.outputs.cache-hit != 'true'
343-
shell: cmd
344-
run: |
345-
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
346-
set "PATH=%VCToolsInstallDir%bin\Hostx64\x64;%WindowsSdkBinPath%x64;%PATH%"
347-
set "PATH=%PATH:C:\msys64\usr\bin;=%"
348-
set "PATH=%PATH:C:\msys64\mingw64\bin;=%"
349-
make build/whisper.cpp.stamp ${{ matrix.make && matrix.make || ''}}
350-
351-
- name: build whisper.cpp (mingw/windows)
352-
if: matrix.name == 'windows' && steps.cache-whisper.outputs.cache-hit != 'true'
324+
- name: windows build whisper.cpp
325+
if: matrix.os == 'windows-latest' && steps.cache-whisper.outputs.cache-hit != 'true'
353326
shell: msys2 {0}
354327
run: make build/whisper.cpp.stamp ${{ matrix.make && matrix.make || ''}}
355328
env:
356329
VULKAN_SDK: "C:/msys64/mingw64"
357330

358-
- name: build whisper.cpp (mingw/unix)
359-
if: contains(matrix.os, 'windows') == false && steps.cache-whisper.outputs.cache-hit != 'true'
331+
- name: unix build whisper.cpp
332+
if: matrix.os != 'windows-latest' && steps.cache-whisper.outputs.cache-hit != 'true'
360333
run: make build/whisper.cpp.stamp ${{ matrix.make && matrix.make || ''}}
361334

362-
- name: build miniaudio (sycl/msvc)
363-
if: false #matrix.name == 'windows-gpu' && steps.cache-miniaudio.outputs.cache-hit != 'true'
364-
shell: cmd
365-
run: |
366-
call "C:\Program Files (x86)\Intel\oneAPI\setvars.bat" intel64 --force
367-
make build/miniaudio.stamp ${{ matrix.make && matrix.make || ''}}
368-
369-
- name: build miniaudio (cuda/hip/msvc)
370-
if: false #matrix.name == 'windows-gpu' && steps.cache-miniaudio.outputs.cache-hit != 'true'
371-
shell: cmd
372-
run: |
373-
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
374-
set "PATH=%VCToolsInstallDir%bin\Hostx64\x64;%WindowsSdkBinPath%x64;%PATH%"
375-
set "PATH=%PATH:C:\msys64\usr\bin;=%"
376-
set "PATH=%PATH:C:\msys64\mingw64\bin;=%"
377-
make build/miniaudio.stamp ${{ matrix.make && matrix.make || ''}}
378-
379-
- name: build miniaudio (mingw/windows)
380-
if: matrix.name == 'windows' && steps.cache-miniaudio.outputs.cache-hit != 'true'
335+
- name: windows build miniaudio
336+
if: matrix.os == 'windows-latest' && steps.cache-miniaudio.outputs.cache-hit != 'true'
381337
shell: msys2 {0}
382338
run: make build/miniaudio.stamp ${{ matrix.make && matrix.make || ''}}
383339

384-
- name: build miniaudio (mingw/unix)
385-
if: contains(matrix.os, 'windows') == false && steps.cache-miniaudio.outputs.cache-hit != 'true'
340+
- name: unix build miniaudio
341+
if: matrix.os != 'windows-latest' && steps.cache-miniaudio.outputs.cache-hit != 'true'
386342
run: make build/miniaudio.stamp ${{ matrix.make && matrix.make || ''}}
387343

388-
- name: windows build sqlite-ai with cuda (msvc)
389-
if: false #matrix.name == 'windows-gpu'
390-
shell: cmd
391-
run: |
392-
setlocal enabledelayedexpansion
393-
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
394-
set "PATH=%VCToolsInstallDir%bin\Hostx64\x64;%WindowsSdkBinPath%x64;%PATH%"
395-
set "PATH=%PATH:C:\msys64\usr\bin;=%"
396-
set "PATH=%PATH:C:\msys64\mingw64\bin;=%"
397-
echo CUDA_PATH=%CUDA_PATH%
398-
if not defined CUDA_PATH (
399-
set "CUDA_PATH=C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v${{ env.CUDA_VERSION }}"
400-
echo Set CUDA_PATH=!CUDA_PATH!
401-
)
402-
where link
403-
make extension ${{ matrix.make && matrix.make || ''}}
404-
405-
- name: windows build sqlite-ai with hip (clang)
406-
if: false #matrix.name == 'windows-gpu'
407-
shell: cmd
408-
run: |
409-
set PATH=%HIP_PATH%\bin;%PATH%
410-
set CC=%HIP_PATH%\bin\clang.exe
411-
set CXX=%HIP_PATH%\bin\clang++.exe
412-
make extension ${{ matrix.make && matrix.make || ''}}
413-
env:
414-
HIP_PLATFORM: amd
415-
416-
- name: windows build sqlite-ai with sycl (msvc)
417-
if: false #matrix.name == 'windows-gpu'
418-
shell: cmd
419-
run: |
420-
call "C:\Program Files (x86)\Intel\oneAPI\setvars.bat" intel64 --force
421-
make extension ${{ matrix.make && matrix.make || ''}}
422-
423-
- name: windows build sqlite-ai (gpu/mingw)
424-
if: matrix.name == 'windows-gpu'
425-
shell: msys2 {0}
426-
run: make extension ${{ matrix.make }}
427-
428-
- name: windows build sqlite-ai (mingw)
429-
if: matrix.name == 'windows'
344+
- name: windows build sqlite-ai
345+
if: matrix.os == 'windows-latest'
430346
run: make extension ${{ matrix.make && matrix.make || ''}}
431347
shell: msys2 {0}
432348
env:
433349
VULKAN_SDK: "C:/msys64/mingw64"
434350

435-
- name: build sqlite-ai
351+
- name: unix build sqlite-ai
436352
if: matrix.os != 'windows-latest'
437353
run: make extension ${{ matrix.make && matrix.make || ''}}
438354

@@ -484,36 +400,14 @@ jobs:
484400
adb push ${{ github.workspace }}/Makefile /data/local/tmp/
485401
adb shell "sh /data/local/tmp/commands.sh"
486402
487-
- name: windows test sqlite-ai (msvc)
488-
if: false #matrix.name == 'windows-gpu'
489-
shell: cmd
490-
run: |
491-
setlocal enabledelayedexpansion
492-
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
493-
if "${{ matrix.name }}" == "windows-cuda" (
494-
if not defined CUDA_PATH (
495-
set "CUDA_PATH=C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v${{ env.CUDA_VERSION }}"
496-
)
497-
set "PATH=!CUDA_PATH!\bin;%PATH%"
498-
)
499-
if "${{ matrix.name }}" == "windows-sycl" (
500-
if exist "%ONEAPI_ROOT%\setvars.bat" (
501-
call "%ONEAPI_ROOT%\setvars.bat"
502-
)
503-
)
504-
set "PATH=%VCToolsInstallDir%bin\Hostx64\x64;%WindowsSdkBinPath%x64;%PATH%"
505-
set "PATH=%PATH:C:\msys64\usr\bin;=%"
506-
set "PATH=%PATH:C:\msys64\mingw64\bin;=%"
507-
make test ${{ matrix.make && matrix.make || ''}}
508-
509-
- name: windows test sqlite-ai (mingw)
510-
if: matrix.name == 'windows'
403+
- name: windows test sqlite-ai
404+
if: matrix.os == 'windows-latest'
511405
run: make test ${{ matrix.make && matrix.make || ''}}
512406
shell: msys2 {0}
513407
env:
514408
VULKAN_SDK: "C:/msys64/mingw64"
515409

516-
- name: test sqlite-ai
410+
- name: unix test sqlite-ai
517411
if: matrix.name == 'linux' || matrix.name == 'macos'
518412
run: make test
519413

@@ -522,7 +416,7 @@ jobs:
522416
with:
523417
name: ai-${{ matrix.name }}${{ matrix.arch && format('-{0}', matrix.arch) || '' }}
524418
path: dist/ai.*
525-
#if-no-files-found: error
419+
if-no-files-found: error
526420

527421
release:
528422
runs-on: ubuntu-latest

0 commit comments

Comments
 (0)