Skip to content

Commit

Permalink
Merge pull request #24 from omlins/CUDA-skip
Browse files Browse the repository at this point in the history 
Add support for CUDA 3 and skip CUDA tests when not functional
  • Loading branch information
@omlins
omlins authored Apr 11, 2021
2 parents 2a80568 + f63b515 commit 1381f6b
Show file tree
Hide file tree
Showing 14 changed files with 82 additions and 26 deletions.
4 changes: 2 additions & 2 deletions Project.toml
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
name = "ParallelStencil"
uuid = "94395366-693c-11ea-3b26-d9b7aac5d958"
authors = ["Samuel Omlin", "Ludovic Räss"]
version = "0.5.2"
version = "0.5.3"

[compat]
julia = "1"
CUDA = "1, 2"
CUDA = "1, 2, 3"
MacroTools = "0.5"

[deps]
Expand Down
8 changes: 6 additions & 2 deletions test/ParallelKernel/test_allocators.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,13 @@ import ParallelStencil
using ParallelStencil.ParallelKernel
import ParallelStencil.ParallelKernel: @reset_parallel_kernel, @is_initialized, SUPPORTED_PACKAGES, PKG_CUDA
import ParallelStencil.ParallelKernel: @require, longnameof
@static if (PKG_CUDA in SUPPORTED_PACKAGES) import CUDA end
TEST_PACKAGES = SUPPORTED_PACKAGES
@static if PKG_CUDA in TEST_PACKAGES
import CUDA
if !CUDA.functional() TEST_PACKAGES = filter!(x->x≠PKG_CUDA, TEST_PACKAGES) end
end

