Skip to content

Commit 83a53b7

Browse files
authored
CI: add FreeBSD & simplify CUDA windows (#3053)
* add freebsd to ci * bump actions/checkout to v3 * bump cuda 12.1.0 -> 12.2.0 * bump Jimver/cuda-toolkit version * unify and simplify "Copy and pack Cuda runtime" * install only necessary cuda sub packages
1 parent 5c872db commit 83a53b7

File tree

2 files changed

+38
-39
lines changed

2 files changed

+38
-39
lines changed

.github/workflows/build.yml

Lines changed: 37 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
steps:
2828
- name: Clone
2929
id: checkout
30-
uses: actions/checkout@v1
30+
uses: actions/checkout@v3
3131

3232
- name: Dependencies
3333
id: depends
@@ -52,7 +52,7 @@ jobs:
5252
steps:
5353
- name: Clone
5454
id: checkout
55-
uses: actions/checkout@v1
55+
uses: actions/checkout@v3
5656

5757
- name: Dependencies
5858
id: depends
@@ -87,7 +87,7 @@ jobs:
8787
steps:
8888
- name: Clone
8989
id: checkout
90-
uses: actions/checkout@v1
90+
uses: actions/checkout@v3
9191

9292
- name: Dependencies
9393
id: depends
@@ -121,7 +121,7 @@ jobs:
121121
steps:
122122
- name: Clone
123123
id: checkout
124-
uses: actions/checkout@v1
124+
uses: actions/checkout@v3
125125

126126
- name: Dependencies
127127
id: depends
@@ -149,7 +149,7 @@ jobs:
149149
steps:
150150
- name: Clone
151151
id: checkout
152-
uses: actions/checkout@v1
152+
uses: actions/checkout@v3
153153

154154
- name: Dependencies
155155
id: depends
@@ -174,7 +174,7 @@ jobs:
174174
steps:
175175
- name: Clone
176176
id: checkout
177-
uses: actions/checkout@v1
177+
uses: actions/checkout@v3
178178

179179
- name: Dependencies
180180
id: depends
@@ -280,7 +280,7 @@ jobs:
280280
steps:
281281
- name: Clone
282282
id: checkout
283-
uses: actions/checkout@v1
283+
uses: actions/checkout@v3
284284

285285
- name: Download OpenCL SDK
286286
id: get_opencl
@@ -390,20 +390,19 @@ jobs:
390390

391391
strategy:
392392
matrix:
393-
cuda: ['12.1.0', '11.7.1']
393+
cuda: ['12.2.0', '11.7.1']
394394
build: ['cublas']
395395

396396
steps:
397397
- name: Clone
398398
id: checkout
399-
uses: actions/checkout@v1
399+
uses: actions/checkout@v3
400400

401-
- uses: Jimver/[email protected].10
401+
- uses: Jimver/[email protected].11
402402
id: cuda-toolkit
403403
with:
404404
cuda: ${{ matrix.cuda }}
405-
# TODO(green-sky): _dev seems to fail, and non dev are not enought
406-
#sub-packages: '["nvcc", "cudart", "cublas", "cudart_dev", "cublas_dev"]'
405+
sub-packages: '["nvcc", "cudart", "cublas", "cublas_dev", "thrust", "visual_studio_integration"]'
407406

408407
- name: Build
409408
id: cmake_build
@@ -440,27 +439,11 @@ jobs:
440439
llama-${{ steps.tag.outputs.name }}-bin-win-${{ matrix.build }}-cu${{ matrix.cuda }}-x64.zip
441440
442441
- name: Copy and pack Cuda runtime
443-
if: ${{ matrix.cuda == '12.1.0' }}
444-
# TODO(green-sky): paths are cuda 12 specific
445442
run: |
446443
echo "Cuda install location: ${{steps.cuda-toolkit.outputs.CUDA_PATH}}"
447-
mkdir '.\build\bin\cudart\'
448-
cp "${{steps.cuda-toolkit.outputs.CUDA_PATH}}\bin\cudart64_12.dll" '.\build\bin\cudart\'
449-
cp "${{steps.cuda-toolkit.outputs.CUDA_PATH}}\bin\cublas64_12.dll" '.\build\bin\cudart\'
450-
cp "${{steps.cuda-toolkit.outputs.CUDA_PATH}}\bin\cublasLt64_12.dll" '.\build\bin\cudart\'
451-
7z a cudart-llama-bin-win-cu${{ matrix.cuda }}-x64.zip .\build\bin\cudart\*
452-
453-
- name: Copy and pack Cuda runtime
454-
if: ${{ matrix.cuda == '11.7.1' }}
455-
# TODO(green-sky): paths are cuda 11 specific
456-
run: |
457-
echo "Cuda install location: ${{steps.cuda-toolkit.outputs.CUDA_PATH}}"
458-
mkdir '.\build\bin\cudart\'
459-
ls "${{steps.cuda-toolkit.outputs.CUDA_PATH}}\bin"
460-
cp "${{steps.cuda-toolkit.outputs.CUDA_PATH}}\bin\cudart64_110.dll" '.\build\bin\cudart\'
461-
cp "${{steps.cuda-toolkit.outputs.CUDA_PATH}}\bin\cublas64_11.dll" '.\build\bin\cudart\'
462-
cp "${{steps.cuda-toolkit.outputs.CUDA_PATH}}\bin\cublasLt64_11.dll" '.\build\bin\cudart\'
463-
7z a cudart-llama-bin-win-cu${{ matrix.cuda }}-x64.zip .\build\bin\cudart\*
444+
$dst='.\build\bin\cudart\'
445+
robocopy "${{steps.cuda-toolkit.outputs.CUDA_PATH}}\bin" $dst cudart64_*.dll cublas64_*.dll cublasLt64_*.dll
446+
7z a cudart-llama-bin-win-cu${{ matrix.cuda }}-x64.zip $dst\*
464447
465448
- name: Upload Cuda runtime
466449
if: ${{ ( github.event_name == 'push' && github.ref == 'refs/heads/master' ) || github.event.inputs.create_release == 'true' }}
@@ -469,6 +452,22 @@ jobs:
469452
path: |
470453
cudart-llama-bin-win-cu${{ matrix.cuda }}-x64.zip
471454
455+
freeBSD-latest:
456+
runs-on: macos-12
457+
steps:
458+
- name: Clone
459+
uses: actions/checkout@v3
460+
461+
- name: Build
462+
uses: cross-platform-actions/[email protected]
463+
with:
464+
operating_system: freebsd
465+
version: '13.2'
466+
run: |
467+
sudo pkg update
468+
sudo pkg install -y gmake automake autoconf pkgconf llvm15 clinfo clover opencl clblast openblas
469+
gmake CC=/usr/local/bin/clang15 CXX=/usr/local/bin/clang++15
470+
472471
release:
473472
if: ${{ ( github.event_name == 'push' && github.ref == 'refs/heads/master' ) || github.event.inputs.create_release == 'true' }}
474473

@@ -485,7 +484,7 @@ jobs:
485484
steps:
486485
- name: Clone
487486
id: checkout
488-
uses: actions/checkout@v1
487+
uses: actions/checkout@v3
489488

490489
- name: Determine tag name
491490
id: tag
@@ -543,7 +542,7 @@ jobs:
543542
#
544543
# steps:
545544
# - name: Clone
546-
# uses: actions/checkout@v1
545+
# uses: actions/checkout@v3
547546
#
548547
# - name: Dependencies
549548
# run: |
@@ -567,7 +566,7 @@ jobs:
567566
#
568567
# steps:
569568
# - name: Clone
570-
# uses: actions/checkout@v1
569+
# uses: actions/checkout@v3
571570
#
572571
# - name: Dependencies
573572
# run: |
@@ -591,7 +590,7 @@ jobs:
591590
#
592591
# steps:
593592
# - name: Clone
594-
# uses: actions/checkout@v1
593+
# uses: actions/checkout@v3
595594
#
596595
# - name: Dependencies
597596
# run: |
@@ -621,7 +620,7 @@ jobs:
621620
#
622621
# steps:
623622
# - name: Clone
624-
# uses: actions/checkout@v1
623+
# uses: actions/checkout@v3
625624
#
626625
# - name: Add msbuild to PATH
627626
# uses: microsoft/setup-msbuild@v1
@@ -660,7 +659,7 @@ jobs:
660659
#
661660
# steps:
662661
# - name: Clone
663-
# uses: actions/checkout@v1
662+
# uses: actions/checkout@v3
664663
#
665664
# - name: Add msbuild to PATH
666665
# uses: microsoft/setup-msbuild@v1
@@ -706,7 +705,7 @@ jobs:
706705
#
707706
# steps:
708707
# - name: Clone
709-
# uses: actions/checkout@v1
708+
# uses: actions/checkout@v3
710709
#
711710
# - name: Dependencies
712711
# run: |

.github/workflows/gguf-publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
runs-on: ubuntu-latest
2525

2626
steps:
27-
- uses: actions/checkout@v2
27+
- uses: actions/checkout@v3
2828
- name: Set up Python
2929
uses: actions/setup-python@v2
3030
with:

0 commit comments

Comments
 (0)