fix: Try alternative windows build method

Author: CodeWithKyrian

.github/workflows/all-platform-build.yml

@@ -30,6 +30,13 @@ jobs:
           apt-get update
           apt-get install -y cmake build-essential
 
+      - name: Install CUDA Toolkit
+        id: cuda-toolkit
+        uses: Jimver/cuda-toolkit@v0.2.11
+        with:
+          cuda: '12.5.0'
+          method: 'network'
+
       - name: Build Linux CUDA Libraries
         run: make linux_cuda
 

.github/workflows/linux-cuda-build.yml

@@ -1,4 +1,4 @@
-name: Build Whisper.cpp
+name: Windows Cuda Build
 on:
   workflow_dispatch:
     inputs:
@@ -9,35 +9,6 @@ on:
   workflow_call:
 
 jobs:
-#  build-windows:
-#    name: Build for Windows (x86_64)
-#    runs-on: windows-latest
-#    steps:
-#      - name: Checkout repository
-#        uses: actions/checkout@v4
-#
-#      - name: Checkout whisper.cpp
-#        uses: actions/checkout@v4
-#        with:
-#          repository: ggerganov/whisper.cpp
-#          ref: ${{ github.event.inputs.version }}
-#          path: whisper.cpp
-#
-#      - name: Add msbuild to PATH
-#        uses: microsoft/setup-msbuild@v1
-#
-#      - name: Run build script
-#        run: |
-#          .\scripts\build.bat cpu ${{ github.workspace }}\whisper.cpp\
-#          cd ${{ github.workspace }}\whisper.cpp\build\bin\Release
-#          ren whisper.dll libwhisper.dll
-#
-#      - name: Upload Windows Build Artifacts
-#        uses: actions/upload-artifact@v4
-#        with:
-#          name: windows-build
-#          path: whisper.cpp/build/bin/Release/libwhisper.dll
-
   build-windows-cuda:
     name: Build for Windows (x86_64, CUDA)
     runs-on: windows-latest

.github/workflows/build.yml .github/workflows/windows-cuda-build.yml.github/workflows/build.yml renamed to .github/workflows/windows-cuda-build.yml

@@ -0,0 +1,42 @@
+name: Windows Native Build
+on:
+  workflow_dispatch:
+    inputs:
+      version:
+        description: 'Whisper.cpp tag, branch or commit to build'
+        default: v1.7.2
+
+  workflow_call:
+
+jobs:
+  build-windows:
+    name: Build for Windows (x86_64)
+    runs-on: windows-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Checkout whisper.cpp
+        uses: actions/checkout@v4
+        with:
+          repository: ggerganov/whisper.cpp
+          ref: ${{ github.event.inputs.version }}
+          path: whisper.cpp
+
+      - name: Add msbuild to PATH
+        uses: microsoft/setup-msbuild@v1
+
+#      - name: Run build script
+#        run: |
+#          .\scripts\build.bat cpu ${{ github.workspace }}\whisper.cpp\
+#          cd ${{ github.workspace }}\whisper.cpp\build\bin\Release
+#          ren whisper.dll libwhisper.dll
+      - name: Build Windows Native Libraries
+        run: make windows
+
+      - name: Upload Windows Build Artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: windows-build
+#          path: whisper.cpp/build/bin/Release/libwhisper.dll
+          path: runtimes/windows-*/*

.github/workflows/windows-native-build.yml

@@ -51,10 +51,12 @@ define windows_build
 	$(eval ARCH := $(1))
 	$(eval BUILD_PATH := $(BUILD_DIR)/windows-$(ARCH)$(2))
 	$(eval EXTRA_FLAGS := $(3))
-	rm -rf $(BUILD_PATH)
-	$(CMAKE) -S $(WHISPER_CPP_DIR) -B $(BUILD_PATH) -DCMAKE_SYSTEM_NAME=Windows -DCMAKE_SYSTEM_PROCESSOR=$(ARCH) $(CMAKE_COMMON_PARAMS) $(EXTRA_FLAGS)
-	cd $(BUILD_PATH)
-	msbuild ALL_BUILD.vcxproj -t:build -p:configuration=Release -p:platform=$(ARCH)
+	if exist "$(BUILD_PATH)" rmdir /s /q "$(BUILD_PATH)"
+	$(CMAKE) -S $(WHISPER_CPP_DIR) -B $(BUILD_PATH) -A $(ARCH) $(CMAKE_COMMON_PARAMS) $(EXTRA_FLAGS)
+	cd "$(BUILD_PATH)" && msbuild ALL_BUILD.vcxproj -t:build -p:configuration=Release -p:platform=x64
+	if not exist "$(RUNTIME_DIR)\windows-$(TARGET)" mkdir "$(RUNTIME_DIR)\windows-$(TARGET)"
+	copy "$(BUILD_PATH)\src\Release\whisper.dll" "$(RUNTIME_DIR)\windows-$(TARGET)\"
+	copy "$(BUILD_PATH)\ggml\src\Release\ggml.dll" "$(RUNTIME_DIR)\windows-$(TARGET)\"
 endef
 
 # Linux build targets
@@ -102,7 +104,7 @@ windows_%:
 windows_cuda: $(addprefix windows_cuda_,$(WINDOWS_ARCHS))
 windows_cuda_%:
 	$(eval ARCH := $(subst windows_cuda_,,$@))
-	$(call windows_build,$(ARCH),_cuda,$(AVX_FLAGS) -DGGML_CUDA=ON -DWHISPER_CUBLAS=ON)
+	$(call windows_build,$(ARCH),_cuda,$(AVX_FLAGS) -DGGML_CUDA=ON)
 
 # Clean build artifacts
 .PHONY: clean

Makefile

@@ -13,7 +13,6 @@ goto commonexit
 :cpu
 	echo Starting building cpu target...
 	cd %whisper_path%
-	echo %whisper_path%
 	rmdir .\build /s /q
 	cmake -S . -B ./build -A x64 -DCMAKE_BUILD_TYPE=Release -DWHISPER_BUILD_TESTS=OFF -DWHISPER_BUILD_EXAMPLES=OFF