Merge pull request #1176 from ChrisRackauckas/fix-formatting

Apply JuliaFormatter to fix formatting CI

Author: ChrisRackauckas

ext/DiffEqBaseEnzymeExt.jl

@@ -7,9 +7,11 @@ module DiffEqBaseEnzymeExt
     import Enzyme: Const
     using ChainRulesCore
 
-    function Enzyme.EnzymeRules.augmented_primal(config::Enzyme.EnzymeRules.RevConfigWidth{1},
+    function Enzyme.EnzymeRules.augmented_primal(
+            config::Enzyme.EnzymeRules.RevConfigWidth{1},
             func::Const{typeof(DiffEqBase.solve_up)}, ::Type{Duplicated{RT}}, prob,
-            sensealg::Union{Const{Nothing}, Const{<:DiffEqBase.AbstractSensitivityAlgorithm}},
+            sensealg::Union{
+                Const{Nothing}, Const{<:DiffEqBase.AbstractSensitivityAlgorithm}},
             u0, p, args...; kwargs...) where {RT}
         @inline function copy_or_reuse(val, idx)
             if Enzyme.EnzymeRules.overwritten(config)[idx] && ismutable(val)
@@ -36,7 +38,8 @@ module DiffEqBaseEnzymeExt
 
     function Enzyme.EnzymeRules.reverse(config::Enzyme.EnzymeRules.RevConfigWidth{1},
             func::Const{typeof(DiffEqBase.solve_up)}, ::Type{Duplicated{RT}}, tape, prob,
-            sensealg::Union{Const{Nothing}, Const{<:DiffEqBase.AbstractSensitivityAlgorithm}},
+            sensealg::Union{
+                Const{Nothing}, Const{<:DiffEqBase.AbstractSensitivityAlgorithm}},
             u0, p, args...; kwargs...) where {RT}
         dres, clos = tape
         dres = dres::RT
@@ -53,7 +56,6 @@ module DiffEqBaseEnzymeExt
         Enzyme.make_zero!(dres.u)
         return ntuple(_ -> nothing, Val(length(args) + 4))
     end
-
 end
 
 end

ext/DiffEqBaseTrackerExt.jl

@@ -103,7 +103,8 @@ Tracker.@grad function DiffEqBase.solve_up(prob,
         },
         u0, p, args...;
         kwargs...)
-    sol, pb_f = DiffEqBase._solve_adjoint(
+    sol,
+    pb_f = DiffEqBase._solve_adjoint(
         prob, sensealg, Tracker.data(u0), Tracker.data(p),
         SciMLBase.TrackerOriginator(), args...; kwargs...)
 

src/callbacks.jl

@@ -50,11 +50,9 @@ has_continuous_callback(cb::DiscreteCallback) = false
 has_continuous_callback(cb::ContinuousCallback) = true
 has_continuous_callback(cb::VectorContinuousCallback) = true
 has_continuous_callback(cb::CallbackSet) = !isempty(cb.continuous_callbacks)
-has_continuous_callback(cb::Nothing) = false
+has_continuous_callback(cb::Nothing) = false#======================================================##======================================================#
 
-#======================================================#
 # Callback handling
-#======================================================#
 
 function get_tmp(integrator::DEIntegrator, callback)
     _tmp = get_tmp_cache(integrator)
@@ -129,14 +127,16 @@ end
             AbstractContinuousCallback
         }) where {N}
     ex = quote
