@@ -292,11 +292,6 @@ jobs:
292292 "PATH=$env:PATH;$($HIP_PWSH.Replace('\', '/'))/bin" | Out-File -FilePath $env:GITHUB_ENV -Append
293293 shell : pwsh
294294
295- - name : windows-gpu install ninja and sqlite
296- if : matrix.name == 'windows-gpu'
297- run : choco install ninja sqlite -y
298- shell : pwsh
299-
300295 - name : cache intel oneapi toolkit
301296 if : matrix.name == 'windows-gpu'
302297 id : cache-oneapi
@@ -310,6 +305,11 @@ jobs:
310305 if : matrix.name == 'windows-gpu' && steps.cache-oneapi.outputs.cache-hit != 'true'
311306 run : modules/llama.cpp/scripts/install-oneapi.bat $WINDOWS_BASEKIT_URL $WINDOWS_DPCPP_MKL
312307
308+ - name : windows-gpu install ninja and sqlite
309+ if : matrix.name == 'windows-gpu'
310+ run : choco install ninja sqlite -y
311+ shell : pwsh
312+
313313 - name : cache llama.cpp build
314314 id : cache-llama
315315 uses : actions/cache@v4
@@ -384,14 +384,14 @@ jobs:
384384 run : make build/llama.cpp.stamp ${{ matrix.make && matrix.make || ''}}
385385
386386 - name : build whisper.cpp (sycl/msvc)
387- if : false # matrix.name == 'windows-sycl ' && steps.cache-whisper.outputs.cache-hit != 'true'
387+ if : false # matrix.name == 'windows-gpu ' && steps.cache-whisper.outputs.cache-hit != 'true'
388388 shell : cmd
389389 run : |
390390 call "C:\Program Files (x86)\Intel\oneAPI\setvars.bat" intel64 --force
391391 make build/whisper.cpp.stamp ${{ matrix.make && matrix.make || ''}}
392392
393393 - name : build whisper.cpp (cuda/hip/msvc)
394- if : false # ( matrix.name == 'windows-cuda' || matrix.name == 'windows-hip') && steps.cache-whisper.outputs.cache-hit != 'true'
394+ if : false # matrix.name == 'windows-gpu' && steps.cache-whisper.outputs.cache-hit != 'true'
395395 shell : cmd
396396 run : |
397397 call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
@@ -410,14 +410,14 @@ jobs:
410410 run : make build/whisper.cpp.stamp ${{ matrix.make && matrix.make || ''}}
411411
412412 - name : build miniaudio (sycl/msvc)
413- if : false # matrix.name == 'windows-sycl ' && steps.cache-miniaudio.outputs.cache-hit != 'true'
413+ if : false # matrix.name == 'windows-gpu ' && steps.cache-miniaudio.outputs.cache-hit != 'true'
414414 shell : cmd
415415 run : |
416416 call "C:\Program Files (x86)\Intel\oneAPI\setvars.bat" intel64 --force
417417 make build/miniaudio.stamp ${{ matrix.make && matrix.make || ''}}
418418
419419 - name : build miniaudio (cuda/hip/msvc)
420- if : false # ( matrix.name == 'windows-cuda' || matrix.name == 'windows-hip') && steps.cache-miniaudio.outputs.cache-hit != 'true'
420+ if : false # matrix.name == 'windows-gpu' && steps.cache-miniaudio.outputs.cache-hit != 'true'
421421 shell : cmd
422422 run : |
423423 call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
@@ -436,7 +436,7 @@ jobs:
436436 run : make build/miniaudio.stamp ${{ matrix.make && matrix.make || ''}}
437437
438438 - name : windows build sqlite-ai with cuda (msvc)
439- if : false # matrix.name == 'windows-cuda '
439+ if : false # matrix.name == 'windows-gpu '
440440 shell : cmd
441441 run : |
442442 setlocal enabledelayedexpansion
@@ -453,7 +453,7 @@ jobs:
453453 make extension ${{ matrix.make && matrix.make || ''}}
454454
455455 - name : windows build sqlite-ai with hip (clang)
456- if : false # matrix.name == 'windows-hip '
456+ if : false # matrix.name == 'windows-gpu '
457457 shell : cmd
458458 run : |
459459 set PATH=%HIP_PATH%\bin;%PATH%
@@ -464,7 +464,7 @@ jobs:
464464 HIP_PLATFORM : amd
465465
466466 - name : windows build sqlite-ai with sycl (msvc)
467- if : false # matrix.name == 'windows-sycl '
467+ if : false # matrix.name == 'windows-gpu '
468468 shell : cmd
469469 run : |
470470 call "C:\Program Files (x86)\Intel\oneAPI\setvars.bat" intel64 --force
@@ -510,7 +510,6 @@ jobs:
510510 $(make test PLATFORM=$PLATFORM ARCH=$ARCH -n)
511511 EOF
512512 # remove big unused folders to avoid emulator errors
513- rm -rf build modules
514513 echo "::endgroup::"
515514
516515 - name : android test sqlite-ai
@@ -522,11 +521,13 @@ jobs:
522521 script : |
523522 adb root
524523 adb remount
525- adb push ${{ github.workspace }}/. /data/local/tmp/
524+ adb push ${{ github.workspace }}/sqlite3 /data/local/tmp/
525+ adb push ${{ github.workspace }}/dist /data/local/tmp/
526+ adb push ${{ github.workspace }}/Makefile /data/local/tmp/
526527 adb shell "sh /data/local/tmp/commands.sh"
527528
528529 - name : windows test sqlite-ai (msvc)
529- if : false # matrix.name == 'windows-cuda' || matrix.name == 'windows-hip' || matrix.name == 'windows-sycl '
530+ if : false # matrix.name == 'windows-gpu '
530531 shell : cmd
531532 run : |
532533 setlocal enabledelayedexpansion
0 commit comments