Add support for ClimaComms < 0.6 in tests

CliMA · Jun 28, 2024 · db92f6e · db92f6e
1 parent c3b259c
commit db92f6e
Show file tree

Hide file tree

Showing 87 changed files with 87 additions and 87 deletions.
diff --git a/examples/bickleyjet/bickleyjet_cg_invariant_hypervisc.jl b/examples/bickleyjet/bickleyjet_cg_invariant_hypervisc.jl
@@ -14,7 +14,7 @@ import ClimaCore:
 using OrdinaryDiffEq: ODEProblem, solve, SSPRK33
 
 using Logging
-ClimaComms.@import_required_backends
+@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
 const context = ClimaComms.context()
 usempi = context isa ClimaComms.MPICommsContext
 if usempi

diff --git a/examples/column/advect.jl b/examples/column/advect.jl
@@ -1,5 +1,5 @@
 import ClimaComms
-ClimaComms.@import_required_backends
+@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
 import ClimaCore:
     Fields,
     Domains,

diff --git a/examples/column/advect_diffusion.jl b/examples/column/advect_diffusion.jl
@@ -1,5 +1,5 @@
 import ClimaComms
-ClimaComms.@import_required_backends
+@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
 import ClimaCore:
     Fields,
     Domains,

diff --git a/examples/column/bb_fct_advection.jl b/examples/column/bb_fct_advection.jl
@@ -1,5 +1,5 @@
 import ClimaComms
-ClimaComms.@import_required_backends
+@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
 using Test
 using LinearAlgebra
 using OrdinaryDiffEq: ODEProblem, solve

diff --git a/examples/column/ekman.jl b/examples/column/ekman.jl
@@ -1,5 +1,5 @@
 import ClimaComms
-ClimaComms.@import_required_backends
+@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
 using LinearAlgebra
 import ClimaCore:
     Fields,

diff --git a/examples/column/fct_advection.jl b/examples/column/fct_advection.jl
@@ -1,5 +1,5 @@
 import ClimaComms
-ClimaComms.@import_required_backends
+@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
 using Test
 using LinearAlgebra
 using OrdinaryDiffEq: ODEProblem, solve, SSPRK33

diff --git a/examples/column/heat.jl b/examples/column/heat.jl
@@ -1,5 +1,5 @@
 import ClimaComms
-ClimaComms.@import_required_backends
+@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
 import ClimaCore:
     Fields,
     Domains,

diff --git a/examples/column/hydrostatic.jl b/examples/column/hydrostatic.jl
@@ -1,5 +1,5 @@
 import ClimaComms
-ClimaComms.@import_required_backends
+@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
 import ClimaCore:
     Fields,
     Domains,

diff --git a/examples/column/hydrostatic_discrete.jl b/examples/column/hydrostatic_discrete.jl
@@ -1,5 +1,5 @@
 import ClimaComms
-ClimaComms.@import_required_backends
+@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
 import ClimaCore:
     Fields,
     Domains,

diff --git a/examples/column/hydrostatic_ekman.jl b/examples/column/hydrostatic_ekman.jl
@@ -1,5 +1,5 @@
 import ClimaComms
-ClimaComms.@import_required_backends
+@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
 using LinearAlgebra
 
 import ClimaCore:

diff --git a/examples/column/step.jl b/examples/column/step.jl
@@ -1,5 +1,5 @@
 import ClimaComms
-ClimaComms.@import_required_backends
+@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
 using LinearAlgebra
 import ClimaCore:
     Fields,

diff --git a/examples/column/wave.jl b/examples/column/wave.jl
@@ -1,5 +1,5 @@
 import ClimaComms
-ClimaComms.@import_required_backends
+@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
 import ClimaCore.Geometry, LinearAlgebra
 import ClimaCore:
     Fields,

diff --git a/examples/column/zalesak_fct_advection.jl b/examples/column/zalesak_fct_advection.jl
@@ -1,5 +1,5 @@
 import ClimaComms
-ClimaComms.@import_required_backends
+@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
 using Test
 using LinearAlgebra
 using OrdinaryDiffEq: ODEProblem, solve

diff --git a/examples/hybrid/box/bubble_3d_invariant_rhoe.jl b/examples/hybrid/box/bubble_3d_invariant_rhoe.jl
@@ -11,7 +11,7 @@
 using Test
 using Adapt
 using ClimaComms
