From a833412a60350a1de44dcd26e8f3d95e2606db1c Mon Sep 17 00:00:00 2001 From: Charles Kawczynski Date: Thu, 7 Sep 2023 09:06:49 -0700 Subject: [PATCH 1/3] Use SciMLBase over OrdinaryDiffEq where possible --- Project.toml | 4 ++-- docs/Manifest.toml | 2 +- docs/Project.toml | 1 - examples/Manifest.toml | 2 +- examples/Project.toml | 1 - examples/hybrid/driver.jl | 4 ++-- perf/Manifest.toml | 2 +- perf/Project.toml | 1 - perf/benchmark.jl | 6 +++--- perf/flame.jl | 12 +++++------ perf/jet.jl | 6 +++--- perf/jet_report_nfailures.jl | 4 ++-- perf/jet_test_nfailures.jl | 6 +++--- src/callbacks/callback_helpers.jl | 20 +++++++++---------- src/callbacks/callbacks.jl | 6 +++--- src/initial_conditions/InitialConditions.jl | 1 + src/initial_conditions/initial_conditions.jl | 9 +++++++-- src/solver/solve.jl | 10 +++++----- src/solver/type_getters.jl | 21 ++++++++++---------- src/utils/utilities.jl | 1 - test/Project.toml | 1 - 21 files changed, 60 insertions(+), 60 deletions(-) diff --git a/Project.toml b/Project.toml index 3d131d68bd..7b26ce3f8c 100644 --- a/Project.toml +++ b/Project.toml @@ -17,7 +17,6 @@ CloudMicrophysics = "6a9e3e04-43cd-43ba-94b9-e8782df3c71b" Colors = "5ae59095-9a9b-59fe-a467-6f913c188581" Dates = "ade2ca70-3891-5945-98fb-dc099432e06a" Dierckx = "39dd38d3-220a-591b-8e3c-4c3a8c710a94" -DiffEqBase = "2b5f629d-d688-5b77-993f-72d75c75574e" DiffEqCallbacks = "459566f4-90b8-5000-8ac3-15dfb0a30def" Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f" DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae" @@ -38,6 +37,7 @@ Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7" RRTMGP = "a01a1ee8-cea4-48fc-987c-fc7878d79da1" Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" RootSolvers = "7181ea78-2dcb-4de3-ab41-2b8ab5a31e74" +SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462" StaticArrays = "90137ffa-7385-5640-81b9-e52037218182" Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2" StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91" @@ -59,7 +59,6 @@ ClimaTimeSteppers = "0.7" CloudMicrophysics = "0.13" Colors = "0.12" Dierckx = "0.5" -DiffEqBase = "6" DiffEqCallbacks = "2" Distributions = "0.25" DocStringExtensions = "0.8, 0.9" @@ -76,6 +75,7 @@ OrdinaryDiffEq = "5, 6" Pkg = "1.8" RRTMGP = "0.9" RootSolvers = "0.2, 0.3, 0.4" +SciMLBase = "1" StaticArrays = "1" StatsBase = "0.33" SurfaceFluxes = "0.7" diff --git a/docs/Manifest.toml b/docs/Manifest.toml index fbe3982a81..b21aa7e390 100644 --- a/docs/Manifest.toml +++ b/docs/Manifest.toml @@ -2,7 +2,7 @@ julia_version = "1.9.3" manifest_format = "2.0" -project_hash = "484a0d15ba3f1cc8d5c8863c4fe1999899c42df7" +project_hash = "813a39123d5089f49d5cde44ee40847faefe369c" [[deps.ADTypes]] git-tree-sha1 = "a4c8e0f8c09d4aa708289c1a5fc23e2d1970017a" diff --git a/docs/Project.toml b/docs/Project.toml index 512f82d441..a0c804be20 100644 --- a/docs/Project.toml +++ b/docs/Project.toml @@ -3,7 +3,6 @@ ArgParse = "c7e460c6-2fb9-53a9-8c5b-16f535851c63" CLIMAParameters = "6eacf6c3-8458-43b9-ae03-caf5306d3d53" CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba" ClimaAtmos = "b2c96348-7fb7-4fe0-8da9-78d88439e717" -DiffEqBase = "2b5f629d-d688-5b77-993f-72d75c75574e" Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4" DocumenterCitations = "daee34ce-89f3-4625-b898-19384cb65244" Logging = "56ddb016-857b-54e1-b83d-db4d58db5568" diff --git a/examples/Manifest.toml b/examples/Manifest.toml index a769062cf9..0b500b54ae 100644 --- a/examples/Manifest.toml +++ b/examples/Manifest.toml @@ -2,7 +2,7 @@ julia_version = "1.9.3" manifest_format = "2.0" -project_hash = "bbd263a7239c44698f2ead1e0abc80d97dea3133" +project_hash = "29934b734692261a625d91c36cff961d40b7b683" [[deps.ADTypes]] git-tree-sha1 = "a4c8e0f8c09d4aa708289c1a5fc23e2d1970017a" diff --git a/examples/Project.toml b/examples/Project.toml index 64285737e7..e7d2b5f097 100644 --- a/examples/Project.toml +++ b/examples/Project.toml @@ -19,7 +19,6 @@ CloudMicrophysics = "6a9e3e04-43cd-43ba-94b9-e8782df3c71b" Colors = "5ae59095-9a9b-59fe-a467-6f913c188581" Dates = "ade2ca70-3891-5945-98fb-dc099432e06a" Dierckx = "39dd38d3-220a-591b-8e3c-4c3a8c710a94" -DiffEqBase = "2b5f629d-d688-5b77-993f-72d75c75574e" DiffEqCallbacks = "459566f4-90b8-5000-8ac3-15dfb0a30def" Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f" DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae" diff --git a/examples/hybrid/driver.jl b/examples/hybrid/driver.jl index 9efbbeb16b..a119a1f578 100644 --- a/examples/hybrid/driver.jl +++ b/examples/hybrid/driver.jl @@ -17,9 +17,9 @@ using Statistics: mean import ClimaAtmos.Parameters as CAP import Thermodynamics as TD import ClimaComms -using OrdinaryDiffEq +using SciMLBase using PrettyTables -using DiffEqCallbacks +import DiffEqCallbacks as DECB using JLD2 using NCDatasets using ClimaTimeSteppers diff --git a/perf/Manifest.toml b/perf/Manifest.toml index f1b10a6373..409b177c01 100644 --- a/perf/Manifest.toml +++ b/perf/Manifest.toml @@ -2,7 +2,7 @@ julia_version = "1.9.3" manifest_format = "2.0" -project_hash = "9556cf181fd1b65b5db679b93b4882215a7f787a" +project_hash = "967da1a008eca13e2322097c9c4f6c2a0c6d67ad" [[deps.ADTypes]] git-tree-sha1 = "a4c8e0f8c09d4aa708289c1a5fc23e2d1970017a" diff --git a/perf/Project.toml b/perf/Project.toml index 3814037f3a..3ab9c091c1 100644 --- a/perf/Project.toml +++ b/perf/Project.toml @@ -20,7 +20,6 @@ CloudMicrophysics = "6a9e3e04-43cd-43ba-94b9-e8782df3c71b" Colors = "5ae59095-9a9b-59fe-a467-6f913c188581" Dates = "ade2ca70-3891-5945-98fb-dc099432e06a" Dierckx = "39dd38d3-220a-591b-8e3c-4c3a8c710a94" -DiffEqBase = "2b5f629d-d688-5b77-993f-72d75c75574e" DiffEqCallbacks = "459566f4-90b8-5000-8ac3-15dfb0a30def" DiffEqNoiseProcess = "77a26b50-5914-5dd7-bc55-306e6241c503" Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f" diff --git a/perf/benchmark.jl b/perf/benchmark.jl index 9a23e91841..cef75aeb02 100644 --- a/perf/benchmark.jl +++ b/perf/benchmark.jl @@ -6,9 +6,9 @@ integrator = CA.get_integrator(config) (; parsed_args) = config -import OrdinaryDiffEq as ODE +import SciMLBase import ClimaTimeSteppers as CTS -ODE.step!(integrator) # compile first +SciMLBase.step!(integrator) # compile first (; sol, u, p, dt, t) = integrator @@ -41,7 +41,7 @@ trials["implicit_tendency!"] = get_trial(implicit_fun(integrator), implicit_args trials["remaining_tendency!"] = get_trial(remaining_fun(integrator), remaining_args(integrator), "remaining_tendency!"); trials["additional_tendency!"] = get_trial(CA.additional_tendency!, (X, u, p, t), "additional_tendency!"); trials["hyperdiffusion_tendency!"] = get_trial(CA.hyperdiffusion_tendency!, (X, u, p, t), "hyperdiffusion_tendency!"); -trials["step!"] = get_trial(ODE.step!, (integrator, ), "step!"); +trials["step!"] = get_trial(SciMLBase.step!, (integrator, ), "step!"); #! format: on table_summary = OrderedCollections.OrderedDict() diff --git a/perf/flame.jl b/perf/flame.jl index bfdd11b8ed..caae2d7c18 100644 --- a/perf/flame.jl +++ b/perf/flame.jl @@ -7,8 +7,8 @@ integrator = CA.get_integrator(config) # The callbacks flame graph is very expensive, so only do 2 steps. @info "running step" -import OrdinaryDiffEq -OrdinaryDiffEq.step!(integrator) # compile first +import SciMLBase +SciMLBase.step!(integrator) # compile first CA.call_all_callbacks!(integrator) # compile callbacks import Profile, ProfileCanvas (; output_dir, job_id) = integrator.p.simulation @@ -18,7 +18,7 @@ mkpath(output_dir) @info "collect profile" Profile.clear() -prof = Profile.@profile OrdinaryDiffEq.step!(integrator) +prof = Profile.@profile SciMLBase.step!(integrator) results = Profile.fetch() Profile.clear() @@ -32,7 +32,7 @@ ProfileCanvas.html_file(joinpath(output_dir, "flame.html"), results) # use new allocation profiler @info "collecting allocations" Profile.Allocs.clear() -Profile.Allocs.@profile sample_rate = 0.01 OrdinaryDiffEq.step!(integrator) +Profile.Allocs.@profile sample_rate = 0.01 SciMLBase.step!(integrator) results = Profile.Allocs.fetch() Profile.Allocs.clear() profile = ProfileCanvas.view_allocs(results) @@ -49,8 +49,8 @@ buffer = occursin("threaded", job_id) ? 1.4 : 1 ## old allocation profiler (TODO: remove this) -allocs = @allocated OrdinaryDiffEq.step!(integrator) -@timev OrdinaryDiffEq.step!(integrator) +allocs = @allocated SciMLBase.step!(integrator) +@timev SciMLBase.step!(integrator) @info "`allocs ($job_id)`: $(allocs)" allocs_limit = Dict() diff --git a/perf/jet.jl b/perf/jet.jl index 90ea9d65d7..07e4e5f0ce 100644 --- a/perf/jet.jl +++ b/perf/jet.jl @@ -8,6 +8,6 @@ integrator = CA.get_integrator(config) import JET -import OrdinaryDiffEq -OrdinaryDiffEq.step!(integrator) # Make sure no errors -JET.@test_opt OrdinaryDiffEq.step!(integrator) +import SciMLBase +SciMLBase.step!(integrator) # Make sure no errors +JET.@test_opt SciMLBase.step!(integrator) diff --git a/perf/jet_report_nfailures.jl b/perf/jet_report_nfailures.jl index 9761540964..ec2d627196 100644 --- a/perf/jet_report_nfailures.jl +++ b/perf/jet_report_nfailures.jl @@ -10,7 +10,7 @@ macro n_failures(ex) ) end -import OrdinaryDiffEq +import SciMLBase import ClimaAtmos as CA n = Dict() Y = integrator.u; @@ -20,7 +20,7 @@ t = integrator.t; Yₜ = similar(Y); ref_Y = similar(Y); #! format: off -n["step!"] = @n_failures OrdinaryDiffEq.step!(integrator); +n["step!"] = @n_failures SciMLBase.step!(integrator); n["limited_tendency!"] = @n_failures CA.limited_tendency!(Yₜ, Y, p, t); n["horizontal_advection_tendency!"] = @n_failures CA.horizontal_advection_tendency!(Yₜ, Y, p, t); n["horizontal_tracer_advection_tendency!"] = @n_failures CA.horizontal_tracer_advection_tendency!(Yₜ, Y, p, t); diff --git a/perf/jet_test_nfailures.jl b/perf/jet_test_nfailures.jl index af75272e08..4a8c05e6ff 100644 --- a/perf/jet_test_nfailures.jl +++ b/perf/jet_test_nfailures.jl @@ -6,8 +6,8 @@ integrator = CA.get_integrator(config) import JET -import OrdinaryDiffEq -OrdinaryDiffEq.step!(integrator) # Make sure no errors +import SciMLBase +SciMLBase.step!(integrator) # Make sure no errors # Suggested in: https://github.com/aviatesk/JET.jl/issues/455 macro n_failures(ex) @@ -20,7 +20,7 @@ end using Test @testset "Test N-jet failures" begin - n = @n_failures OrdinaryDiffEq.step!(integrator) + n = @n_failures SciMLBase.step!(integrator) # This test is intended to provide some friction when we # add code to our tendency function that results in degraded # inference. By increasing this counter, we acknowledge that diff --git a/src/callbacks/callback_helpers.jl b/src/callbacks/callback_helpers.jl index 3957fdd80e..3c028e91ea 100644 --- a/src/callbacks/callback_helpers.jl +++ b/src/callbacks/callback_helpers.jl @@ -1,4 +1,4 @@ -import DiffEqCallbacks +import SciMLBase ##### ##### Callback helpers ##### @@ -7,7 +7,7 @@ function call_every_n_steps(f!, n = 1; skip_first = false, call_at_end = false) previous_step = Ref(0) @assert n ≠ Inf "Adding callback that never gets called!" cb! = AtmosCallback(f!, EveryNSteps(n)) - return ODE.DiscreteCallback( + return SciMLBase.DiscreteCallback( (u, t, integrator) -> (previous_step[] += 1) % n == 0 || (call_at_end && t == integrator.sol.prob.tspan[2]), @@ -31,7 +31,7 @@ function call_every_dt(f!, dt; skip_first = false, call_at_end = false) next_t[] = min(next_t[], t_end) end end - return ODE.DiscreteCallback( + return SciMLBase.DiscreteCallback( (u, t, integrator) -> t >= next_t[], affect!; initialize = (cb, u, t, integrator) -> begin @@ -50,21 +50,21 @@ function callback_from_affect(affect!) x = getproperty(affect!, p) if x isa AtmosCallback return x - elseif x isa DiffEqCallbacks.SavedValues + elseif x isa DECB.SavedValues return x end end error("Callback not found in $(affect!)") end -function atmos_callbacks(cbs::ODE.CallbackSet) +function atmos_callbacks(cbs::SciMLBase.CallbackSet) all_cbs = [cbs.continuous_callbacks..., cbs.discrete_callbacks...] callback_objs = map(cb -> callback_from_affect(cb.affect!), all_cbs) - filter!(x -> !(x isa DiffEqCallbacks.SavedValues), callback_objs) + filter!(x -> !(x isa DECB.SavedValues), callback_objs) return callback_objs end n_measured_calls(integrator) = n_measured_calls(integrator.callback) -n_measured_calls(cbs::ODE.CallbackSet) = +n_measured_calls(cbs::SciMLBase.CallbackSet) = map(x -> x.n_measured_calls, atmos_callbacks(cbs)) n_expected_calls(integrator) = n_expected_calls( @@ -72,12 +72,12 @@ n_expected_calls(integrator) = n_expected_calls( integrator.dt, integrator.sol.prob.tspan, ) -n_expected_calls(cbs::ODE.CallbackSet, dt, tspan) = +n_expected_calls(cbs::SciMLBase.CallbackSet, dt, tspan) = map(x -> n_expected_calls(x, dt, tspan), atmos_callbacks(cbs)) n_steps_per_cycle(integrator) = n_steps_per_cycle(integrator.callback, integrator.dt) -function n_steps_per_cycle(cbs::ODE.CallbackSet, dt) +function n_steps_per_cycle(cbs::SciMLBase.CallbackSet, dt) nspc = n_steps_per_cycle_per_cb(cbs, dt) return isempty(nspc) ? 1 : lcm(nspc) end @@ -85,7 +85,7 @@ end n_steps_per_cycle_per_cb(integrator) = n_steps_per_cycle_per_cb(integrator.callback, integrator.dt) -function n_steps_per_cycle_per_cb(cbs::ODE.CallbackSet, dt) +function n_steps_per_cycle_per_cb(cbs::SciMLBase.CallbackSet, dt) return map(atmos_callbacks(cbs)) do cb cbf = callback_frequency(cb) if cbf isa EveryΔt diff --git a/src/callbacks/callbacks.jl b/src/callbacks/callbacks.jl index 57cd7445ce..d7c8e6eb6f 100644 --- a/src/callbacks/callbacks.jl +++ b/src/callbacks/callbacks.jl @@ -6,9 +6,9 @@ import ClimaCore.Fields import ClimaComms import ClimaCore as CC import ClimaCore.Spaces -import OrdinaryDiffEq as ODE +import SciMLBase import ClimaAtmos.Parameters as CAP -import DiffEqCallbacks as DEQ +import DiffEqCallbacks as DECB import ClimaCore: InputOutput import Dates using Insolation: instantaneous_zenith_angle @@ -70,7 +70,7 @@ function turb_conv_affect_filter!(integrator) # paying for an additional `∑tendencies!` call, which is required # to support supplying a continuous representation of the # solution. - ODE.u_modified!(integrator, false) + SciMLBase.u_modified!(integrator, false) end function rrtmgp_model_callback!(integrator) diff --git a/src/initial_conditions/InitialConditions.jl b/src/initial_conditions/InitialConditions.jl index 90ea1a8dc5..29cef59fd7 100644 --- a/src/initial_conditions/InitialConditions.jl +++ b/src/initial_conditions/InitialConditions.jl @@ -30,6 +30,7 @@ import ..TurbulenceConvection as TC import Thermodynamics as TD import AtmosphericProfilesLibrary as APL import OrdinaryDiffEq as ODE +import SciMLBase import Dierckx include("local_state.jl") diff --git a/src/initial_conditions/initial_conditions.jl b/src/initial_conditions/initial_conditions.jl index 7941af7bef..1af2f7e082 100644 --- a/src/initial_conditions/initial_conditions.jl +++ b/src/initial_conditions/initial_conditions.jl @@ -544,8 +544,13 @@ function hydrostatic_pressure_profile(; dp_dz(p, _, z) = -grav * TD.air_density(thermo_params, ts(p, z, T, θ, q_tot)) - prob = ODE.ODEProblem(dp_dz, p_0, (FT(0), z_max)) - return ODE.solve(prob, ODE.Tsit5(), reltol = 10eps(FT), abstol = 10eps(FT)) + prob = SciMLBase.ODEProblem(dp_dz, p_0, (FT(0), z_max)) + return SciMLBase.solve( + prob, + ODE.Tsit5(), + reltol = 10eps(FT), + abstol = 10eps(FT), + ) end """ diff --git a/src/solver/solve.jl b/src/solver/solve.jl index f8d746509a..ea08f573ee 100644 --- a/src/solver/solve.jl +++ b/src/solver/solve.jl @@ -16,7 +16,7 @@ walltime_in_days(es::EfficiencyStats) = es.walltime * (1 / (24 * 3600)) #=second function timed_solve!(integrator) walltime = @elapsed begin s = @timed_str begin - sol = ODE.solve!(integrator) + sol = SciMLBase.solve!(integrator) end end @info "solve!: $s" @@ -52,7 +52,7 @@ function solve_atmos!(integrator) @info "Running" job_id = p.simulation.job_id output_dir = p.simulation.output_dir tspan comms_ctx = ClimaComms.context(axes(integrator.u.c)) - ODE.step!(integrator) + SciMLBase.step!(integrator) precompile_callbacks(integrator) GC.gc() try @@ -111,7 +111,7 @@ for the flags outlined in a table. """ function benchmark_step!(integrator, Y₀, n_steps = 10) for i in 1:n_steps - ODE.step!(integrator) + SciMLBase.step!(integrator) integrator.u .= Y₀ # temporary hack to simplify performance benchmark. end return nothing @@ -131,7 +131,7 @@ into account. function cycle!(integrator; n_cycles = 1) n_steps = n_steps_per_cycle(integrator) * n_cycles for i in 1:n_steps - ODE.step!(integrator) + SciMLBase.step!(integrator) end return nothing end @@ -150,7 +150,7 @@ Precompiles `step!` and all callbacks in the `integrator`. """ function precompile_atmos(integrator) - B = Base.precompile(ODE.step!, (typeof(integrator),)) + B = Base.precompile(SciMLBase.step!, (typeof(integrator),)) @assert B precompile_callbacks(integrator) return nothing diff --git a/src/solver/type_getters.jl b/src/solver/type_getters.jl index bd1cb42bb3..2c93cf5f5a 100644 --- a/src/solver/type_getters.jl +++ b/src/solver/type_getters.jl @@ -1,7 +1,6 @@ using Dates: DateTime, @dateformat_str using NCDatasets using Dierckx -using DiffEqBase using ImageFiltering using Interpolations import ClimaCore: InputOutput, Meshes, Spaces @@ -11,7 +10,7 @@ import LinearAlgebra import ClimaCore.Fields import OrdinaryDiffEq as ODE import ClimaTimeSteppers as CTS -import DiffEqCallbacks as DEQ +import DiffEqCallbacks as DECB function get_atmos(config::AtmosConfig, params) (; turbconv_params, sponge_params) = params @@ -359,7 +358,7 @@ is_ordinary_diffeq_newton(alg_or_tableau) = } is_imex_CTS_algo(::CTS.IMEXAlgorithm) = true -is_imex_CTS_algo(::DiffEqBase.AbstractODEAlgorithm) = false +is_imex_CTS_algo(::SciMLBase.AbstractODEAlgorithm) = false is_implicit(::ODE.OrdinaryDiffEqImplicitAlgorithm) = true is_implicit(::ODE.OrdinaryDiffEqAdaptiveImplicitAlgorithm) = true @@ -367,11 +366,11 @@ is_implicit(ode_algo) = is_imex_CTS_algo(ode_algo) is_rosenbrock(::ODE.Rosenbrock23) = true is_rosenbrock(::ODE.Rosenbrock32) = true -is_rosenbrock(::DiffEqBase.AbstractODEAlgorithm) = false +is_rosenbrock(::SciMLBase.AbstractODEAlgorithm) = false use_transform(ode_algo) = !(is_imex_CTS_algo(ode_algo) || is_rosenbrock(ode_algo)) -additional_integrator_kwargs(::DiffEqBase.AbstractODEAlgorithm) = (; +additional_integrator_kwargs(::SciMLBase.AbstractODEAlgorithm) = (; adaptive = false, progress = isinteractive(), progress_steps = isinteractive() ? 1 : 1000, @@ -382,7 +381,7 @@ additional_integrator_kwargs(::CTS.DistributedODEAlgorithm) = (; # TODO: enable progress bars in ClimaTimeSteppers ) -is_cts_algo(::DiffEqBase.AbstractODEAlgorithm) = false +is_cts_algo(::SciMLBase.AbstractODEAlgorithm) = false is_cts_algo(::CTS.DistributedODEAlgorithm) = true jacobi_flags(::TotalEnergy) = (; ∂ᶜ𝔼ₜ∂ᶠ𝕄_mode = :no_∂ᶜp∂ᶜK) @@ -541,7 +540,7 @@ function get_callbacks(parsed_args, simulation, atmos, params) ) end - return ODE.CallbackSet(callbacks...) + return SciMLBase.CallbackSet(callbacks...) end @@ -622,7 +621,7 @@ function args_integrator(parsed_args, Y, p, tspan, ode_algo, callback) s = @timed_str begin func = if parsed_args["split_ode"] - implicit_func = ODE.ODEFunction( + implicit_func = SciMLBase.ODEFunction( implicit_tendency!; jac_kwargs(ode_algo, Y, atmos.energy_form)..., tgrad = (∂Y∂t, Y, p, t) -> (∂Y∂t .= 0), @@ -637,14 +636,14 @@ function args_integrator(parsed_args, Y, p, tspan, ode_algo, callback) dss!, ) else - ODE.SplitFunction(implicit_func, remaining_tendency!) + SciMLBase.SplitFunction(implicit_func, remaining_tendency!) end else remaining_tendency! # should be total_tendency! end end @info "Define ode function: $s" - problem = ODE.ODEProblem(func, Y, tspan, p) + problem = SciMLBase.ODEProblem(func, Y, tspan, p) saveat = if dt_save_to_sol == Inf tspan[2] elseif tspan[2] % dt_save_to_sol == 0 @@ -765,7 +764,7 @@ function get_integrator(config::AtmosConfig) end s = @timed_str begin - integrator = ODE.init(integrator_args...; integrator_kwargs...) + integrator = SciMLBase.init(integrator_args...; integrator_kwargs...) end @info "init integrator: $s" return integrator diff --git a/src/utils/utilities.jl b/src/utils/utilities.jl index 7e5e002390..3be794f152 100644 --- a/src/utils/utilities.jl +++ b/src/utils/utilities.jl @@ -4,7 +4,6 @@ import ClimaComms import ClimaCore: Spaces, Topologies, Fields, Geometry import LinearAlgebra: norm_sqr -import DiffEqBase import JLD2 is_energy_var(symbol) = symbol in (:ρθ, :ρe_tot, :ρaθ, :ρae_tot) diff --git a/test/Project.toml b/test/Project.toml index 0220137967..2d4044eba7 100644 --- a/test/Project.toml +++ b/test/Project.toml @@ -20,7 +20,6 @@ CloudMicrophysics = "6a9e3e04-43cd-43ba-94b9-e8782df3c71b" Colors = "5ae59095-9a9b-59fe-a467-6f913c188581" Dates = "ade2ca70-3891-5945-98fb-dc099432e06a" Dierckx = "39dd38d3-220a-591b-8e3c-4c3a8c710a94" -DiffEqBase = "2b5f629d-d688-5b77-993f-72d75c75574e" DiffEqCallbacks = "459566f4-90b8-5000-8ac3-15dfb0a30def" DiffEqNoiseProcess = "77a26b50-5914-5dd7-bc55-306e6241c503" Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f" From 3b9c5be4edccc4b7b8b50880a78e0f7d09f108f2 Mon Sep 17 00:00:00 2001 From: Charles Kawczynski Date: Thu, 7 Sep 2023 09:54:52 -0700 Subject: [PATCH 2/3] Update manifests --- docs/Manifest.toml | 12 ++++++------ docs/Project.toml | 1 + examples/Manifest.toml | 6 +++--- perf/Manifest.toml | 10 +++++----- 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/docs/Manifest.toml b/docs/Manifest.toml index b21aa7e390..cf4879dd80 100644 --- a/docs/Manifest.toml +++ b/docs/Manifest.toml @@ -2,7 +2,7 @@ julia_version = "1.9.3" manifest_format = "2.0" -project_hash = "813a39123d5089f49d5cde44ee40847faefe369c" +project_hash = "7fc686bc0a71a5f83e48b1285d03c4910b039279" [[deps.ADTypes]] git-tree-sha1 = "a4c8e0f8c09d4aa708289c1a5fc23e2d1970017a" @@ -247,7 +247,7 @@ uuid = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4" version = "1.16.0" [[deps.ClimaAtmos]] -deps = ["ArgParse", "ArtifactWrappers", "Artifacts", "AtmosphericProfilesLibrary", "CLIMAParameters", "CUDA", "ClimaComms", "ClimaCore", "ClimaTimeSteppers", "CloudMicrophysics", "Colors", "Dates", "Dierckx", "DiffEqBase", "DiffEqCallbacks", "Distributions", "DocStringExtensions", "FastGaussQuadrature", "ImageFiltering", "Insolation", "Interpolations", "IntervalSets", "JLD2", "LambertW", "LinearAlgebra", "Logging", "NCDatasets", "NVTX", "OrdinaryDiffEq", "Pkg", "Printf", "RRTMGP", "Random", "RootSolvers", "StaticArrays", "Statistics", "StatsBase", "SurfaceFluxes", "TerminalLoggers", "Test", "Thermodynamics", "YAML"] +deps = ["ArgParse", "ArtifactWrappers", "Artifacts", "AtmosphericProfilesLibrary", "CLIMAParameters", "CUDA", "ClimaComms", "ClimaCore", "ClimaTimeSteppers", "CloudMicrophysics", "Colors", "Dates", "Dierckx", "DiffEqCallbacks", "Distributions", "DocStringExtensions", "FastGaussQuadrature", "ImageFiltering", "Insolation", "Interpolations", "IntervalSets", "JLD2", "LambertW", "LinearAlgebra", "Logging", "NCDatasets", "NVTX", "OrdinaryDiffEq", "Pkg", "Printf", "RRTMGP", "Random", "RootSolvers", "SciMLBase", "StaticArrays", "Statistics", "StatsBase", "SurfaceFluxes", "TerminalLoggers", "Test", "Thermodynamics", "YAML"] path = ".." uuid = "b2c96348-7fb7-4fe0-8da9-78d88439e717" version = "0.16.0" @@ -697,9 +697,9 @@ version = "0.16.16" [[deps.HDF5_jll]] deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "LLVMOpenMP_jll", "LazyArtifacts", "LibCURL_jll", "Libdl", "MPICH_jll", "MPIPreferences", "MPItrampoline_jll", "MicrosoftMPI_jll", "OpenMPI_jll", "OpenSSL_jll", "TOML", "Zlib_jll", "libaec_jll"] -git-tree-sha1 = "10c72358aaaa5cd6bc7cc39b95e6eadf92f5a336" +git-tree-sha1 = "38c8874692d48d5440d5752d6c74b0c6b0b60739" uuid = "0234f1f7-429e-5d53-9886-15a909be8d59" -version = "1.14.2+0" +version = "1.14.2+1" [[deps.HostCPUFeatures]] deps = ["BitTwiddlingConvenienceFunctions", "IfElse", "Libdl", "Static"] @@ -1574,9 +1574,9 @@ version = "1.9.0" [[deps.StatsAPI]] deps = ["LinearAlgebra"] -git-tree-sha1 = "45a7769a04a3cf80da1c1c7c60caf932e6f4c9f7" +git-tree-sha1 = "1ff449ad350c9c4cbc756624d6f8a8c3ef56d3ed" uuid = "82ae8749-77ed-4fe6-ae5f-f523153014b0" -version = "1.6.0" +version = "1.7.0" [[deps.StatsBase]] deps = ["DataAPI", "DataStructures", "LinearAlgebra", "LogExpFunctions", "Missings", "Printf", "Random", "SortingAlgorithms", "SparseArrays", "Statistics", "StatsAPI"] diff --git a/docs/Project.toml b/docs/Project.toml index a0c804be20..7b6c83abe7 100644 --- a/docs/Project.toml +++ b/docs/Project.toml @@ -9,6 +9,7 @@ Logging = "56ddb016-857b-54e1-b83d-db4d58db5568" OrderedCollections = "bac558e1-5e72-5ebc-8fee-abe8a469f55d" PrettyTables = "08abe8d2-0d0c-5749-adfa-8a2ac140af0d" RootSolvers = "7181ea78-2dcb-4de3-ab41-2b8ab5a31e74" +SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462" TOML = "fa267f1f-6049-4f14-aa54-33bafae1ed76" TerminalLoggers = "5d786b92-1e48-4d6f-9151-6b4477ca9bed" YAML = "ddb6d928-2868-570f-bddf-ab3f9cf99eb6" diff --git a/examples/Manifest.toml b/examples/Manifest.toml index 0b500b54ae..4a661b4dc5 100644 --- a/examples/Manifest.toml +++ b/examples/Manifest.toml @@ -286,7 +286,7 @@ uuid = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4" version = "1.16.0" [[deps.ClimaAtmos]] -deps = ["ArgParse", "ArtifactWrappers", "Artifacts", "AtmosphericProfilesLibrary", "CLIMAParameters", "CUDA", "ClimaComms", "ClimaCore", "ClimaTimeSteppers", "CloudMicrophysics", "Colors", "Dates", "Dierckx", "DiffEqBase", "DiffEqCallbacks", "Distributions", "DocStringExtensions", "FastGaussQuadrature", "ImageFiltering", "Insolation", "Interpolations", "IntervalSets", "JLD2", "LambertW", "LinearAlgebra", "Logging", "NCDatasets", "NVTX", "OrdinaryDiffEq", "Pkg", "Printf", "RRTMGP", "Random", "RootSolvers", "StaticArrays", "Statistics", "StatsBase", "SurfaceFluxes", "TerminalLoggers", "Test", "Thermodynamics", "YAML"] +deps = ["ArgParse", "ArtifactWrappers", "Artifacts", "AtmosphericProfilesLibrary", "CLIMAParameters", "CUDA", "ClimaComms", "ClimaCore", "ClimaTimeSteppers", "CloudMicrophysics", "Colors", "Dates", "Dierckx", "DiffEqCallbacks", "Distributions", "DocStringExtensions", "FastGaussQuadrature", "ImageFiltering", "Insolation", "Interpolations", "IntervalSets", "JLD2", "LambertW", "LinearAlgebra", "Logging", "NCDatasets", "NVTX", "OrdinaryDiffEq", "Pkg", "Printf", "RRTMGP", "Random", "RootSolvers", "SciMLBase", "StaticArrays", "Statistics", "StatsBase", "SurfaceFluxes", "TerminalLoggers", "Test", "Thermodynamics", "YAML"] path = ".." uuid = "b2c96348-7fb7-4fe0-8da9-78d88439e717" version = "0.16.0" @@ -2349,9 +2349,9 @@ version = "1.9.0" [[deps.StatsAPI]] deps = ["LinearAlgebra"] -git-tree-sha1 = "45a7769a04a3cf80da1c1c7c60caf932e6f4c9f7" +git-tree-sha1 = "1ff449ad350c9c4cbc756624d6f8a8c3ef56d3ed" uuid = "82ae8749-77ed-4fe6-ae5f-f523153014b0" -version = "1.6.0" +version = "1.7.0" [[deps.StatsBase]] deps = ["DataAPI", "DataStructures", "LinearAlgebra", "LogExpFunctions", "Missings", "Printf", "Random", "SortingAlgorithms", "SparseArrays", "Statistics", "StatsAPI"] diff --git a/perf/Manifest.toml b/perf/Manifest.toml index 409b177c01..0b522c86a3 100644 --- a/perf/Manifest.toml +++ b/perf/Manifest.toml @@ -297,7 +297,7 @@ uuid = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4" version = "1.16.0" [[deps.ClimaAtmos]] -deps = ["ArgParse", "ArtifactWrappers", "Artifacts", "AtmosphericProfilesLibrary", "CLIMAParameters", "CUDA", "ClimaComms", "ClimaCore", "ClimaTimeSteppers", "CloudMicrophysics", "Colors", "Dates", "Dierckx", "DiffEqBase", "DiffEqCallbacks", "Distributions", "DocStringExtensions", "FastGaussQuadrature", "ImageFiltering", "Insolation", "Interpolations", "IntervalSets", "JLD2", "LambertW", "LinearAlgebra", "Logging", "NCDatasets", "NVTX", "OrdinaryDiffEq", "Pkg", "Printf", "RRTMGP", "Random", "RootSolvers", "StaticArrays", "Statistics", "StatsBase", "SurfaceFluxes", "TerminalLoggers", "Test", "Thermodynamics", "YAML"] +deps = ["ArgParse", "ArtifactWrappers", "Artifacts", "AtmosphericProfilesLibrary", "CLIMAParameters", "CUDA", "ClimaComms", "ClimaCore", "ClimaTimeSteppers", "CloudMicrophysics", "Colors", "Dates", "Dierckx", "DiffEqCallbacks", "Distributions", "DocStringExtensions", "FastGaussQuadrature", "ImageFiltering", "Insolation", "Interpolations", "IntervalSets", "JLD2", "LambertW", "LinearAlgebra", "Logging", "NCDatasets", "NVTX", "OrdinaryDiffEq", "Pkg", "Printf", "RRTMGP", "Random", "RootSolvers", "SciMLBase", "StaticArrays", "Statistics", "StatsBase", "SurfaceFluxes", "TerminalLoggers", "Test", "Thermodynamics", "YAML"] path = ".." uuid = "b2c96348-7fb7-4fe0-8da9-78d88439e717" version = "0.16.0" @@ -2431,9 +2431,9 @@ version = "1.9.0" [[deps.StatsAPI]] deps = ["LinearAlgebra"] -git-tree-sha1 = "45a7769a04a3cf80da1c1c7c60caf932e6f4c9f7" +git-tree-sha1 = "1ff449ad350c9c4cbc756624d6f8a8c3ef56d3ed" uuid = "82ae8749-77ed-4fe6-ae5f-f523153014b0" -version = "1.6.0" +version = "1.7.0" [[deps.StatsBase]] deps = ["DataAPI", "DataStructures", "LinearAlgebra", "LogExpFunctions", "Missings", "Printf", "Random", "SortingAlgorithms", "SparseArrays", "Statistics", "StatsAPI"] @@ -2623,9 +2623,9 @@ version = "1.3.0" [[deps.TypedSyntax]] deps = ["CodeTracking", "JuliaSyntax"] -git-tree-sha1 = "34f0ab1aa1b869840cfc4e1e33074030e90ece7e" +git-tree-sha1 = "79ea8a4993ed5d341580c4044433e0259fceb4c6" uuid = "d265eb64-f81a-44ad-a842-4247ee1503de" -version = "1.2.2" +version = "1.2.3" [[deps.URIs]] git-tree-sha1 = "b7a5e99f24892b6824a954199a45e9ffcc1c70f0" From cf959246cc55bc66a21ae01865ea383e1e48c7b8 Mon Sep 17 00:00:00 2001 From: Charles Kawczynski Date: Thu, 7 Sep 2023 13:45:39 -0700 Subject: [PATCH 3/3] Update njet failures --- perf/jet_test_nfailures.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perf/jet_test_nfailures.jl b/perf/jet_test_nfailures.jl index 4a8c05e6ff..8c6adf8272 100644 --- a/perf/jet_test_nfailures.jl +++ b/perf/jet_test_nfailures.jl @@ -26,7 +26,7 @@ using Test # inference. By increasing this counter, we acknowledge that # we have introduced an inference failure. We hope to drive # this number down to 0. - n_allowed_failures = 256 + n_allowed_failures = 680 @test n ≤ n_allowed_failures if n < n_allowed_failures @info "Please update the n-failures to $n"