From 7648178d2e0af2a8402d18171aacd47443931379 Mon Sep 17 00:00:00 2001 From: Albert de Montserrat Date: Thu, 24 Oct 2024 18:09:46 +0200 Subject: [PATCH] initialize PS inside __init__() --- ext/JustPICAMDGPUExt.jl | 12 ++++++++---- ext/JustPICCUDAExt.jl | 12 ++++++++---- src/JustPIC_CPU.jl | 10 ++++++++-- 3 files changed, 24 insertions(+), 10 deletions(-) diff --git a/ext/JustPICAMDGPUExt.jl b/ext/JustPICAMDGPUExt.jl index 1638236e..6f3d084d 100644 --- a/ext/JustPICAMDGPUExt.jl +++ b/ext/JustPICAMDGPUExt.jl @@ -58,9 +58,11 @@ module _2D using MuladdMacro, ParallelStencil, CellArrays, CellArraysIndexing, StaticArrays using JustPIC - @init_parallel_stencil(AMDGPU, Float64, 2) + function __init__() + @init_parallel_stencil(AMDGPU, Float64, 2) + return nothing + end - import JustPIC: Euler, RungeKutta2, AbstractAdvectionIntegrator import JustPIC._2D.CA import JustPIC: Particles, PassiveMarkers @@ -324,8 +326,10 @@ module _3D using MuladdMacro, ParallelStencil, CellArrays, CellArraysIndexing, StaticArrays using JustPIC - @init_parallel_stencil(AMDGPU, Float64, 3) - + function __init__() + @init_parallel_stencil(AMDGPU, Float64, 3) + return nothing + end import JustPIC: Euler, RungeKutta2, AbstractAdvectionIntegrator, Particles, PassiveMarkers diff --git a/ext/JustPICCUDAExt.jl b/ext/JustPICCUDAExt.jl index b62b5dea..a3324775 100644 --- a/ext/JustPICCUDAExt.jl +++ b/ext/JustPICCUDAExt.jl @@ -56,9 +56,11 @@ module _2D using MuladdMacro, ParallelStencil, CellArrays, CellArraysIndexing, StaticArrays using JustPIC - @init_parallel_stencil(CUDA, Float64, 2) + function __init__() + @init_parallel_stencil(CUDA, Float64, 2) + return nothing + end - import JustPIC: Euler, RungeKutta2, AbstractAdvectionIntegrator import JustPIC._2D.CA import JustPIC: Particles, PassiveMarkers @@ -321,8 +323,10 @@ module _3D using MuladdMacro, ParallelStencil, CellArrays, CellArraysIndexing, StaticArrays using JustPIC - @init_parallel_stencil(CUDA, Float64, 3) - + function __init__() + @init_parallel_stencil(CUDA, Float64, 3) + return nothing + end macro myatomic(expr) return esc( diff --git a/src/JustPIC_CPU.jl b/src/JustPIC_CPU.jl index a2aa74a9..fc71be45 100644 --- a/src/JustPIC_CPU.jl +++ b/src/JustPIC_CPU.jl @@ -9,7 +9,10 @@ using ..JustPIC import ..JustPIC: AbstractBackend, CPUBackend -@init_parallel_stencil(Threads, Float64, 2) +function __init__() + @init_parallel_stencil(Threads, Float64, 2) + return nothing +end export CA @@ -37,7 +40,10 @@ using ..JustPIC import ..JustPIC: AbstractBackend, CPUBackend -@init_parallel_stencil(Threads, Float64, 3) +function __init__() + @init_parallel_stencil(Threads, Float64, 3) + return nothing +end export CA