@static for package in SUPPORTED_PACKAGES eval(:(
@static for package in TEST_PACKAGES eval(:(
@testset "$(basename(@__FILE__)) (package: $(nameof($package)))" begin
@testset "1. allocator macros" begin
@require !@is_initialized()
Expand Down
8 changes: 6 additions & 2 deletions test/ParallelKernel/test_hide_communication.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,13 @@ import ParallelStencil.ParallelKernel: @reset_parallel_kernel, @is_initialized,
import ParallelStencil.ParallelKernel: @require, longnameof, @prettyexpand, prettystring, @gorgeousexpand, gorgeousstring
import ParallelStencil.ParallelKernel: checkargs_hide_communication, hide_communication, hide_communication_cuda
using ParallelStencil.ParallelKernel.Exceptions
@static if (PKG_CUDA in SUPPORTED_PACKAGES) import CUDA end
TEST_PACKAGES = SUPPORTED_PACKAGES
@static if PKG_CUDA in TEST_PACKAGES
import CUDA
if !CUDA.functional() TEST_PACKAGES = filter!(x->x≠PKG_CUDA, TEST_PACKAGES) end
end

@static for package in SUPPORTED_PACKAGES eval(:(
@static for package in TEST_PACKAGES eval(:(
@testset "$(basename(@__FILE__)) (package: $(nameof($package)))" begin
@testset "1. hide_communication macro" begin
@init_parallel_kernel($package, Float64)
Expand Down
8 changes: 6 additions & 2 deletions test/ParallelKernel/test_init_parallel_kernel.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,13 @@ import ParallelStencil.ParallelKernel: @reset_parallel_kernel, @is_initialized,
import ParallelStencil.ParallelKernel: @require, @symbols, longnameof
import ParallelStencil.ParallelKernel: checkargs_init, check_already_initialized, set_initialized, is_initialized, check_initialized
using ParallelStencil.ParallelKernel.Exceptions
@static if (PKG_CUDA in SUPPORTED_PACKAGES) import CUDA end
TEST_PACKAGES = SUPPORTED_PACKAGES
@static if PKG_CUDA in TEST_PACKAGES
import CUDA
if !CUDA.functional() TEST_PACKAGES = filter!(x->x≠PKG_CUDA, TEST_PACKAGES) end
end

@static for package in SUPPORTED_PACKAGES eval(:(
@static for package in TEST_PACKAGES eval(:(
@testset "$(basename(@__FILE__)) (package: $(nameof($package)))" begin
@testset "1. initialization of ParallelKernel" begin
@require !@is_initialized()
Expand Down
8 changes: 6 additions & 2 deletions test/ParallelKernel/test_parallel.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,13 @@ import ParallelStencil.ParallelKernel: @reset_parallel_kernel, @is_initialized,
import ParallelStencil.ParallelKernel: @require, longnameof, @prettyexpand, prettystring
import ParallelStencil.ParallelKernel: checkargs_parallel, checkargs_parallel_indices, parallel, parallel_indices, synchronize
using ParallelStencil.ParallelKernel.Exceptions
@static if (PKG_CUDA in SUPPORTED_PACKAGES) import CUDA end
TEST_PACKAGES = SUPPORTED_PACKAGES
@static if PKG_CUDA in TEST_PACKAGES
import CUDA
if !CUDA.functional() TEST_PACKAGES = filter!(x->x≠PKG_CUDA, TEST_PACKAGES) end
end

@static for package in SUPPORTED_PACKAGES eval(:(
@static for package in TEST_PACKAGES eval(:(
@testset "$(basename(@__FILE__)) (package: $(nameof($package)))" begin
@testset "1. parallel macros" begin
@init_parallel_kernel($package, Float64)
Expand Down
8 changes: 6 additions & 2 deletions test/ParallelKernel/test_reset_parallel_kernel.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,13 @@ import ParallelStencil
using ParallelStencil.ParallelKernel
import ParallelStencil.ParallelKernel: @reset_parallel_kernel, @is_initialized, @get_package, @get_numbertype, SUPPORTED_PACKAGES, PKG_CUDA, PKG_NONE, NUMBERTYPE_NONE
import ParallelStencil.ParallelKernel: @require, @symbols, longnameof
@static if (PKG_CUDA in SUPPORTED_PACKAGES) import CUDA end
TEST_PACKAGES = SUPPORTED_PACKAGES
@static if PKG_CUDA in TEST_PACKAGES
import CUDA
if !CUDA.functional() TEST_PACKAGES = filter!(x->x≠PKG_CUDA, TEST_PACKAGES) end
end

@static for package in SUPPORTED_PACKAGES eval(:(
@static for package in TEST_PACKAGES eval(:(
@testset "$(basename(@__FILE__)) (package: $(nameof($package)))" begin
@testset "1. Reset of ParallelKernel" begin
@testset "Reset if not initialized" begin
Expand Down
8 changes: 8 additions & 0 deletions test/runtests.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
push!(LOAD_PATH, "../src")

import ParallelStencil # Precompile it.
import ParallelStencil: SUPPORTED_PACKAGES, PKG_CUDA
@static if (PKG_CUDA in SUPPORTED_PACKAGES) import CUDA end

excludedfiles = [ "test_excluded.jl"];

Expand All @@ -13,6 +15,11 @@ function runtests()

nfail = 0
printstyled("Testing package ParallelStencil.jl\n"; bold=true, color=:white)

if (PKG_CUDA in SUPPORTED_PACKAGES && !CUDA.functional())
@warn "Test Skip: All CUDA tests will be skipped because CUDA is not functional (if this is unexpected type `import CUDA; CUDA.functional(true)` to debug your CUDA installation)."
end

for f in testfiles
println("")
if f ∈ excludedfiles
Expand All @@ -28,4 +35,5 @@ function runtests()
end
return nfail
end

exit(runtests())
8 changes: 6 additions & 2 deletions test/test_FiniteDifferences1D.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,13 @@ using ParallelStencil
import ParallelStencil: @reset_parallel_stencil, @is_initialized, SUPPORTED_PACKAGES, PKG_CUDA, PKG_THREADS
import ParallelStencil: @require
using ParallelStencil.FiniteDifferences1D
@static if (PKG_CUDA in SUPPORTED_PACKAGES) import CUDA end
TEST_PACKAGES = SUPPORTED_PACKAGES
@static if PKG_CUDA in TEST_PACKAGES
import CUDA
if !CUDA.functional() TEST_PACKAGES = filter!(x->x≠PKG_CUDA, TEST_PACKAGES) end
end

@static for package in SUPPORTED_PACKAGES eval(:(
@static for package in TEST_PACKAGES eval(:(
@testset "$(basename(@__FILE__)) (package: $(nameof($package)))" begin
@init_parallel_stencil($package, Float64, 1)
@require @is_initialized()
Expand Down
8 changes: 6 additions & 2 deletions test/test_FiniteDifferences2D.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,13 @@ using ParallelStencil
import ParallelStencil: @reset_parallel_stencil, @is_initialized, SUPPORTED_PACKAGES, PKG_CUDA, PKG_THREADS
import ParallelStencil: @require
using ParallelStencil.FiniteDifferences2D
@static if (PKG_CUDA in SUPPORTED_PACKAGES) import CUDA end
TEST_PACKAGES = SUPPORTED_PACKAGES
@static if PKG_CUDA in TEST_PACKAGES
import CUDA
if !CUDA.functional() TEST_PACKAGES = filter!(x->x≠PKG_CUDA, TEST_PACKAGES) end
end

@static for package in SUPPORTED_PACKAGES eval(:(
@static for package in TEST_PACKAGES eval(:(
@testset "$(basename(@__FILE__)) (package: $(nameof($package)))" begin
@init_parallel_stencil($package, Float64, 2)
@require @is_initialized()
Expand Down
8 changes: 6 additions & 2 deletions test/test_FiniteDifferences3D.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,13 @@ using ParallelStencil
import ParallelStencil: @reset_parallel_stencil, @is_initialized, SUPPORTED_PACKAGES, PKG_CUDA, PKG_THREADS
import ParallelStencil: @require
using ParallelStencil.FiniteDifferences3D
@static if (PKG_CUDA in SUPPORTED_PACKAGES) import CUDA end
TEST_PACKAGES = SUPPORTED_PACKAGES
@static if PKG_CUDA in TEST_PACKAGES
import CUDA
if !CUDA.functional() TEST_PACKAGES = filter!(x->x≠PKG_CUDA, TEST_PACKAGES) end
end

@static for package in SUPPORTED_PACKAGES eval(:(
@static for package in TEST_PACKAGES eval(:(
@testset "$(basename(@__FILE__)) (package: $(nameof($package)))" begin
@init_parallel_stencil($package, Float64, 3)
@require @is_initialized()
Expand Down
8 changes: 6 additions & 2 deletions test/test_incremental_compilation.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,13 @@ push!(LOAD_PATH, joinpath(@__DIR__, ".."))
using Test
using Pkg
import ParallelStencil: SUPPORTED_PACKAGES, PKG_CUDA
@static if (PKG_CUDA in SUPPORTED_PACKAGES) import CUDA end
TEST_PACKAGES = SUPPORTED_PACKAGES
@static if PKG_CUDA in TEST_PACKAGES
import CUDA
if !CUDA.functional() TEST_PACKAGES = filter!(x->x≠PKG_CUDA, TEST_PACKAGES) end
end

@static for package in SUPPORTED_PACKAGES eval(:(
@static for package in TEST_PACKAGES eval(:(
@testset "$(basename(@__FILE__)) (package: $(nameof($package)))" begin
@testset "incremental compilation" begin
Pkg.activate(joinpath(@__DIR__, "test_projects", "Diffusion3D_$(nameof($package))"))
Expand Down
8 changes: 6 additions & 2 deletions test/test_init_parallel_stencil.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,13 @@ import ParallelStencil: @reset_parallel_stencil, @is_initialized, @get_package,
import ParallelStencil: @require, @symbols, longnameof
import ParallelStencil: checkargs_init, check_already_initialized, set_initialized, is_initialized, check_initialized, set_package, set_numbertype, set_ndims
using ParallelStencil.Exceptions
@static if (PKG_CUDA in SUPPORTED_PACKAGES) import CUDA end
TEST_PACKAGES = SUPPORTED_PACKAGES
@static if PKG_CUDA in TEST_PACKAGES
import CUDA
if !CUDA.functional() TEST_PACKAGES = filter!(x->x≠PKG_CUDA, TEST_PACKAGES) end
end

@static for package in SUPPORTED_PACKAGES eval(:(
@static for package in TEST_PACKAGES eval(:(
@testset "$(basename(@__FILE__)) (package: $(nameof($package)))" begin
@testset "1. initialization of ParallelStencil" begin
@require !@is_initialized()
Expand Down
8 changes: 6 additions & 2 deletions test/test_parallel.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,14 @@ import ParallelStencil: @require, longnameof, @prettyexpand, prettystring
import ParallelStencil: checkargs_parallel, validate_body, parallel
using ParallelStencil.Exceptions
using ParallelStencil.FiniteDifferences3D
@static if (PKG_CUDA in SUPPORTED_PACKAGES) import CUDA end
ix, iy, iz = INDICES[1], INDICES[2], INDICES[3]
TEST_PACKAGES = SUPPORTED_PACKAGES
@static if PKG_CUDA in TEST_PACKAGES
import CUDA
if !CUDA.functional() TEST_PACKAGES = filter!(x->x≠PKG_CUDA, TEST_PACKAGES) end
end

@static for package in SUPPORTED_PACKAGES eval(:(
@static for package in TEST_PACKAGES eval(:(
@testset "$(basename(@__FILE__)) (package: $(nameof($package)))" begin
@testset "1. parallel macros" begin
@init_parallel_stencil($package, Float64, 3)
Expand Down
8 changes: 6 additions & 2 deletions test/test_reset_parallel_stencil.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,13 @@ using Test
using ParallelStencil
import ParallelStencil: @reset_parallel_stencil, @is_initialized, @get_package, @get_numbertype, @get_ndims, SUPPORTED_PACKAGES, PKG_CUDA, PKG_NONE, NUMBERTYPE_NONE, NDIMS_NONE
import ParallelStencil: @require, @symbols, longnameof
@static if (PKG_CUDA in SUPPORTED_PACKAGES) import CUDA end
TEST_PACKAGES = SUPPORTED_PACKAGES
@static if PKG_CUDA in TEST_PACKAGES
import CUDA
if !CUDA.functional() TEST_PACKAGES = filter!(x->x≠PKG_CUDA, TEST_PACKAGES) end
end

@static for package in SUPPORTED_PACKAGES eval(:(
@static for package in TEST_PACKAGES eval(:(
@testset "$(basename(@__FILE__)) (package: $(nameof($package)))" begin
@testset "1. Reset of ParallelStencil" begin
@testset "Reset if not initialized" begin
Expand Down

2 comments on commit 1381f6b

@luraess
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JuliaRegistrator register

@JuliaRegistrator
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Registration pull request created: JuliaRegistries/General/34043

After the above pull request is merged, it is recommended that a tag is created on this repository for the registered package version.

This will be done automatically if the Julia TagBot GitHub Action is installed, or can be done manually through the github interface, or via:

git tag -a v0.5.3 -m "<description of version>" 1381f6bc5b67abd96d67f7635a4040873eb6ef7c
git push origin v0.5.3

Please sign in to comment.