-ClimaComms.@import_required_backends
+@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
 FloatType = eval(Meta.parse(get(ARGS, 1, "Float64")))
 using StaticArrays, IntervalSets, LinearAlgebra, OrdinaryDiffEq
 using DocStringExtensions

diff --git a/examples/hybrid/box/bubble_3d_invariant_rhotheta.jl b/examples/hybrid/box/bubble_3d_invariant_rhotheta.jl
@@ -3,7 +3,7 @@ using ClimaComms
 using LinearAlgebra
 
 import ClimaComms
-ClimaComms.@import_required_backends
+@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
 
 import ClimaCore:
     ClimaCore,

diff --git a/examples/hybrid/box/bubble_3d_rhotheta.jl b/examples/hybrid/box/bubble_3d_rhotheta.jl
@@ -3,7 +3,7 @@ using ClimaComms
 using LinearAlgebra, StaticArrays
 
 import ClimaComms
-ClimaComms.@import_required_backends
+@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
 
 import ClimaCore:
     ClimaCore,

diff --git a/examples/hybrid/box/limiters_advection.jl b/examples/hybrid/box/limiters_advection.jl
@@ -6,7 +6,7 @@ ARGS = ["cosine_bells"];
 using Revise; include(joinpath("examples", "hybrid", "box", "limiters_advection.jl"))
 =#
 using ClimaComms
-ClimaComms.@import_required_backends
+@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
 using LinearAlgebra
 using SciMLBase
 

diff --git a/examples/hybrid/driver.jl b/examples/hybrid/driver.jl
@@ -26,7 +26,7 @@ postprocessing(sol, output_dir) = nothing
 
 import ClimaTimeSteppers as CTS
 using ClimaComms
-ClimaComms.@import_required_backends
+@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
 import SciMLBase
 const comms_ctx = ClimaComms.context()
 is_distributed = comms_ctx isa ClimaComms.MPICommsContext

diff --git a/examples/hybrid/hybrid3dcs_dss.jl b/examples/hybrid/hybrid3dcs_dss.jl
@@ -6,7 +6,7 @@ using JLD2
 include("../nvtx.jl")
 
 import ClimaComms
-ClimaComms.@import_required_backends
+@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
 
 import ClimaCore:
     Domains,

diff --git a/examples/hybrid/plane/bubble_2d_invariant_rhoe.jl b/examples/hybrid/plane/bubble_2d_invariant_rhoe.jl
@@ -4,7 +4,7 @@ using Test
 using StaticArrays, IntervalSets, LinearAlgebra
 
 import ClimaComms
-ClimaComms.@import_required_backends
+@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
 
 import ClimaCore:
     ClimaCore,

diff --git a/examples/hybrid/plane/density_current_2d_flux_form.jl b/examples/hybrid/plane/density_current_2d_flux_form.jl
@@ -2,7 +2,7 @@ using Test
 using LinearAlgebra, StaticArrays
 
 import ClimaComms
-ClimaComms.@import_required_backends
+@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
 
 import ClimaCore:
     ClimaCore,

diff --git a/examples/hybrid/plane/density_current_2dinvariant_rhoe.jl b/examples/hybrid/plane/density_current_2dinvariant_rhoe.jl
@@ -4,7 +4,7 @@ using Test
 using StaticArrays, IntervalSets, LinearAlgebra
 
 import ClimaComms
-ClimaComms.@import_required_backends
+@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
 
 import ClimaCore:
     ClimaCore,

diff --git a/examples/hybrid/plane/inertial_gravity_wave.jl b/examples/hybrid/plane/inertial_gravity_wave.jl
@@ -7,7 +7,7 @@ using Printf
 using ProgressLogging
 using ClimaCorePlots, Plots
 import ClimaComms
-ClimaComms.@import_required_backends
+@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
 
 # Reference paper: https://rmets.onlinelibrary.wiley.com/doi/pdf/10.1002/qj.2105
 

diff --git a/examples/hybrid/plane/isothermal_channel.jl b/examples/hybrid/plane/isothermal_channel.jl
@@ -2,7 +2,7 @@ using Test
 using StaticArrays, IntervalSets, LinearAlgebra
 
 import ClimaComms
-ClimaComms.@import_required_backends
+@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
 
 import ClimaCore:
     ClimaCore,

