Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CompatHelper: bump compat for GPUArrays to 11 and JLArrays to 0.2, (keep existing compat) #590

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
b8feeba
CompatHelper: bump compat for GPUArrays to 11, (keep existing compat)
Oct 18, 2024
17097cd
remove CUDA dependency for tests
maximilian-gelbrecht Oct 22, 2024
a71d83a
Merge branch 'main' into compathelper/new_version/2024-10-18-01-40-44…
maximilian-gelbrecht Oct 22, 2024
5dbe6dd
changelog updated
maximilian-gelbrecht Oct 22, 2024
4445186
JLArray dependency 0.1 instead of 0.1.4
maximilian-gelbrecht Oct 22, 2024
b418b12
completely remove JLArrays compat entry
maximilian-gelbrecht Oct 22, 2024
7e79fd0
Merge branch 'main' into compathelper/new_version/2024-10-18-01-40-44…
maximilian-gelbrecht Oct 22, 2024
27b2f2e
add JLArrays compat again
maximilian-gelbrecht Oct 22, 2024
87bc15d
compat with GPUArrays v11
maximilian-gelbrecht Oct 25, 2024
6cc4e12
RingGrids updated for GPUArrays v11
maximilian-gelbrecht Nov 1, 2024
d555a91
GeoMakie dependency
maximilian-gelbrecht Nov 1, 2024
453f1f3
CairoMakie compat
maximilian-gelbrecht Nov 1, 2024
bd55025
Merge branch 'main' into compathelper/new_version/2024-10-18-01-40-44…
milankl Nov 1, 2024
15fd11d
Update CHANGELOG.md
milankl Nov 1, 2024
62b45b2
Merge branch 'main' into compathelper/new_version/2024-10-18-01-40-44…
milankl Nov 11, 2024
0338282
Merge branch 'main' into compathelper/new_version/2024-10-18-01-40-44…
milankl Nov 28, 2024
0f0b3cc
Also increase compat for JLArrays
milankl Nov 28, 2024
3f68fa9
Update CHANGELOG.md
milankl Nov 28, 2024
30c9245
Merge branch 'main' into compathelper/new_version/2024-10-18-01-40-44…
maximilian-gelbrecht Dec 1, 2024
34d0b0b
remove CUDA from test env
maximilian-gelbrecht Dec 1, 2024
4e81d95
fix get_backend
maximilian-gelbrecht Dec 1, 2024
f90b9d8
remove explicit import of get_backend again
maximilian-gelbrecht Dec 1, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

## Unreleased

- update to GPUArrays v11, JLArrays v0.2 and remove CUDA from tests [#590](https://github.com/SpeedyWeather/SpeedyWeather.jl/pull/590)
- Power spectrum for n-dim LowerTriangularArrays [#618](https://github.com/SpeedyWeather/SpeedyWeather.jl/pull/618)
- Added custom EnzymeRules for the SpectralTransform and an extension for compatibility with FiniteDifferences.jl [#589](https://github.com/SpeedyWeather/SpeedyWeather.jl/pull/589)
- Optical depth introduced and array-agnostic ColumnVariables [#606](https://github.com/SpeedyWeather/SpeedyWeather.jl/pull/606)
Expand Down
4 changes: 2 additions & 2 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,10 @@ Dates = "1.10"
DocStringExtensions = "0.9"
FFTW = "1"
FastGaussQuadrature = "0.4, 0.5, 1"
GPUArrays = "10"
GPUArrays = "11"
GenericFFT = "0.1"
JLArrays = "0.1"
GeoMakie = "0.7.6"
JLArrays = "0.1.4, 0.2"
JLD2 = "0.4, 0.5"
KernelAbstractions = "0.9"
LinearAlgebra = "1.10"
Expand Down
4 changes: 2 additions & 2 deletions docs/Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ NCDatasets = "85f8d34a-cbdd-5861-8df4-14fed0d494ab"
UnicodePlots = "b8865327-cd53-5732-bb35-84acbb429228"

[compat]
CairoMakie = "0.11, 0.12"
CairoMakie = "0.12"
Documenter = "0.26, 0.27, 1"
GeoMakie = "0.7.5"
GeoMakie = "0.7.6"
NCDatasets = "0.12, 0.13, 0.14"
UnicodePlots = "3"
1 change: 1 addition & 0 deletions src/LowerTriangularMatrices/LowerTriangularMatrices.jl
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ using DocStringExtensions
# GPU
import Adapt
import GPUArrays
import KernelAbstractions

# NUMERICS
import LinearAlgebra: tril!
Expand Down
6 changes: 3 additions & 3 deletions src/LowerTriangularMatrices/lower_triangular_array.jl
Original file line number Diff line number Diff line change
Expand Up @@ -630,10 +630,10 @@ function Base.similar(
return LowerTriangularArray{T, N, ArrayType{T,N}}(undef, size(L; as=Matrix))
end

function GPUArrays.backend(
::Type{LowerTriangularArray{T, N, ArrayType}}
function KernelAbstractions.get_backend(
a::LowerTriangularArray{T, N, ArrayType}
) where {T, N, ArrayType <: GPUArrays.AbstractGPUArray}
return GPUArrays.backend(ArrayType)
return KernelAbstractions.get_backend(a.data)
end

Adapt.adapt_structure(to, L::LowerTriangularArray) =
Expand Down
1 change: 1 addition & 0 deletions src/RingGrids/RingGrids.jl
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import LinearAlgebra
# GPU
import Adapt
import GPUArrays
import KernelAbstractions

# ABSTRACT GRIDS (2D) AND GRIDARRAYS (3D+)
export AbstractGridArray,
Expand Down
6 changes: 3 additions & 3 deletions src/RingGrids/general.jl
Original file line number Diff line number Diff line change
Expand Up @@ -482,10 +482,10 @@ AbstractGPUGridArrayStyle{2, ArrayType, Grid}(::Val{1}) where {ArrayType, Grid}
AbstractGPUGridArrayStyle{3, ArrayType, Grid}(::Val{4}) where {ArrayType, Grid} = AbstractGPUGridArrayStyle{4, ArrayType, Grid}()
AbstractGPUGridArrayStyle{3, ArrayType, Grid}(::Val{2}) where {ArrayType, Grid} = AbstractGPUGridArrayStyle{3, ArrayType, Grid}()

function GPUArrays.backend(
::Type{Grid}
function KernelAbstractions.get_backend(
g::Grid
) where {Grid <: AbstractGridArray{T, N, ArrayType}} where {T, N, ArrayType <: GPUArrays.AbstractGPUArray}
return GPUArrays.backend(ArrayType)
return KernelAbstractions.get_backend(g.data)
end

function Base.similar(
Expand Down
1 change: 0 additions & 1 deletion test/Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
[deps]
AbstractFFTs = "621f4979-c628-5d54-868e-fcf4e3e8185c"
Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"
CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba"
Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
Enzyme = "7da242da-08ed-463a-9acd-ee780be4f1d9"
EnzymeTestUtils = "12d8515a-0907-448a-8884-5fe00fdf1c5a"
Expand Down