www

sandrohanea · Nov 26, 2024 · 2f9933b · 2f9933b
1 parent d44b024
commit 2f9933b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/.github/workflows/linux-vulkan-native-build.yml b/.github/workflows/linux-vulkan-native-build.yml
@@ -28,6 +28,11 @@ jobs:
           install_runtime: true
           cache: true
           stripdown: true
+
+      - name: Set Vulkan variables
+        run: |
+          echo "$(VULKAN_SDK)/x86_64/bin" >> $GITHUB_PATH
+          echo "$(VULKAN_SDK)/x86_64/bin" >> $GITHUB_PATH
           
       - name: Run linux
         run: |

diff --git a/Makefile b/Makefile
@@ -116,10 +116,7 @@ linux_x64_openvino:
 
 linux_x64_vulkan:
 	rm -rf build/linux-x64-vulkan
-	sh "$(VULKAN_SDK)/setup-env.sh"  && \
-	export PATH="/home/runner/work/whisper.net/whisper.net/build/linux-x64-vulkan/whisper.cpp/bin:$(VULKAN_SDK)/x86_64/bin:$(PATH)"  && \
-	echo "$(PATH)"  && \
-	cmake -S . -B build/linux-x64-vulkan -DCMAKE_C_COMPILER=x86_64-linux-gnu-gcc -DCMAKE_CXX_COMPILER=x86_64-linux-gnu-g++ -DCMAKE_SYSTEM_NAME=Linux -DCMAKE_SYSTEM_PROCESSOR=x86_64 -DGGML_VULKAN=ON -DVulkan_INCLUDE_DIR="$(VULKAN_SDK)/x86_64/include" -DVulkan_LIBRARY="$(VULKAN_SDK)/x86_64/lib/libvulkan.so" $(AVX_SUPPORT)
+	cmake -S . -B build/linux-x64-vulkan -DCMAKE_C_COMPILER=x86_64-linux-gnu-gcc -DCMAKE_CXX_COMPILER=x86_64-linux-gnu-g++ -DCMAKE_SYSTEM_NAME=Linux -DCMAKE_SYSTEM_PROCESSOR=x86_64 -DGGML_VULKAN=ON -DVulkan_INCLUDE_DIR="$(VULKAN_SDK)/x86_64/include" -DVulkan_LIBRARY="$(VULKAN_SDK)/x86_64/lib/libvulkan.so" $(AVX_SUPPORT) 
 	cmake --build build/linux-x64-vulkan --config $(BUILD_TYPE)
 	mkdir -p runtimes/Whisper.net.Runtime.Vulkan/linux-x64
 	echo 'LDD VERSION'