diff --git a/examples/hybrid/plane/topo_agnesi_nh.jl b/examples/hybrid/plane/topo_agnesi_nh.jl
@@ -2,7 +2,7 @@ using Test
 using StaticArrays, IntervalSets, LinearAlgebra
 
 import ClimaComms
-ClimaComms.@import_required_backends
+@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
 import ClimaCore:
     ClimaCore,
     slab,

diff --git a/examples/hybrid/plane/topo_schar_nh.jl b/examples/hybrid/plane/topo_schar_nh.jl
@@ -2,7 +2,7 @@ using Test
 using StaticArrays, IntervalSets, LinearAlgebra
 
 import ClimaComms
-ClimaComms.@import_required_backends
+@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
 
 import ClimaCore:
     ClimaCore,

diff --git a/examples/hybrid/sphere/baroclinic_wave_utilities.jl b/examples/hybrid/sphere/baroclinic_wave_utilities.jl
@@ -1,5 +1,5 @@
 import ClimaComms
-ClimaComms.@import_required_backends
+@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
 
 # Constants required by "staggered_nonhydrostatic_model.jl"
 # const FT = ? # specified in each test file

diff --git a/examples/hybrid/sphere/deformation_flow.jl b/examples/hybrid/sphere/deformation_flow.jl
@@ -1,5 +1,5 @@
 import ClimaComms
-ClimaComms.@import_required_backends
+@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
 using OrdinaryDiffEq
 using Test
 using Statistics: mean

diff --git a/examples/hybrid/sphere/hadley_circulation.jl b/examples/hybrid/sphere/hadley_circulation.jl
@@ -1,5 +1,5 @@
 import ClimaComms
-ClimaComms.@import_required_backends
+@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
 using Test
 using LinearAlgebra
 

diff --git a/examples/hybrid/sphere/nonhydrostatic_gravity_wave.jl b/examples/hybrid/sphere/nonhydrostatic_gravity_wave.jl
@@ -1,5 +1,5 @@
 import ClimaComms
-ClimaComms.@import_required_backends
+@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
 using Test
 using LinearAlgebra
 

diff --git a/examples/sphere/shallow_water.jl b/examples/sphere/shallow_water.jl
@@ -1,5 +1,5 @@
 using ClimaComms
-ClimaComms.@import_required_backends
+@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
 using LinearAlgebra
 using Colors
 using DocStringExtensions

diff --git a/lib/ClimaCoreTempestRemap/test/netcdf.jl b/lib/ClimaCoreTempestRemap/test/netcdf.jl
@@ -1,6 +1,6 @@
 import ClimaCore
 using ClimaComms
-ClimaComms.@import_required_backends
+@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
 using ClimaCore:
     Geometry,
     Meshes,

diff --git a/test/DataLayouts/cuda.jl b/test/DataLayouts/cuda.jl
@@ -5,7 +5,7 @@ using Revise; include(joinpath("test", "DataLayouts", "cuda.jl"))
 using Test
 using ClimaComms
 using CUDA
-ClimaComms.@import_required_backends
+@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
 using ClimaCore.DataLayouts
 
 function knl_copy!(dst, src)

diff --git a/test/DataLayouts/opt_similar.jl b/test/DataLayouts/opt_similar.jl
@@ -8,7 +8,7 @@ using ClimaCore.DataLayouts
 using ClimaCore: DataLayouts, Geometry
 import ClimaComms
 using StaticArrays: SMatrix
-ClimaComms.@import_required_backends
+@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
 using JET
 
 function test_similar!(data)

diff --git a/test/DataLayouts/unit_copyto.jl b/test/DataLayouts/unit_copyto.jl
@@ -7,7 +7,7 @@ using ClimaCore.DataLayouts
 import ClimaCore.Geometry
 import ClimaComms
 using StaticArrays
-ClimaComms.@import_required_backends
+@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
 import Random
 Random.seed!(1234)
 

diff --git a/test/DataLayouts/unit_fill.jl b/test/DataLayouts/unit_fill.jl
@@ -5,7 +5,7 @@ using Revise; include(joinpath("test", "DataLayouts", "unit_fill.jl"))
 using Test
 using ClimaCore.DataLayouts
 import ClimaComms
-ClimaComms.@import_required_backends
+@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
 
 function test_fill!(data, vals::Tuple{<:Any, <:Any})
     fill!(data, vals)

