Skip to content

Commit 4981147

Browse files
Switch to pocl_jll@v7 (#599)
Co-authored-by: Christian Guinard <28689358+christiangnrd@users.noreply.github.com>
1 parent eaa8a7f commit 4981147

File tree

2 files changed

+42
-48
lines changed

2 files changed

+42
-48
lines changed

.github/workflows/ci.yml

Lines changed: 31 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -21,48 +21,28 @@ jobs:
2121
strategy:
2222
fail-fast: false
2323
matrix:
24-
# version:
25-
# - '1.10'
26-
# - '1.11'
27-
# os:
28-
# - ubuntu-latest
29-
# - macOS-latest
30-
# - windows-latest
31-
# arch:
32-
# - x64
33-
# pocl: [jll,]
34-
include:
35-
- version: '1.10'
36-
os: ubuntu-latest
24+
version: ['1.10', '1.11']
25+
os: [ubuntu-24.04, ubuntu-24.04-arm, macOS-13, macOS-15, windows-2025]
26+
arch: [x64, arm64]
27+
pocl: [jll, local]
28+
exclude:
29+
- os: ubuntu-24.04
30+
arch: arm64
31+
- os: windows-2025
32+
arch: arm64
33+
- os: ubuntu-24.04-arm
3734
arch: x64
38-
pocl: local
39-
allow_failure: false
40-
- version: '1.11'
41-
os: ubuntu-latest
35+
# macOS 13 is Intel-only, while macOS 14+ only support Apple Silicon
36+
- os: macOS-15
4237
arch: x64
38+
- os: macOS-13
39+
arch: arm64
40+
- os: macOS-13
4341
pocl: local
44-
allow_failure: false
45-
- version: '1.12'
46-
os: ubuntu-latest
47-
arch: x64
42+
- os: macOS-15
4843
pocl: local
49-
allow_failure: false
50-
# - version: 'nightly'
51-
# os: ubuntu-latest
52-
# arch: x64
53-
# pocl: local
54-
# allow_failure: true
55-
# - version: 'nightly'
56-
# os: ubuntu-latest
57-
# arch: x64
58-
# pocl: local
59-
# allow_failure: true
60-
# - version: 'nightly'
61-
# os: ubuntu-latest
62-
# arch: x64
63-
# pocl: jll
64-
# allow_failure: true
65-
#
44+
- os: windows-2025
45+
pocl: local
6646
steps:
6747
- uses: actions/checkout@v4
6848
- uses: julia-actions/install-juliaup@v2
@@ -151,8 +131,21 @@ jobs:
151131
'
152132
- uses: julia-actions/julia-buildpkg@v1
153133
- uses: julia-actions/julia-runtest@v1
134+
if: runner.os != 'Windows'
154135
with:
155136
annotate: true
137+
- name: Setup BusyBox
138+
if: runner.os == 'Windows'
139+
shell: pwsh
140+
run: |
141+
Invoke-WebRequest https://frippery.org/files/busybox/busybox64.exe -OutFile C:\Windows\drop.exe
142+
- name: Test KernelAbstractions.jl (de-escalated)
143+
if: runner.os == 'Windows'
144+
shell: drop -c "julia '{0}'"
145+
run: |
146+
using Pkg
147+
Pkg.activate(".")
148+
Pkg.test()
156149
- uses: julia-actions/julia-processcoverage@v1
157150
- uses: codecov/codecov-action@v4
158151
with:

Project.toml

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,16 @@ StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
1818
UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
1919
pocl_jll = "627d6b7a-bbe6-5189-83e7-98cc0a5aeadd"
2020

21+
[weakdeps]
22+
EnzymeCore = "f151be2c-9106-41f4-ab19-57ee4f262869"
23+
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
24+
SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
25+
26+
[extensions]
27+
EnzymeExt = "EnzymeCore"
28+
LinearAlgebraExt = "LinearAlgebra"
29+
SparseArraysExt = "SparseArrays"
30+
2131
[compat]
2232
Adapt = "0.4, 1.0, 2.0, 3.0, 4"
2333
Atomix = "0.1, 1"
@@ -33,18 +43,9 @@ SparseArrays = "<0.0.1, 1.6"
3343
StaticArrays = "0.12, 1.0"
3444
UUIDs = "<0.0.1, 1.6"
3545
julia = "1.10"
36-
37-
[extensions]
38-
EnzymeExt = "EnzymeCore"
39-
LinearAlgebraExt = "LinearAlgebra"
40-
SparseArraysExt = "SparseArrays"
46+
pocl_jll = "7"
4147

4248
[extras]
4349
EnzymeCore = "f151be2c-9106-41f4-ab19-57ee4f262869"
4450
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
4551
SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
46-
47-
[weakdeps]
48-
EnzymeCore = "f151be2c-9106-41f4-ab19-57ee4f262869"
49-
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
50-
SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"

0 commit comments

Comments
 (0)