Roll back GPUArrays upgrade (#636)

* roll back GPUArrays upgrade * changelog, GPUArrays downgrade * backend instead of get_backend * KA compat 0.9.29 * KA compat again
SpeedyWeather · Dec 13, 2024 · c7c74f9 · c7c74f9
1 parent 4f07e4d
commit c7c74f9
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## Unreleased
 
+- Roll back GPUArrays upgrade to ensure CUDA compatibility [#636](https://github.com/SpeedyWeather/SpeedyWeather.jl/pull/636)
 - Change default timestep to 40min at T31 [#623](https://github.com/SpeedyWeather/SpeedyWeather.jl/pull/623)
 
 ## v0.13

diff --git a/Project.toml b/Project.toml
@@ -56,12 +56,12 @@ Enzyme = "0.13"
 FFTW = "1"
 FastGaussQuadrature = "0.4, 0.5, 1"
 FiniteDifferences = "0.12"
-GPUArrays = "11"
+GPUArrays = "10"
 GenericFFT = "0.1"
 GeoMakie = "0.7.6"
-JLArrays = "0.1.4, 0.2"
+JLArrays = "0.1"
 JLD2 = "0.4, 0.5"
-KernelAbstractions = "0.9"
+KernelAbstractions = "0.9.0 - 0.9.29"
 LinearAlgebra = "1.10"
 Makie = "0.20, 0.21"
 NCDatasets = "0.12, 0.13, 0.14"

diff --git a/src/LowerTriangularMatrices/lower_triangular_array.jl b/src/LowerTriangularMatrices/lower_triangular_array.jl
@@ -630,10 +630,10 @@ function Base.similar(
     return LowerTriangularArray{T, N, ArrayType{T,N}}(undef, size(L; as=Matrix))
 end
 
-function KernelAbstractions.get_backend(
-    a::LowerTriangularArray{T, N, ArrayType}
+function GPUArrays.backend(
+    ::Type{LowerTriangularArray{T, N, ArrayType}}
 ) where {T, N, ArrayType <: GPUArrays.AbstractGPUArray}
-    return KernelAbstractions.get_backend(a.data)
+    return GPUArrays.backend(ArrayType)
 end
 
 Adapt.adapt_structure(to, L::LowerTriangularArray) =

diff --git a/src/RingGrids/general.jl b/src/RingGrids/general.jl
@@ -481,11 +481,11 @@ AbstractGPUGridArrayStyle{2, ArrayType, Grid}(::Val{3}) where {ArrayType, Grid}
 AbstractGPUGridArrayStyle{2, ArrayType, Grid}(::Val{1}) where {ArrayType, Grid} = AbstractGPUGridArrayStyle{2, 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 KernelAbstractions.get_backend(
-    g::Grid
+
+function GPUArrays.backend(
+    ::Type{Grid}
 ) where {Grid <: AbstractGridArray{T, N, ArrayType}} where {T, N, ArrayType <: GPUArrays.AbstractGPUArray}
-    return KernelAbstractions.get_backend(g.data)
+    return GPUArrays.backend(ArrayType)
 end
 
 function Base.similar(

diff --git a/test/Project.toml b/test/Project.toml
@@ -1,6 +1,7 @@
 [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"