-        tmin, upcrossing, event_occurred, event_idx = find_callback_time(integrator,
+        tmin, upcrossing,
+        event_occurred, event_idx = find_callback_time(integrator,
             callbacks[1], 1)
         identified_idx = 1
     end
     for i in 2:N
         ex = quote
             $ex
-            tmin2, upcrossing2, event_occurred2, event_idx2 = find_callback_time(
+            tmin2, upcrossing2,
+            event_occurred2, event_idx2 = find_callback_time(
                 integrator,
                 callbacks[$i],
                 $i)
@@ -398,7 +398,8 @@ function findall_events!(next_sign, affect!::F1, affect_neg!::F2, prev_sign) whe
 end
 
 function find_callback_time(integrator, callback::ContinuousCallback, counter)
-    event_occurred, interp_index, ts, prev_sign, prev_sign_index, event_idx = determine_event_occurance(
+    event_occurred, interp_index, ts, prev_sign,
+    prev_sign_index, event_idx = determine_event_occurance(
         integrator,
         callback,
         counter)
@@ -459,7 +460,8 @@ function find_callback_time(integrator, callback::ContinuousCallback, counter)
 end
 
 function find_callback_time(integrator, callback::VectorContinuousCallback, counter)
-    event_occurred, interp_index, ts, prev_sign, prev_sign_index, event_idx = determine_event_occurance(
+    event_occurred, interp_index, ts, prev_sign,
+    prev_sign_index, event_idx = determine_event_occurance(
         integrator,
         callback,
         counter)
@@ -636,7 +638,8 @@ end
 @inline function apply_discrete_callback!(integrator, discrete_modified::Bool,
         saved_in_cb::Bool, callback::DiscreteCallback,
         args...)
-    bool, saved_in_cb2 = apply_discrete_callback!(integrator,
+    bool,
+    saved_in_cb2 = apply_discrete_callback!(integrator,
         apply_discrete_callback!(integrator,
             callback)...,
         args...)

src/solve.jl

@@ -719,7 +719,7 @@ function build_null_solution(prob::AbstractDEProblem, args...;
         save_everystep = true,
         save_on = true,
         save_start = save_everystep || isempty(saveat) ||
-                         saveat isa Number || prob.tspan[1] in saveat,
+                     saveat isa Number || prob.tspan[1] in saveat,
         save_end = true,
         kwargs...)
     ts = if saveat === ()
@@ -752,7 +752,7 @@ function build_null_solution(
         save_everystep = true,
         save_on = true,
         save_start = save_everystep || isempty(saveat) ||
-                         saveat isa Number || prob.tspan[1] in saveat,
+                     saveat isa Number || prob.tspan[1] in saveat,
         save_end = true,
         kwargs...)
     prob, success = hack_null_solution_init(prob)
@@ -1080,13 +1080,13 @@ function solve(prob::AbstractDEProblem, args...; sensealg = nothing,
     p = p !== nothing ? p : prob.p
 
     if wrap isa Val{true}
-        wrap_sol(solve_up(prob, sensealg, u0, p, args...; 
-        originator = set_mooncakeoriginator_if_mooncake(SciMLBase.ChainRulesOriginator()),
-        kwargs...))
+        wrap_sol(solve_up(prob, sensealg, u0, p, args...;
+            originator = set_mooncakeoriginator_if_mooncake(SciMLBase.ChainRulesOriginator()),
+            kwargs...))
     else
-        solve_up(prob, sensealg, u0, p, args...; 
-        originator = set_mooncakeoriginator_if_mooncake(SciMLBase.ChainRulesOriginator()),
-        kwargs...)
+        solve_up(prob, sensealg, u0, p, args...;
+            originator = set_mooncakeoriginator_if_mooncake(SciMLBase.ChainRulesOriginator()),
+            kwargs...)
     end
 end
 

test/downstream/complex_number_ad.jl

@@ -60,7 +60,7 @@ function assert_fun()
     p0 = rand(3)
     isapprox(loss(p0), loss_via_real(p0); rtol = 1e-4)
 end
-@assert all([assert_fun() for _ in 1:(2^6)])
+@assert all([assert_fun() for _ in 1:(2 ^ 6)])
 
 # test ad with ForwardDiff
 function test_ad()
@@ -74,4 +74,4 @@ function test_ad()
     isapprox(grad_complex, grad_real; rtol = 1e-6) ? true : (@show rel_err; false)
 end
 
-@time @test all([test_ad() for _ in 1:(2^6)])
+@time @test all([test_ad() for _ in 1:(2 ^ 6)])

test/downstream/ensemble_ad.jl

@@ -65,7 +65,8 @@ eu0 = rand(N, 2)
 ep = rand(N, 4)
 
 ensemble_prob = EnsembleProblem(prob,
-    prob_func = (prob, i, repeat) -> remake(prob,
+    prob_func = (
+        prob, i, repeat) -> remake(prob,
         u0 = eu0[i, :],
         p = ep[i, :],
         saveat = 0.1))
@@ -75,7 +76,8 @@ cache = Ref{Any}()
 
 function sum_of_e_solution(p)
     ensemble_prob = EnsembleProblem(prob,
-        prob_func = (prob, i, repeat) -> remake(prob,
+        prob_func = (
+            prob, i, repeat) -> remake(prob,
             u0 = eu0[i, :],
             p = p[i, :],
             saveat = 0.1))

test/downstream/ensemble_analysis.jl

@@ -49,15 +49,15 @@ m3, m4, c = timepoint_meancov(sim, 0.5, 0.5)
 @test v ≈ c
 m3, m4, c = timepoint_meancor(sim, 0.5, 0.5)
 @test c ≈ one(c)
-m_series = timeseries_point_mean(sim, 0:(1 // 2^(3)):1)
-m_series = timeseries_point_median(sim, 0:(1 // 2^(3)):1)
-m_series = timeseries_point_quantile(sim, 0.5, 0:(1 // 2^(3)):1)
-m_series, v_series = timeseries_point_meanvar(sim, 0:(1 // 2^(3)):1)
-summ = EnsembleSummary(sim, 0:(1 // 2^(3)):1)
+m_series = timeseries_point_mean(sim, 0:(1 // 2 ^ (3)):1)
+m_series = timeseries_point_median(sim, 0:(1 // 2 ^ (3)):1)
+m_series = timeseries_point_quantile(sim, 0.5, 0:(1 // 2 ^ (3)):1)
+m_series, v_series = timeseries_point_meanvar(sim, 0:(1 // 2 ^ (3)):1)
+summ = EnsembleSummary(sim, 0:(1 // 2 ^ (3)):1)
 m5, v5 = m_series.u[5], v_series.u[5]
 @test m ≈ m5
 @test v ≈ v5
-m6, m7, v6 = timeseries_point_meancov(sim, 0:(1 // 2^(3)):1, 0:(1 // 2^(3)):1)[5, 5]
+m6, m7, v6 = timeseries_point_meancov(sim, 0:(1 // 2 ^ (3)):1, 0:(1 // 2 ^ (3)):1)[5, 5]
 @test m ≈ m6
 @test m ≈ m7
 @test v ≈ v6
@@ -107,15 +107,15 @@ m3, m4, c = timepoint_meancov(sim, 0.5, 0.5)
 @test v ≈ c
 m3, m4, c = timepoint_meancor(sim, 0.5, 0.5)
 @test c ≈ ones(size(c)...)
-m_series = timeseries_point_mean(sim, 0:(1 // 2^(3)):1)
-m_series = timeseries_point_median(sim, 0:(1 // 2^(3)):1)
-m_series = timeseries_point_quantile(sim, 0.5, 0:(1 // 2^(3)):1)
-m_series, v_series = timeseries_point_meanvar(sim, 0:(1 // 2^(3)):1)
-summ = EnsembleSummary(sim, 0:(1 // 2^(3)):1)
+m_series = timeseries_point_mean(sim, 0:(1 // 2 ^ (3)):1)
+m_series = timeseries_point_median(sim, 0:(1 // 2 ^ (3)):1)
+m_series = timeseries_point_quantile(sim, 0.5, 0:(1 // 2 ^ (3)):1)
+m_series, v_series = timeseries_point_meanvar(sim, 0:(1 // 2 ^ (3)):1)
+summ = EnsembleSummary(sim, 0:(1 // 2 ^ (3)):1)
 m5, v5 = m_series.u[5], v_series.u[5]
 @test m ≈ m5
 @test v ≈ v5
-m6, m7, v6 = timeseries_point_meancov(sim, 0:(1 // 2^(3)):1, 0:(1 // 2^(3)):1)[5, 5]
+m6, m7, v6 = timeseries_point_meancov(sim, 0:(1 // 2 ^ (3)):1, 0:(1 // 2 ^ (3)):1)[5, 5]
 @test m ≈ m6
 @test m ≈ m7
 @test v ≈ v6

test/runtests.jl

@@ -72,7 +72,8 @@ end
         @time @safetestset "Unwrapping" include("downstream/unwrapping.jl")
         @time @safetestset "Callback BigFloats" include("downstream/bigfloat_events.jl")
         @time @safetestset "DE stats" include("downstream/stats_tests.jl")
-        isempty(VERSION.prerelease) && @time @safetestset "Ensemble AD Tests" include("downstream/ensemble_ad.jl")
+        isempty(VERSION.prerelease) &&
+            @time @safetestset "Ensemble AD Tests" include("downstream/ensemble_ad.jl")
         @time @safetestset "Community Callback Tests" include("downstream/community_callback_tests.jl")
         @time @safetestset "AD via ode with complex numbers" include("downstream/complex_number_ad.jl")
         @time @testset "Distributed Ensemble Tests" include("downstream/distributed_ensemble.jl")