diff --git a/test/DataLayouts/unit_mapreduce.jl b/test/DataLayouts/unit_mapreduce.jl
@@ -7,7 +7,7 @@ using ClimaCore.DataLayouts
 using ClimaCore
 import ClimaComms
 import Random
-ClimaComms.@import_required_backends
+@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
 
 device = ClimaComms.device()
 context = ClimaComms.context(device)

diff --git a/test/DataLayouts/unit_ndims.jl b/test/DataLayouts/unit_ndims.jl
@@ -5,7 +5,7 @@ using Revise; include(joinpath("test", "DataLayouts", "unit_ndims.jl"))
 using Test
 using ClimaCore.DataLayouts
 import ClimaComms
-ClimaComms.@import_required_backends
+@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
 
 @testset "Base.ndims" begin
     device = ClimaComms.device()

diff --git a/test/Fields/convergence_field_integrals.jl b/test/Fields/convergence_field_integrals.jl
@@ -7,7 +7,7 @@ using Test
 using JET
 
 using ClimaComms
-ClimaComms.@import_required_backends
+@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
 using OrderedCollections
 using StaticArrays, IntervalSets
 import ClimaCore

diff --git a/test/Fields/reduction_cuda.jl b/test/Fields/reduction_cuda.jl
@@ -1,6 +1,6 @@
 using Test
 using ClimaComms
-ClimaComms.@import_required_backends
+@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
 using Statistics
 using LinearAlgebra
 

diff --git a/test/Fields/reduction_cuda_distributed.jl b/test/Fields/reduction_cuda_distributed.jl
@@ -1,6 +1,6 @@
 using Test
 using ClimaComms
-ClimaComms.@import_required_backends
+@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
 using Statistics
 using LinearAlgebra
 using Logging

diff --git a/test/Fields/unit_field.jl b/test/Fields/unit_field.jl
@@ -7,7 +7,7 @@ using Test
 using JET
 
 using ClimaComms
-ClimaComms.@import_required_backends
+@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
 using OrderedCollections
 using StaticArrays, IntervalSets
 import ClimaCore

diff --git a/test/Fields/utils_field_multi_broadcast_fusion.jl b/test/Fields/utils_field_multi_broadcast_fusion.jl
@@ -9,7 +9,7 @@ using JET
 using BenchmarkTools
 
 using ClimaComms
-ClimaComms.@import_required_backends
+@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
 using OrderedCollections
 using StaticArrays, IntervalSets
 import ClimaCore

diff --git a/test/InputOutput/hybrid3dcubedsphere.jl b/test/InputOutput/hybrid3dcubedsphere.jl
@@ -12,7 +12,7 @@ using ClimaCore:
     InputOutput
 
 using ClimaComms
-ClimaComms.@import_required_backends
+@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
 const comms_ctx = ClimaComms.context(ClimaComms.CPUSingleThreaded())
 pid, nprocs = ClimaComms.init(comms_ctx)
 filename = ClimaComms.bcast(comms_ctx, tempname(pwd()))

diff --git a/test/InputOutput/spectralelement2d.jl b/test/InputOutput/spectralelement2d.jl
@@ -1,6 +1,6 @@
 using Test
 using ClimaComms
-ClimaComms.@import_required_backends
+@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
 using LinearAlgebra
 import ClimaCore
 import ClimaCore:

diff --git a/test/Limiters/distributed/dlimiter.jl b/test/Limiters/distributed/dlimiter.jl
@@ -13,7 +13,7 @@ using ClimaCore: slab
 using Test
 
 using ClimaComms
-ClimaComms.@import_required_backends
+@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
 const context = ClimaComms.MPICommsContext()
 ClimaComms.init(context)
 

diff --git a/test/Limiters/limiter.jl b/test/Limiters/limiter.jl
@@ -3,7 +3,7 @@ julia --project=test
 using Revise; include(joinpath("test", "Limiters", "limiter.jl"))
 =#
 using ClimaComms
-ClimaComms.@import_required_backends
+@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
 using ClimaCore:
     DataLayouts,
     Fields,

diff --git a/test/MatrixFields/field2arrays.jl b/test/MatrixFields/field2arrays.jl
@@ -3,7 +3,7 @@ using JET
 
 import ClimaCore: Geometry, Domains, Meshes, Spaces, Fields, MatrixFields
 import ClimaComms
-ClimaComms.@import_required_backends
+@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
 
 @testset "field2arrays Unit Tests" begin
     FT = Float64