Skip to content
This repository was archived by the owner on Jul 4, 2025. It is now read-only.

Commit 97558c6

Browse files
hiento09hiento09
authored
Fix: vulkan flag while buiding on linux and mac intel (#443)
Co-authored-by: Hien To <tominhhien97@gmail.com>
1 parent 03a6cc1 commit 97558c6

File tree

1 file changed

+104
-104
lines changed

1 file changed

+104
-104
lines changed

‎.github/workflows/build.yml‎

Lines changed: 104 additions & 104 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ jobs:
153153
154154
- name: Upload Artifact
155155
uses: actions/upload-artifact@v2
156-
if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'
156+
if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' || github.event_name == 'pull_request'
157157
with:
158158
name: nitro-linux-amd64
159159
path: ./nitro
@@ -210,7 +210,7 @@ jobs:
210210
ldd --version
211211
./install_deps.sh
212212
mkdir build && cd build
213-
cmake -DLLAMA_NATIVE=OFF -DLLAMA_VULKAN=OFF -DNITRO_VERSION=${{ needs.set-nitro-version.outputs.version }} ..
213+
cmake -DLLAMA_NATIVE=OFF -DLLAMA_VULKAN=ON -DNITRO_VERSION=${{ needs.set-nitro-version.outputs.version }} ..
214214
make -j $(nproc)
215215
ls -la
216216
@@ -223,26 +223,26 @@ jobs:
223223
224224
- name: Upload Artifact
225225
uses: actions/upload-artifact@v2
226-
if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'
226+
if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' || github.event_name == 'pull_request'
227227
with:
228-
name: nitro-linux-amd64
228+
name: nitro-linux-amd64-vulkan
229229
path: ./nitro
230230

231-
- name: Run e2e testing - LLama.CPP
232-
shell: bash
233-
run: |
234-
# run e2e testing
235-
cd nitro
236-
chmod +x ../.github/scripts/e2e-test-llama-linux-and-mac.sh && ../.github/scripts/e2e-test-llama-linux-and-mac.sh ./nitro ${{ env.LLM_MODEL_URL }}
237-
rm -rf uploads/
238-
239-
- name: Run e2e testing - Whisper.CPP
240-
shell: bash
241-
run: |
242-
# run e2e testing
243-
cd nitro
244-
chmod +x ../.github/scripts/e2e-test-whisper-linux-and-mac.sh && ../.github/scripts/e2e-test-whisper-linux-and-mac.sh ./nitro ${{ env.WHISPER_MODEL_URL }}
245-
rm -rf uploads/
231+
# - name: Run e2e testing - LLama.CPP
232+
# shell: bash
233+
# run: |
234+
# # run e2e testing
235+
# cd nitro
236+
# chmod +x ../.github/scripts/e2e-test-llama-linux-and-mac.sh && ../.github/scripts/e2e-test-llama-linux-and-mac.sh ./nitro ${{ env.LLM_MODEL_URL }}
237+
# rm -rf uploads/
238+
239+
# - name: Run e2e testing - Whisper.CPP
240+
# shell: bash
241+
# run: |
242+
# # run e2e testing
243+
# cd nitro
244+
# chmod +x ../.github/scripts/e2e-test-whisper-linux-and-mac.sh && ../.github/scripts/e2e-test-whisper-linux-and-mac.sh ./nitro ${{ env.WHISPER_MODEL_URL }}
245+
# rm -rf uploads/
246246

247247
- uses: actions/upload-release-asset@v1.0.1
248248
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
@@ -289,7 +289,7 @@ jobs:
289289
290290
- name: Upload Artifact
291291
uses: actions/upload-artifact@v2
292-
if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'
292+
if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' || github.event_name == 'pull_request'
293293
with:
294294
name: nitro-linux-amd64-cuda-${{ matrix.cuda }}
295295
path: ./nitro
@@ -359,7 +359,7 @@ jobs:
359359
360360
- name: Upload Artifact
361361
uses: actions/upload-artifact@v2
362-
if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'
362+
if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' || github.event_name == 'pull_request'
363363
with:
364364
name: nitro-mac-arm64
365365
path: ./nitro
@@ -436,7 +436,7 @@ jobs:
436436
437437
- name: Upload Artifact
438438
uses: actions/upload-artifact@v2
439-
if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'
439+
if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' || github.event_name == 'pull_request'
440440
with:
441441
name: nitro-mac-amd64
442442
path: ./nitro
@@ -467,81 +467,81 @@ jobs:
467467
asset_name: nitro-${{ needs.create-draft-release.outputs.version }}-mac-amd64.tar.gz
468468
asset_content_type: application/gzip
469469

470-
macOS-amd64-vulkan-build:
471-
runs-on: macos-latest
472-
needs: [create-draft-release, set-nitro-version]
473-
if: always() && (needs.create-draft-release.result == 'success' || needs.create-draft-release.result == 'skipped') && needs.set-nitro-version.result == 'success'
474-
permissions:
475-
contents: write
476-
steps:
477-
- name: Clone
478-
id: checkout
479-
uses: actions/checkout@v3
480-
with:
481-
submodules: recursive
482-
483-
- name: Dependencies
484-
id: depends
485-
continue-on-error: true
486-
run: |
487-
brew update
488-
brew install sdl2
489-
490-
- name: Prepare Vulkan SDK
491-
uses: humbletim/setup-vulkan-sdk@v1.2.0
492-
with:
493-
vulkan-query-version: 1.3.204.0
494-
vulkan-components: Vulkan-Headers, Vulkan-Loader
495-
vulkan-use-cache: true
496-
497-
- name: Build
498-
id: cmake_build
499-
run: |
500-
./install_deps.sh
501-
mkdir build && cd build
502-
cmake -DNITRO_VERSION=${{ needs.set-nitro-version.outputs.version }} -DLLAMA_VULKAN=OFF -DLLAMA_METAL=OFF ..
503-
CC=gcc-8 make -j $(sysctl -n hw.ncp)
504-
ls -la
505-
506-
- name: Package
507-
shell: bash
508-
run: |
509-
mkdir -p nitro
510-
cp build/nitro nitro/
511-
tar -czvf nitro.tar.gz nitro
512-
513-
- name: Upload Artifact
514-
uses: actions/upload-artifact@v2
515-
if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'
516-
with:
517-
name: nitro-mac-amd64
518-
path: ./nitro
519-
520-
- name: Run e2e testing - LLama.CPP
521-
shell: bash
522-
run: |
523-
# run e2e testing
524-
cd nitro
525-
chmod +x ../.github/scripts/e2e-test-llama-linux-and-mac.sh && ../.github/scripts/e2e-test-llama-linux-and-mac.sh ./nitro ${{ env.LLM_MODEL_URL }}
526-
rm -rf uploads/
527-
528-
- name: Run e2e testing - Whisper.CPP
529-
shell: bash
530-
run: |
531-
# run e2e testing
532-
cd nitro
533-
chmod +x ../.github/scripts/e2e-test-whisper-linux-and-mac.sh && ../.github/scripts/e2e-test-whisper-linux-and-mac.sh ./nitro ${{ env.WHISPER_MODEL_URL }}
534-
rm -rf uploads/
535-
536-
- uses: actions/upload-release-asset@v1.0.1
537-
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
538-
env:
539-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
540-
with:
541-
upload_url: ${{ needs.create-draft-release.outputs.upload_url }}
542-
asset_path: ./nitro.tar.gz
543-
asset_name: nitro-${{ needs.create-draft-release.outputs.version }}-mac-amd64-vulkan.tar.gz
544-
asset_content_type: application/gzip
470+
# macOS-amd64-vulkan-build:
471+
# runs-on: macos-latest
472+
# needs: [create-draft-release, set-nitro-version]
473+
# if: always() && (needs.create-draft-release.result == 'success' || needs.create-draft-release.result == 'skipped') && needs.set-nitro-version.result == 'success'
474+
# permissions:
475+
# contents: write
476+
# steps:
477+
# - name: Clone
478+
# id: checkout
479+
# uses: actions/checkout@v3
480+
# with:
481+
# submodules: recursive
482+
483+
# - name: Dependencies
484+
# id: depends
485+
# continue-on-error: true
486+
# run: |
487+
# brew update
488+
# brew install sdl2
489+
490+
# - name: Prepare Vulkan SDK
491+
# uses: humbletim/setup-vulkan-sdk@v1.2.0
492+
# with:
493+
# vulkan-query-version: 1.3.204.0
494+
# vulkan-components: Vulkan-Headers, Vulkan-Loader
495+
# vulkan-use-cache: true
496+
497+
# - name: Build
498+
# id: cmake_build
499+
# run: |
500+
# ./install_deps.sh
501+
# mkdir build && cd build
502+
# cmake -DNITRO_VERSION=${{ needs.set-nitro-version.outputs.version }} -DLLAMA_VULKAN=ON -DLLAMA_METAL=OFF ..
503+
# CC=gcc-8 make -j $(sysctl -n hw.ncp)
504+
# ls -la
505+
506+
# - name: Package
507+
# shell: bash
508+
# run: |
509+
# mkdir -p nitro
510+
# cp build/nitro nitro/
511+
# tar -czvf nitro.tar.gz nitro
512+
513+
# - name: Upload Artifact
514+
# uses: actions/upload-artifact@v2
515+
# if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' || github.event_name == 'pull_request'
516+
# with:
517+
# name: nitro-mac-amd64
518+
# path: ./nitro
519+
520+
# - name: Run e2e testing - LLama.CPP
521+
# shell: bash
522+
# run: |
523+
# # run e2e testing
524+
# cd nitro
525+
# chmod +x ../.github/scripts/e2e-test-llama-linux-and-mac.sh && ../.github/scripts/e2e-test-llama-linux-and-mac.sh ./nitro ${{ env.LLM_MODEL_URL }}
526+
# rm -rf uploads/
527+
528+
# - name: Run e2e testing - Whisper.CPP
529+
# shell: bash
530+
# run: |
531+
# # run e2e testing
532+
# cd nitro
533+
# chmod +x ../.github/scripts/e2e-test-whisper-linux-and-mac.sh && ../.github/scripts/e2e-test-whisper-linux-and-mac.sh ./nitro ${{ env.WHISPER_MODEL_URL }}
534+
# rm -rf uploads/
535+
536+
# - uses: actions/upload-release-asset@v1.0.1
537+
# if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
538+
# env:
539+
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
540+
# with:
541+
# upload_url: ${{ needs.create-draft-release.outputs.upload_url }}
542+
# asset_path: ./nitro.tar.gz
543+
# asset_name: nitro-${{ needs.create-draft-release.outputs.version }}-mac-amd64-vulkan.tar.gz
544+
# asset_content_type: application/gzip
545545

546546
windows-amd64-build:
547547
runs-on: windows-latest
@@ -621,7 +621,7 @@ jobs:
621621
622622
- name: Upload Artifact
623623
uses: actions/upload-artifact@v2
624-
if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'
624+
if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' || github.event_name == 'pull_request'
625625
with:
626626
name: nitro-win-amd64
627627
path: ./build/Release
@@ -707,9 +707,9 @@ jobs:
707707
708708
- name: Upload Artifact
709709
uses: actions/upload-artifact@v2
710-
if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'
710+
if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' || github.event_name == 'pull_request'
711711
with:
712-
name: nitro-win-amd64
712+
name: nitro-win-amd64-vulkan
713713
path: ./build/Release
714714

715715
- uses: actions/upload-release-asset@v1.0.1
@@ -802,7 +802,7 @@ jobs:
802802
803803
- name: Upload Artifact
804804
uses: actions/upload-artifact@v2
805-
if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'
805+
if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' || github.event_name == 'pull_request'
806806
with:
807807
name: nitro-win-amd64-cuda-${{ matrix.cuda }}
808808
path: ./build/Release
@@ -827,7 +827,7 @@ jobs:
827827
macOS-amd64-build,
828828
windows-amd64-build,
829829
windows-amd64-cuda-build,
830-
macOS-amd64-vulkan-build,
830+
# macOS-amd64-vulkan-build,
831831
ubuntu-amd64-vulkan-build,
832832
windows-amd64-vulkan-build,
833833
]
@@ -851,7 +851,7 @@ jobs:
851851
macOS-amd64-build,
852852
windows-amd64-build,
853853
windows-amd64-cuda-build,
854-
macOS-amd64-vulkan-build,
854+
# macOS-amd64-vulkan-build,
855855
ubuntu-amd64-vulkan-build,
856856
windows-amd64-vulkan-build,
857857
]
@@ -890,7 +890,7 @@ jobs:
890890
macOS-amd64-build,
891891
windows-amd64-build,
892892
windows-amd64-cuda-build,
893-
macOS-amd64-vulkan-build,
893+
# macOS-amd64-vulkan-build,
894894
ubuntu-amd64-vulkan-build,
895895
windows-amd64-vulkan-build,
896896
]

0 commit comments

Comments
 (0)