Skip to content

Commit 7f2d512

Browse files
simone-silvestriglwagnervchuravy
authored
Remove performance-/precompilation-time harmful @eval (#3556)
* bugfix * remove evals * remove other eval * bugfix * Update src/Grids/latitude_longitude_grid.jl Co-authored-by: Gregory L. Wagner <[email protected]> * remove yet another eval * bugfix * Update src/Grids/latitude_longitude_grid.jl Co-authored-by: Gregory L. Wagner <[email protected]> * Update src/Grids/latitude_longitude_grid.jl Co-authored-by: Gregory L. Wagner <[email protected]> * simplify code * name change to reconstruction_coefficients function * bugfix * last bugfix * Replace a couple of evals with getglobal * Mark a few places where eval needs to be removed * Replace eval within interpolations utils with getglobal * removed last evals * correct typo * correct typos --------- Co-authored-by: Gregory L. Wagner <[email protected]> Co-authored-by: Valentin Churavy <[email protected]>
1 parent 96fa286 commit 7f2d512

File tree

8 files changed

+101
-97
lines changed

8 files changed

+101
-97
lines changed

‎src/AbstractOperations/grid_metrics.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ function metric_function(loc, metric::AbstractGridMetric)
114114
code = Tuple(interpolation_code(ℓ) for ℓ in loc)
115115
prefix = metric_function_prefix(metric)
116116
metric_function_symbol = Symbol(prefix, code...)
117-
return eval(metric_function_symbol)
117+
return getglobal(@__MODULE__, metric_function_symbol)
118118
end
119119

120120
struct GridMetricOperation{LX, LY, LZ, G, T, M} <: AbstractOperation{LX, LY, LZ, G, T}

‎src/Advection/reconstruction_coefficients.jl

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -209,25 +209,26 @@ end
209209
@inline function compute_reconstruction_coefficients(grid, FT, scheme; order)
210210

211211
method = scheme == :Centered ? 1 : scheme == :Upwind ? 2 : 3
212-
213-
rect_metrics = (:xᶠᵃᵃ, :xᶜᵃᵃ, :yᵃᶠᵃ, :yᵃᶜᵃ, :zᵃᵃᶠ, :zᵃᵃᶜ)
214-
212+
215213
if grid isa Nothing
216-
for metric in rect_metrics
217-
@eval $(Symbol(:coeff_ , metric)) = nothing
218-
@eval $(Symbol(:smooth_, metric)) = nothing
219-
end
214+
coeff_xᶠᵃᵃ = nothing
215+
coeff_xᶜᵃᵃ = nothing
216+
coeff_yᵃᶠᵃ = nothing
217+
coeff_yᵃᶜᵃ = nothing
218+
coeff_zᵃᵃᶠ = nothing
219+
coeff_zᵃᵃᶜ = nothing
220220
else
221-
metrics = coordinates(grid)
222-
dirsize = (:Nx, :Nx, :Ny, :Ny, :Nz, :Nz)
223-
224221
arch = architecture(grid)
225222
Hx, Hy, Hz = halo_size(grid)
226223
new_grid = with_halo((Hx+1, Hy+1, Hz+1), grid)
227-
228-
for (dir, metric, rect_metric) in zip(dirsize, metrics, rect_metrics)
229-
@eval $(Symbol(:coeff_ , rect_metric)) = calc_reconstruction_coefficients($FT, $new_grid.$metric, $arch, $new_grid.$dir, Val($method); order = $order)
230-
end
224+
metrics = coordinates(grid)
225+
226+
coeff_xᶠᵃᵃ = reconstruction_coefficients(FT, getproperty(new_grid, metrics[1]), arch, new_grid.Nx, Val(method); order)
227+
coeff_xᶜᵃᵃ = reconstruction_coefficients(FT, getproperty(new_grid, metrics[2]), arch, new_grid.Nx, Val(method); order)
228+
coeff_yᵃᶠᵃ = reconstruction_coefficients(FT, getproperty(new_grid, metrics[3]), arch, new_grid.Ny, Val(method); order)
229+
coeff_yᵃᶜᵃ = reconstruction_coefficients(FT, getproperty(new_grid, metrics[4]), arch, new_grid.Ny, Val(method); order)
230+
coeff_zᵃᵃᶠ = reconstruction_coefficients(FT, getproperty(new_grid, metrics[5]), arch, new_grid.Nz, Val(method); order)
231+
coeff_zᵃᵃᶜ = reconstruction_coefficients(FT, getproperty(new_grid, metrics[6]), arch, new_grid.Nz, Val(method); order)
231232
end
232233

233234
return (coeff_xᶠᵃᵃ, coeff_xᶜᵃᵃ, coeff_yᵃᶠᵃ, coeff_yᵃᶜᵃ, coeff_zᵃᵃᶠ, coeff_zᵃᵃᶜ)
@@ -236,21 +237,21 @@ end
236237
# Fallback for uniform directions
237238
for val in [1, 2, 3]
238239
@eval begin
239-
@inline calc_reconstruction_coefficients(FT, coord::OffsetArray{<:Any, <:Any, <:AbstractRange}, arch, N, ::Val{$val}; order) = nothing
240-
@inline calc_reconstruction_coefficients(FT, coord::AbstractRange, arch, N, ::Val{$val}; order) = nothing
240+
@inline reconstruction_coefficients(FT, coord::OffsetArray{<:Any, <:Any, <:AbstractRange}, arch, N, ::Val{$val}; order) = nothing
241+
@inline reconstruction_coefficients(FT, coord::AbstractRange, arch, N, ::Val{$val}; order) = nothing
241242
end
242243
end
243244

244245
# Stretched reconstruction coefficients for `Centered` schemes
245-
@inline function calc_reconstruction_coefficients(FT, coord, arch, N, ::Val{1}; order)
246+
@inline function reconstruction_coefficients(FT, coord, arch, N, ::Val{1}; order)
246247
cpu_coord = on_architecture(CPU(), coord)
247248
r = ((order + 1) ÷ 2) - 1
248249
s = create_reconstruction_coefficients(FT, r, cpu_coord, arch, N; order)
249250
return s
250251
end
251252

252253
# Stretched reconstruction coefficients for `UpwindBiased` schemes
253-
@inline function calc_reconstruction_coefficients(FT, coord, arch, N, ::Val{2}; order)
254+
@inline function reconstruction_coefficients(FT, coord, arch, N, ::Val{2}; order)
254255
cpu_coord = on_architecture(CPU(), coord)
255256
rleft = ((order + 1) ÷ 2) - 2
256257
rright = ((order + 1) ÷ 2) - 1
@@ -262,7 +263,7 @@ end
262263
end
263264

264265
# Stretched reconstruction coefficients for `WENO` schemes
265-
@inline function calc_reconstruction_coefficients(FT, coord, arch, N, ::Val{3}; order)
266+
@inline function reconstruction_coefficients(FT, coord, arch, N, ::Val{3}; order)
266267

267268
cpu_coord = on_architecture(CPU(), coord)
268269
s = []

‎src/Grids/latitude_longitude_grid.jl

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -528,16 +528,6 @@ end
528528

529529
function allocate_metrics(grid::LatitudeLongitudeGrid)
530530
FT = eltype(grid)
531-
532-
# preallocate quantities to ensure correct type and size
533-
grid_metrics = (:Δxᶠᶜ,
534-
:Δxᶜᶠ,
535-
:Δxᶠᶠ,
536-
:Δxᶜᶜ,
537-
:Azᶠᶜ,
538-
:Azᶜᶠ,
539-
:Azᶠᶠ,
540-
:Azᶜᶜ)
541531

542532
arch = grid.architecture
543533

@@ -546,14 +536,17 @@ function allocate_metrics(grid::LatitudeLongitudeGrid)
546536
metric_size = length(grid.φᵃᶜᵃ)
547537
else
548538
offsets = (grid.Δλᶜᵃᵃ.offsets[1], grid.φᵃᶜᵃ.offsets[1])
549-
metric_size = (length(grid.Δλᶜᵃᵃ) , length(grid.φᵃᶜᵃ))
539+
metric_size = (length(grid.Δλᶜᵃᵃ), length(grid.φᵃᶜᵃ))
550540
end
551541

552-
for metric in grid_metrics
553-
parentM = Symbol(metric, :_parent)
554-
@eval $parentM = zeros($FT, $metric_size...)
555-
@eval $metric = OffsetArray(on_architecture($arch, $parentM), $offsets...)
556-
end
542+
Δxᶠᶜ = OffsetArray(zeros(FT, arch, metric_size...), offsets...)
543+
Δxᶜᶠ = OffsetArray(zeros(FT, arch, metric_size...), offsets...)
544+
Δxᶠᶠ = OffsetArray(zeros(FT, arch, metric_size...), offsets...)
545+
Δxᶜᶜ = OffsetArray(zeros(FT, arch, metric_size...), offsets...)
546+
Azᶠᶜ = OffsetArray(zeros(FT, arch, metric_size...), offsets...)
547+
Azᶜᶠ = OffsetArray(zeros(FT, arch, metric_size...), offsets...)
548+
Azᶠᶠ = OffsetArray(zeros(FT, arch, metric_size...), offsets...)
549+
Azᶜᶜ = OffsetArray(zeros(FT, arch, metric_size...), offsets...)
557550

558551
if grid isa YRegularLLG
559552
Δyᶠᶜ = FT(0)

‎src/Grids/nodes_and_spacings.jl

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,6 @@ julia> xspacings(grid, Center(), Face(), Center())
195195
"""
196196
@inline xspacings(grid, ℓx, ℓy, ℓz; with_halos=true) = xspacings(grid, ℓx; with_halos)
197197

198-
199198
"""
200199
yspacings(grid, ℓx, ℓy, ℓz; with_halos=true)
201200
@@ -233,8 +232,12 @@ julia> zspacings(grid, Center(), Center(), Center())
233232
destantiate(::Face) = Face
234233
destantiate(::Center) = Center
235234

236-
function minimum_spacing(dir, grid, ℓx, ℓy, ℓz)
237-
spacing = eval(Symbol(dir, :spacing))
235+
spacing_function(::Val{:x}) = xspacing
236+
spacing_function(::Val{:y}) = yspacing
237+
spacing_function(::Val{:z}) = zspacing
238+
239+
function minimum_spacing(s, grid, ℓx, ℓy, ℓz)
240+
spacing = spacing_function(s)
238241
LX, LY, LZ = map(destantiate, (ℓx, ℓy, ℓz))
239242
Δ = KernelFunctionOperation{LX, LY, LZ}(spacing, grid, ℓx, ℓy, ℓz)
240243

@@ -258,8 +261,8 @@ julia> minimum_xspacing(grid, Center(), Center(), Center())
258261
0.5
259262
```
260263
"""
261-
minimum_xspacing(grid, ℓx, ℓy, ℓz) = minimum_spacing(:x, grid, ℓx, ℓy, ℓz)
262-
minimum_xspacing(grid) = minimum_spacing(:x, grid, Center(), Center(), Center())
264+
minimum_xspacing(grid, ℓx, ℓy, ℓz) = minimum_spacing(Val(:x), grid, ℓx, ℓy, ℓz)
265+
minimum_xspacing(grid) = minimum_spacing(Val(:x), grid, Center(), Center(), Center())
263266
"""
264267
minimum_yspacing(grid, ℓx, ℓy, ℓz)
265268
minimum_yspacing(grid) = minimum_yspacing(grid, Center(), Center(), Center())
@@ -277,8 +280,8 @@ julia> minimum_yspacing(grid, Center(), Center(), Center())
277280
0.25
278281
```
279282
"""
280-
minimum_yspacing(grid, ℓx, ℓy, ℓz) = minimum_spacing(:y, grid, ℓx, ℓy, ℓz)
281-
minimum_yspacing(grid) = minimum_spacing(:y, grid, Center(), Center(), Center())
283+
minimum_yspacing(grid, ℓx, ℓy, ℓz) = minimum_spacing(Val(:y), grid, ℓx, ℓy, ℓz)
284+
minimum_yspacing(grid) = minimum_spacing(Val(:y), grid, Center(), Center(), Center())
282285

283286
"""
284287
minimum_zspacing(grid, ℓx, ℓy, ℓz)
@@ -297,7 +300,7 @@ julia> minimum_zspacing(grid, Center(), Center(), Center())
297300
0.125
298301
```
299302
"""
300-
minimum_zspacing(grid, ℓx, ℓy, ℓz) = minimum_spacing(:z, grid, ℓx, ℓy, ℓz)
301-
minimum_zspacing(grid) = minimum_spacing(:z, grid, Center(), Center(), Center())
303+
minimum_zspacing(grid, ℓx, ℓy, ℓz) = minimum_spacing(Val(:z), grid, ℓx, ℓy, ℓz)
304+
minimum_zspacing(grid) = minimum_spacing(Val(:z), grid, Center(), Center(), Center())
302305

303306

‎src/MultiRegion/cubed_sphere_grid.jl

Lines changed: 53 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -241,59 +241,65 @@ function ConformalCubedSphereGrid(arch::AbstractArchitecture=CPU(), FT=Float64;
241241
region_grids,
242242
devices)
243243

244-
fields = (:λᶜᶜᵃ, :φᶜᶜᵃ, :Azᶜᶜᵃ , :λᶠᶠᵃ, :φᶠᶠᵃ, :Azᶠᶠᵃ)
245-
LXs = (:Center, :Center, :Center, :Face, :Face, :Face )
246-
LYs = (:Center, :Center, :Center, :Face, :Face, :Face )
247-
248-
for (field, LX, LY) in zip(fields, LXs, LYs)
249-
expr = quote
250-
$(Symbol(field)) = Field{$(Symbol(LX)), $(Symbol(LY)), Nothing}($(grid))
251-
252-
for region in 1:number_of_regions($(grid))
253-
getregion($(Symbol(field)), region).data .= getregion($(grid), region).$(Symbol(field))
254-
end
255-
256-
if $(horizontal_topology) == FullyConnected
257-
fill_halo_regions!($(Symbol(field)))
258-
end
244+
λᶜᶜᵃ = Field((Center, Center, Nothing), grid)
245+
φᶜᶜᵃ = Field((Center, Center, Nothing), grid)
246+
Azᶜᶜᵃ = Field((Center, Center, Nothing), grid)
247+
λᶠᶠᵃ = Field((Face, Face, Nothing), grid)
248+
φᶠᶠᵃ = Field((Face, Face, Nothing), grid)
249+
Azᶠᶠᵃ = Field((Face, Face, Nothing), grid)
250+
251+
for (field, name) in zip(( λᶜᶜᵃ, φᶜᶜᵃ, Azᶜᶜᵃ, λᶠᶠᵃ, φᶠᶠᵃ, Azᶠᶠᵃ),
252+
(:λᶜᶜᵃ, :φᶜᶜᵃ, :Azᶜᶜᵃ, :λᶠᶠᵃ, :φᶠᶠᵃ, :Azᶠᶠᵃ))
253+
254+
for region in 1:number_of_regions(grid)
255+
getregion(field, region).data .= getproperty(getregion(grid, region), name)
256+
end
259257

260-
for region in 1:number_of_regions($(grid))
261-
getregion($(grid), region).$(Symbol(field)) .= getregion($(Symbol(field)), region).data
262-
end
263-
end # quote
258+
if horizontal_topology == FullyConnected
259+
fill_halo_regions!(field)
260+
end
264261

265-
eval(expr)
262+
for region in 1:number_of_regions(grid)
263+
getproperty(getregion(grid, region), name) .= getregion(field, region).data
264+
end
266265
end
267266

268-
fields₁ = (:Δxᶜᶜᵃ, :Δxᶠᶜᵃ, :Δyᶠᶜᵃ, :λᶠᶜᵃ, :φᶠᶜᵃ, :Azᶠᶜᵃ , :Δxᶠᶠᵃ)
269-
LXs₁ = (:Center, :Face, :Face, :Face, :Face, :Face , :Face )
270-
LYs₁ = (:Center, :Center, :Center, :Center, :Center, :Center, :Face )
271-
272-
fields₂ = (:Δyᶜᶜᵃ, :Δyᶜᶠᵃ, :Δxᶜᶠᵃ, :λᶜᶠᵃ, :φᶜᶠᵃ, :Azᶜᶠᵃ , :Δyᶠᶠᵃ)
273-
LXs₂ = (:Center, :Center, :Center, :Center, :Center, :Center, :Face )
274-
LYs₂ = (:Center, :Face, :Face, :Face, :Face, :Face , :Face )
275-
276-
for (field₁, LX₁, LY₁, field₂, LX₂, LY₂) in zip(fields₁, LXs₁, LYs₁, fields₂, LXs₂, LYs₂)
277-
expr = quote
278-
$(Symbol(field₁)) = Field{$(Symbol(LX₁)), $(Symbol(LY₁)), Nothing}($(grid))
279-
$(Symbol(field₂)) = Field{$(Symbol(LX₂)), $(Symbol(LY₂)), Nothing}($(grid))
280-
281-
for region in 1:number_of_regions($(grid))
282-
getregion($(Symbol(field₁)), region).data .= getregion($(grid), region).$(Symbol(field₁))
283-
getregion($(Symbol(field₂)), region).data .= getregion($(grid), region).$(Symbol(field₂))
284-
end
285-
286-
if $(horizontal_topology) == FullyConnected
287-
fill_halo_regions!(($(Symbol(field₁)), $(Symbol(field₂))); signed = false)
288-
end
267+
Δxᶜᶜᵃ = Field((Center, Center, Nothing), grid)
268+
Δxᶠᶜᵃ = Field((Face, Center, Nothing), grid)
269+
Δyᶠᶜᵃ = Field((Face, Center, Nothing), grid)
270+
λᶠᶜᵃ = Field((Face, Center, Nothing), grid)
271+
φᶠᶜᵃ = Field((Face, Center, Nothing), grid)
272+
Azᶠᶜᵃ = Field((Face, Center, Nothing), grid)
273+
Δxᶠᶠᵃ = Field((Face, Face, Nothing), grid)
274+
275+
fields₁ = ( Δxᶜᶜᵃ, Δxᶠᶜᵃ, Δyᶠᶜᵃ, λᶠᶜᵃ, φᶠᶜᵃ, Azᶠᶜᵃ , Δxᶠᶠᵃ)
276+
names₁ = (:Δxᶜᶜᵃ, :Δxᶠᶜᵃ, :Δyᶠᶜᵃ, :λᶠᶜᵃ, :φᶠᶜᵃ, :Azᶠᶜᵃ , :Δxᶠᶠᵃ)
277+
278+
Δyᶜᶜᵃ = Field((Center, Center, Nothing), grid)
279+
Δyᶜᶠᵃ = Field((Center, Face, Nothing), grid)
280+
Δxᶜᶠᵃ = Field((Center, Face, Nothing), grid)
281+
λᶜᶠᵃ = Field((Center, Face, Nothing), grid)
282+
φᶜᶠᵃ = Field((Center, Face, Nothing), grid)
283+
Azᶜᶠᵃ = Field((Center, Face, Nothing), grid)
284+
Δyᶠᶠᵃ = Field((Face, Face, Nothing), grid)
285+
286+
fields₂ = ( Δyᶜᶜᵃ, Δyᶜᶠᵃ, Δxᶜᶠᵃ, λᶜᶠᵃ, φᶜᶠᵃ, Azᶜᶠᵃ , Δyᶠᶠᵃ)
287+
names₂ = (:Δyᶜᶜᵃ, :Δyᶜᶠᵃ, :Δxᶜᶠᵃ, :λᶜᶠᵃ, :φᶜᶠᵃ, :Azᶜᶠᵃ , :Δyᶠᶠᵃ)
288+
289+
for (field₁, field₂, name₁, name₂) in zip(fields₁, fields₂, names₁, names₂)
290+
for region in 1:number_of_regions(grid)
291+
getregion(field₁, region).data .= getproperty(getregion(grid, region), name₁)
292+
getregion(field₂, region).data .= getproperty(getregion(grid, region), name₂)
293+
end
289294

290-
for region in 1:number_of_regions($(grid))
291-
getregion($(grid), region).$(Symbol(field₁)) .= getregion($(Symbol(field₁)), region).data
292-
getregion($(grid), region).$(Symbol(field₂)) .= getregion($(Symbol(field₂)), region).data
293-
end
294-
end # quote
295+
if horizontal_topology == FullyConnected
296+
fill_halo_regions!(field₁, field₂; signed = false)
297+
end
295298

296-
eval(expr)
299+
for region in 1:number_of_regions(grid)
300+
getproperty(getregion(grid, region), name₁) .= getregion(field₁, region).data
301+
getproperty(getregion(grid, region), name₂) .= getregion(field₂, region).data
302+
end
297303
end
298304

299305
###################################################

‎src/MultiRegion/multi_region_models.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const MultiRegionModel = HydrostaticFreeSurfaceModel{<:Any, <:Any, <:AbstractArc
1717

1818
# Utility to generate the inputs to complex `getregion`s
1919
function getregionalproperties(T, inner=true)
20-
type = eval(T)
20+
type = getglobal(@__MODULE__, T)
2121
names = fieldnames(type)
2222
args = Vector(undef, length(names))
2323
for (n, name) in enumerate(names)

‎src/Operators/interpolation_utils.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,9 @@ function interpolation_operator(from, to)
6262
global identity_counter += 1
6363
identity = identify_an_identity(identity_counter)
6464

65-
return @eval $identity
65+
return getglobal(@__MODULE__, identity)
6666
else
67-
return eval(Symbol(:ℑ, ℑxsym(x), ℑysym(y), ℑzsym(z), x, y, z))
67+
return getglobal(@__MODULE__, Symbol(:ℑ, ℑxsym(x), ℑysym(y), ℑzsym(z), x, y, z))
6868
end
6969
end
7070

@@ -77,7 +77,7 @@ operator for fields that have no intrinsic location, like numbers or functions.
7777
function interpolation_operator(::Nothing, to)
7878
global identity_counter += 1
7979
identity = identify_an_identity(identity_counter)
80-
return @eval $identity
80+
return getglobal(@__MODULE__, identity)
8181
end
8282

8383
assumed_field_location(name) = name === :u ? (Face, Center, Center) :

‎src/TimeSteppers/TimeSteppers.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ julia> stepper = TimeStepper(:QuasiAdamsBashforth2, CPU(), grid, tracernames)
3535
"""
3636
function TimeStepper(name::Symbol, args...; kwargs...)
3737
fullname = Symbol(name, :TimeStepper)
38-
return @eval $fullname($args...; $kwargs...)
38+
TS = getglobal(@__MODULE__, fullname)
39+
return TS(args...; kwargs...)
3940
end
4041

4142
# Fallback

0 commit comments

Comments
 (0)