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.

Sign up for GitHub

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

Force buildkite to run test_save_load.jl #193

Merged
merged 10 commits into from
Jan 17, 2025
Merged

Force buildkite to run test_save_load.jl #193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b41a54d
force run test_save_load.jl on CUDA
albert-de-montserrat Jan 17, 2025
044a06d
was missing also on cpu...
albert-de-montserrat Jan 17, 2025
85235e9
couple of GPU updates
albert-de-montserrat Jan 17, 2025
bc29559
fix GPU testing
albert-de-montserrat Jan 17, 2025
1527e59
wee fix
albert-de-montserrat Jan 17, 2025
69c060b
up
albert-de-montserrat Jan 17, 2025
496a3e5
typo
albert-de-montserrat Jan 17, 2025
3f485b8
add Test
albert-de-montserrat Jan 17, 2025
f9d809c
up test
albert-de-montserrat Jan 17, 2025
4d12293
fixup
albert-de-montserrat Jan 17, 2025
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
13 changes: 9 additions & 4 deletions ext/JustPICAMDGPUExt.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,13 @@ function AMDGPU.ROCArray(::Type{T}, particles::JustPIC.Particles) where {T<:Numb
end

function AMDGPU.ROCArray(::Type{T}, phase_ratios::JustPIC.PhaseRatios) where {T<:Number}
(; vertex, center) = phase_ratios
return JustPIC.PhaseRatios(AMDGPUBackend, ROCArray(T, center), ROCArray(T, vertex))
(; center, vertex, Vx, Vy, Vz, yz, xz, xy) = phase_ratios
return JustPIC.PhaseRatios(AMDGPUBackend, ROCArray(T, center), ROCArray(T, vertex), ROCArray(T, Vx), ROCArray(T, Vy), ROCArray(T, Vz), ROCArray(T, yz), ROCArray(T, xz), ROCArray(T, xy))
end

function AMDGPU.ROCArray(phase_ratios::JustPIC.PhaseRatios)
(; center, vertex, Vx, Vy, Vz, yz, xz, xy) = phase_ratios
return JustPIC.PhaseRatios(AMDGPUBackend, ROCArray(center), ROCArray(vertex), ROCArray(Vx), ROCArray(Vy), ROCArray(Vz), ROCArray(yz), ROCArray(xz), ROCArray(xy))
end

function AMDGPU.ROCArray(particles::JustPIC.Particles)
Expand Down Expand Up @@ -87,7 +92,7 @@ module _2D
# Conversions
function JustPIC._2D.Particles(
coords,
index::CellArray{StaticArraysCore.SVector{N1,Bool},3,0, ROCArray{Bool,N2}},
index::CellArray{StaticArraysCore.SVector{N1,Bool},2,0, ROCArray{Bool,N2}},
nxcell,
max_xcell,
min_xcell,
Expand All @@ -98,7 +103,7 @@ module _2D

function JustPIC._2D.Particles(
coords,
index::CellArray{StaticArraysCore.SVector{N1,Bool},3,0,ROCArray{Bool,N2, B}},
index::CellArray{StaticArraysCore.SVector{N1,Bool},2,0,ROCArray{Bool,N2, B}},
nxcell,
max_xcell,
min_xcell,
Expand Down
18 changes: 9 additions & 9 deletions ext/JustPICCUDAExt.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,13 @@ function CUDA.CuArray(::Type{T}, particles::JustPIC.Particles) where {T<:Number}
end

function CUDA.CuArray(::Type{T}, phase_ratios::JustPIC.PhaseRatios) where {T<:Number}
(; vertex, center) = phase_ratios
return JustPIC.PhaseRatios(CUDABackend, CuArray(T, center), CuArray(T, vertex))
(; center, vertex, Vx, Vy, Vz, yz, xz, xy) = phase_ratios
return JustPIC.PhaseRatios(CUDABackend, CuArray(T, center), CuArray(T, vertex), CuArray(T, Vx), CuArray(T, Vy), CuArray(T, Vz), CuArray(T, yz), CuArray(T, xz), CuArray(T, xy))
end

function CUDA.CuArray(phase_ratios::JustPIC.PhaseRatios)
(; center, vertex, Vx, Vy, Vz, yz, xz, xy) = phase_ratios
return JustPIC.PhaseRatios(CUDABackend, CuArray(center), CuArray(vertex), CuArray(Vx), CuArray(Vy), CuArray(Vz), CuArray(yz), CuArray(xz), CuArray(xy))
end

function CUDA.CuArray(particles::JustPIC.Particles)
Expand All @@ -25,11 +30,6 @@ function CUDA.CuArray(particles::JustPIC.Particles)
return Particles(CUDABackend, coords_gpu, CuArray(index), nxcell, max_xcell, min_xcell, np)
end

function CUDA.CuArray(phase_ratios::JustPIC.PhaseRatios)
(; vertex, center) = phase_ratios
return JustPIC.PhaseRatios(CUDABackend, CuArray(center), CuArray(vertex))
end

function CUDA.CuArray(::Type{T}, CA::CellArray) where {T<:Number}
ni = size(CA)
# Array initializations
Expand Down Expand Up @@ -87,7 +87,7 @@ module _2D
# Conversions
function JustPIC._2D.Particles(
coords,
index::CellArray{StaticArraysCore.SVector{N1,Bool},3,0, CuArray{Bool,N2}},
index::CellArray{StaticArraysCore.SVector{N1,Bool},2,0, CuArray{Bool,N2}},
nxcell,
max_xcell,
min_xcell,
Expand All @@ -98,7 +98,7 @@ module _2D

function JustPIC._2D.Particles(
coords,
index::CellArray{StaticArraysCore.SVector{N1,Bool},3,0,CuArray{Bool,N2, B}},
index::CellArray{StaticArraysCore.SVector{N1,Bool},2,0,CuArray{Bool,N2, B}},
nxcell,
max_xcell,
min_xcell,
Expand Down
4 changes: 4 additions & 0 deletions test/runtests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ function runtests()
include("test_2D.jl")
include("test_integrators.jl")
include("test_CellArrays.jl")
include("test_save_load.jl")
catch
nfail +=1
end
Expand Down Expand Up @@ -79,6 +80,9 @@ function runtests()
end
end
end

# Force IO test on GPU
run(`$(Base.julia_cmd()) --startup-file=no $(joinpath(testdir, "test_save_load.jl"))`)
end

return nfail
Expand Down
Loading
Loading