From 9cf525ea69bfc07869e4dd31202bbfd16f00bc59 Mon Sep 17 00:00:00 2001 From: Navid Constantinou Date: Fri, 3 Jan 2020 23:52:18 +1100 Subject: [PATCH 1/2] adds GPU functionality --- Project.toml | 5 ++++- src/PassiveTracerFlows.jl | 2 ++ test/runtests.jl | 44 +++++++++++++++++++++++++-------------- 3 files changed, 34 insertions(+), 17 deletions(-) diff --git a/Project.toml b/Project.toml index 7016b97..ee287c4 100644 --- a/Project.toml +++ b/Project.toml @@ -8,6 +8,8 @@ version = "0.1.0" versions = ["0.1.0"] [deps] +CUDAapi = "3895d2a7-ec45-59b8-82bb-cfc6a382f9b3" +CuArrays = "3a865a2d-5b23-5a0f-bc46-62713ec82fae" FFTW = "7a1cc6ca-52ef-59f5-83cd-3a7055c09341" FourierFlows = "2aec4490-903f-5c70-9b11-9bed06a700e1" JLD2 = "033835bb-8acc-5ee8-8aae-3f567f8a3819" @@ -23,7 +25,8 @@ FourierFlows = "≥ 0.3.0" julia = "≥ 1.0.0" [extras] +Coverage = "a2441757-f6aa-5fb2-8edb-039e3f45d037" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [targets] -test = ["Test"] +test = ["Test", "Coverage"] diff --git a/src/PassiveTracerFlows.jl b/src/PassiveTracerFlows.jl index 9ce93f2..f7e6cd1 100644 --- a/src/PassiveTracerFlows.jl +++ b/src/PassiveTracerFlows.jl @@ -1,5 +1,7 @@ module PassiveTracerFlows +using FourierFlows + include("traceradvdiff.jl") end # module diff --git a/test/runtests.jl b/test/runtests.jl index f51dc0e..c9d7c05 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -10,28 +10,40 @@ using import # use 'import' rather than 'using' for submodules to keep namespace clean PassiveTracerFlows.TracerAdvDiff +# the devices on which tests will run +devices = (CPU(),) +@has_cuda devices = (CPU(), GPU()) +@has_cuda using CuArrays + const rtol_traceradvdiff = 1e-12 # tolerance for rtol_traceradvdiff tests # Run tests testtime = @elapsed begin + +for dev in devices + + println("testing on "*string(typeof(dev))) -@testset "TracerAdvDiff" begin - include("test_traceradvdiff.jl") + @testset "TracerAdvDiff" begin + include("test_traceradvdiff.jl") - @test test_noflow() - - stepper = "RK4" - dt, nsteps = 1e-2, 40 - @test test_constvel(stepper, dt, nsteps) - dt, tfinal = 0.002, 0.1 - @test test_timedependentvel(stepper, dt, tfinal) - dt, tfinal = 0.005, 0.1 - @test test_diffusion(stepper, dt, tfinal; steadyflow=true) - dt, tfinal = 0.005, 0.1 - @test test_diffusion(stepper, dt, tfinal; steadyflow=false) - dt, tfinal = 0.005, 0.1 - @test test_hyperdiffusion(stepper, dt, tfinal) + @test test_noflow() + + stepper = "RK4" + dt, nsteps = 1e-2, 40 + @test test_constvel(stepper, dt, nsteps) + dt, tfinal = 0.002, 0.1 + @test test_timedependentvel(stepper, dt, tfinal) + dt, tfinal = 0.005, 0.1 + @test test_diffusion(stepper, dt, tfinal; steadyflow=true) + dt, tfinal = 0.005, 0.1 + @test test_diffusion(stepper, dt, tfinal; steadyflow=false) + dt, tfinal = 0.005, 0.1 + @test test_hyperdiffusion(stepper, dt, tfinal) + end + end -end +end #time + println("Total test time: ", testtime) From 703d16e6dd4eb524b464ea2ebd7371af7ecea26e Mon Sep 17 00:00:00 2001 From: Navid Constantinou Date: Sat, 4 Jan 2020 00:05:20 +1100 Subject: [PATCH 2/2] updates badges --- README.md | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 084b88c..4153333 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,19 @@ # PassiveTracerFlows.jl

- - + + Build Status for CPU + + + Build Status for GPU - + Build Status for Window - + - + Coverage Status