Merge pull request #163 from FourierFlows/UpgradeCuArrays

Upgrade CuArrays

Author: navidcy

.gitlab-ci.yml

@@ -17,10 +17,10 @@ julia:1.0:
     - nvidia
 
 # the "primary" target, where we require a new GPU to make sure all tests are run
-julia:1.3:
+julia:1.4:
   image: juliagpu/cuda:10.1-cudnn7-cutensor1-devel-ubuntu18.04
   extends:
-    - .julia:1.3
+    - .julia:1.4
     - .test
   tags:
     - nvidia
@@ -31,5 +31,5 @@ julia:1.3:
 # other tasks
 coverage:
   extends:
-    - .julia:1.3
+    - .julia:1.4
     - .coverage

.travis.yml

@@ -6,7 +6,7 @@ os:
 
 julia:
   - 1.0
-  - 1.3
+  - 1.4
   - nightly
 
 matrix:
@@ -20,7 +20,7 @@ matrix:
 jobs:
   include:
     - stage: "Documentation"
-      julia: 1.3
+      julia: 1.4
       os: linux
       script:
         - julia --project=docs/ -e 'using Pkg; Pkg.instantiate();

Project.toml

@@ -24,8 +24,8 @@ Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
 
 [compat]
 AbstractFFTs = "^0.5"
-CUDAapi = "^2, 4.0"
-CuArrays = "^1"
+CUDAapi = "^2, ^4"
+CuArrays = "^1, ^2"
 FFTW = "^1"
 Interpolations = "^0.12"
 JLD2 = "^0.1"

appveyor.yml

@@ -1,7 +1,7 @@
 environment:
   matrix:
   - julia_version: 1.0
-  - julia_version: 1.3
+  - julia_version: 1.4
   - julia_version: nightly
 
 platform:

test/runtests.jl

@@ -49,7 +49,7 @@ for dev in devices
     # Test 1D grid
     g₁ = OneDGrid(dev, nx, Lx)
     @test testnx(g₁, nx)
-    @test testdx(g₁)
+    @test testdx(dev, g₁)
     @test testdk(g₁)
     @test testx(g₁)
     @test testk(g₁)
@@ -61,16 +61,16 @@ for dev in devices
     g₂ = TwoDGrid(dev, nx, Lx, ny, Ly)
     @test testnx(g₂, nx)
     @test testny(g₂, ny)
-    @test testdx(g₂)
-    @test testdy(g₂)
+    @test testdx(dev, g₂)
+    @test testdy(dev, g₂)
     @test testdk(g₂)
     @test testdl(g₂)
     @test testx(g₂)
     @test testy(g₂)
     @test testk(g₂)
     @test testkr(g₂)
     @test testl(g₂)
-    @test testgridpoints(g₂)
+    @test testgridpoints(dev, g₂)
     @test testdealias(g₂)
     @test testmakefilter(dev, g₂)
 
@@ -79,9 +79,9 @@ for dev in devices
     @test testnx(g₃, nx)
     @test testny(g₃, ny)
     @test testnz(g₃, nz)
-    @test testdx(g₃)
-    @test testdy(g₃)
-    @test testdz(g₃)
+    @test testdx(dev, g₃)
+    @test testdy(dev, g₃)
+    @test testdz(dev, g₃)
     @test testdk(g₃)
     @test testdl(g₃)
     @test testdm(g₃)
@@ -92,7 +92,7 @@ for dev in devices
     @test testkr(g₃)
     @test testl(g₃)
     @test testm(g₃)
-    @test testgridpoints(g₃)
+    @test testgridpoints(dev, g₃)
     @test testdealias(g₃)
     @test testmakefilter(dev, g₃)
 

test/test_grid.jl

@@ -3,21 +3,21 @@ testny(g, ny) = isapprox(g.ny, ny)
 testnz(g, nz) = isapprox(g.nz, nz)
 
 # Physical grid tests
-function testdx(g::AbstractGrid{T}) where {T, Ta}
+function testdx(dev, g::Union{OneDGrid{T}, TwoDGrid{T}, ThreeDGrid{T}}) where T
   dxgrid = @. g.x[2:end] - g.x[1:end-1]
-  dxones = g.dx*ones(T, size(dxgrid))
+  dxones = ArrayType(dev)(g.dx*ones(T, size(dxgrid)))
   isapprox(dxgrid, dxones)
 end
 
-function testdy(g::AbstractGrid{T, Ta}) where {T, Ta}
+function testdy(dev, g::Union{TwoDGrid{T}, ThreeDGrid{T}}) where T
   dygrid = @. g.y[2:end] - g.y[1:end-1]
-  dyones = g.dy*ones(T, size(dygrid))
+  dyones = ArrayType(dev)(g.dy*ones(T, size(dygrid)))
   isapprox(dygrid, dyones)
 end
 
-function testdz(g::AbstractGrid{T, Ta}) where {T, Ta}
+function testdz(dev, g::ThreeDGrid{T}) where T
   dzgrid = @. g.z[2:end] - g.z[1:end-1]
-  dzones = g.dz*ones(T, size(dzgrid))
+  dzones = ArrayType(dev)(g.dz*ones(T, size(dzgrid)))
   isapprox(dzgrid, dzones)
 end
 
@@ -47,23 +47,23 @@ testl(g::Union{TwoDGrid, ThreeDGrid}) = testwavenumberalignment(g.l, g.ny)
 testm(g::ThreeDGrid) = testwavenumberalignment(g.m, g.nz)
 testkr(g) = isapprox(cat(g.k[1:g.nkr-1], abs(g.k[g.nkr]), dims=1), g.kr)
 
-function testgridpoints(g::TwoDGrid{T, Ta}) where {T, Ta}
+function testgridpoints(dev::Device, g::TwoDGrid{T}) where T
   X, Y = gridpoints(g)
   dXgrid = @. X[2:end, :] - X[1:end-1, :]
   dYgrid = @. Y[:, 2:end] - Y[:, 1:end-1]
-  dXones = g.dx*ones(T, size(dXgrid))
-  dYones = g.dy*ones(T, size(dYgrid))
+  dXones = ArrayType(dev)(g.dx*ones(T, size(dXgrid)))
+  dYones = ArrayType(dev)(g.dy*ones(T, size(dYgrid)))
   isapprox(dXgrid, dXones) && isapprox(dYgrid, dYones)
 end
 
-function testgridpoints(g::ThreeDGrid{T, Ta}) where {T, Ta}
+function testgridpoints(dev::Device, g::ThreeDGrid{T}) where T
   X, Y, Z = gridpoints(g)
   dXgrid = @. X[2:end, :, :] - X[1:end-1, :, :]
   dYgrid = @. Y[:, 2:end, :] - Y[:, 1:end-1, :]
   dZgrid = @. Z[:, :, 2:end] - Z[:, :, 1:end-1]
-  dXones = g.dx*ones(T, size(dXgrid))
-  dYones = g.dy*ones(T, size(dYgrid))
-  dZones = g.dz*ones(T, size(dZgrid))
+  dXones = ArrayType(dev)(g.dx*ones(T, size(dXgrid)))
+  dYones = ArrayType(dev)(g.dy*ones(T, size(dYgrid)))
+  dZones = ArrayType(dev)(g.dz*ones(T, size(dZgrid)))
   isapprox(dXgrid, dXones) && isapprox(dYgrid, dYones) && isapprox(dZgrid, dZones)
 end