From 1f8a7e9d5395bc0bad1bb2f108a0e004bb686142 Mon Sep 17 00:00:00 2001 From: Valentin Churavy Date: Tue, 20 May 2025 09:54:29 +0200 Subject: [PATCH 1/4] use pocl_jll v7 --- Project.toml | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/Project.toml b/Project.toml index 3119fc9e6..acd4e89de 100644 --- a/Project.toml +++ b/Project.toml @@ -18,6 +18,16 @@ StaticArrays = "90137ffa-7385-5640-81b9-e52037218182" UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4" pocl_jll = "627d6b7a-bbe6-5189-83e7-98cc0a5aeadd" +[weakdeps] +EnzymeCore = "f151be2c-9106-41f4-ab19-57ee4f262869" +LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" +SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" + +[extensions] +EnzymeExt = "EnzymeCore" +LinearAlgebraExt = "LinearAlgebra" +SparseArraysExt = "SparseArrays" + [compat] Adapt = "0.4, 1.0, 2.0, 3.0, 4" Atomix = "0.1, 1" @@ -33,18 +43,9 @@ SparseArrays = "<0.0.1, 1.6" StaticArrays = "0.12, 1.0" UUIDs = "<0.0.1, 1.6" julia = "1.10" - -[extensions] -EnzymeExt = "EnzymeCore" -LinearAlgebraExt = "LinearAlgebra" -SparseArraysExt = "SparseArrays" +pocl_jll = "7" [extras] EnzymeCore = "f151be2c-9106-41f4-ab19-57ee4f262869" LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" - -[weakdeps] -EnzymeCore = "f151be2c-9106-41f4-ab19-57ee4f262869" -LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" -SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" From ad99f5147325ee96dcaa9a8eb3e928669857fa83 Mon Sep 17 00:00:00 2001 From: Valentin Churavy Date: Tue, 20 May 2025 09:55:58 +0200 Subject: [PATCH 2/4] Set CI --- .github/workflows/ci.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a424c5146..c34b9283e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,16 +21,16 @@ jobs: strategy: fail-fast: false matrix: -# version: -# - '1.10' -# - '1.11' -# os: -# - ubuntu-latest -# - macOS-latest -# - windows-latest -# arch: -# - x64 -# pocl: [jll,] + version: + - '1.10' + - '1.11' + os: + - ubuntu-latest + - macOS-latest + - windows-latest + arch: + - x64 + pocl: [jll,] include: - version: '1.10' os: ubuntu-latest From ed3c4bfb95aab92b60c56bbf7c03d90b29ddd28a Mon Sep 17 00:00:00 2001 From: Valentin Churavy Date: Mon, 9 Jun 2025 10:35:43 +0200 Subject: [PATCH 3/4] use CI improvements from OpenCL.jl --- .github/workflows/ci.yml | 68 ++++++++++++++++++---------------------- 1 file changed, 30 insertions(+), 38 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c34b9283e..a8c21fa2d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,48 +21,28 @@ jobs: strategy: fail-fast: false matrix: - version: - - '1.10' - - '1.11' - os: - - ubuntu-latest - - macOS-latest - - windows-latest - arch: - - x64 - pocl: [jll,] - include: - - version: '1.10' - os: ubuntu-latest + version: ['1.10', '1.11'] + os: [ubuntu-24.04, ubuntu-24.04-arm, macOS-13, macOS-15, windows-2025] + arch: [x64, arm64] + pocl: [jll, local] + exclude: + - os: ubuntu-24.04 + arch: arm64 + - os: windows-2025 + arch: arm64 + - os: ubuntu-24.04-arm arch: x64 - pocl: local - allow_failure: false - - version: '1.11' - os: ubuntu-latest + # macOS 13 is Intel-only, while macOS 14+ only support Apple Silicon + - os: macOS-15 arch: x64 + - os: macOS-13 + arch: arm64 + - os: macOS-13 pocl: local - allow_failure: false - - version: '1.12' - os: ubuntu-latest - arch: x64 + - os: macOS-15 pocl: local - allow_failure: false -# - version: 'nightly' -# os: ubuntu-latest -# arch: x64 -# pocl: local -# allow_failure: true -# - version: 'nightly' -# os: ubuntu-latest -# arch: x64 -# pocl: local -# allow_failure: true -# - version: 'nightly' -# os: ubuntu-latest -# arch: x64 -# pocl: jll -# allow_failure: true -# + - os: windows-2025 + pocl: local steps: - uses: actions/checkout@v4 - uses: julia-actions/install-juliaup@v2 @@ -151,8 +131,20 @@ jobs: ' - uses: julia-actions/julia-buildpkg@v1 - uses: julia-actions/julia-runtest@v1 + if: runner.os != 'Windows' with: annotate: true + - name: Setup BusyBox + if: runner.os == 'Windows' + run: | + Invoke-WebRequest https://frippery.org/files/busybox/busybox64.exe -OutFile C:\Windows\drop.exe + - name: Test KernelAbstractions.jl (de-escalated) + if: runner.os == 'Windows' + shell: drop -c "julia '{0}'" + run: | + using Pkg + Pkg.activate(".") + Pkg.test() - uses: julia-actions/julia-processcoverage@v1 - uses: codecov/codecov-action@v4 with: From 634da070edfd9b75a4f503c9627caa5c0d75ee35 Mon Sep 17 00:00:00 2001 From: Valentin Churavy Date: Tue, 10 Jun 2025 10:07:07 +0200 Subject: [PATCH 4/4] Update .github/workflows/ci.yml Co-authored-by: Christian Guinard <28689358+christiangnrd@users.noreply.github.com> --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a8c21fa2d..5cdcb557e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -136,6 +136,7 @@ jobs: annotate: true - name: Setup BusyBox if: runner.os == 'Windows' + shell: pwsh run: | Invoke-WebRequest https://frippery.org/files/busybox/busybox64.exe -OutFile C:\Windows\drop.exe - name: Test KernelAbstractions.jl (de-escalated)