Merge pull request #2437 from jClugstor/test_sol_stripping

add strip_solution tests

Author: ChrisRackauckas

lib/OrdinaryDiffEqCore/src/alg_utils.jl

@@ -191,7 +191,6 @@ end
 # get_chunksize(alg::CompositeAlgorithm) = get_chunksize(alg.algs[alg.current_alg])
 
 function alg_autodiff end
-has_lazy_interpolation(alg) = false
 
 # Linear Exponential doesn't have any of the AD stuff
 function DiffEqBase.prepare_alg(

lib/OrdinaryDiffEqCore/src/integrators/integrator_interface.jl

@@ -45,7 +45,7 @@ function DiffEqBase.reeval_internals_due_to_modification!(
     if continuous_modification && integrator.opts.calck
         resize!(integrator.k, integrator.kshortsize) # Reset k for next step!
         alg = unwrap_alg(integrator, false)
-        if has_lazy_interpolation(alg)
+        if SciMLBase.has_lazy_interpolation(alg)
             ode_addsteps!(integrator, integrator.f, true, false, !alg.lazy)
         else
             ode_addsteps!(integrator, integrator.f, true, false)

lib/OrdinaryDiffEqCore/src/interp_func.jl

@@ -75,7 +75,7 @@ function SciMLBase.strip_interpolation(id::InterpolationData)
 end
 
 function strip_cache(cache)
-    if hasfield(typeof(cache), :jac_config) || hasfield(typeof(cache), :grad_config)
+    if hasfield(typeof(cache), :jac_config) || hasfield(typeof(cache), :grad_config) || hasfield(typeof(cache), :nlsolver)
         fieldnums = length(fieldnames(typeof(cache)))
         noth_list = fill(nothing, fieldnums)
         cache_type_name = Base.typename(typeof(cache)).wrapper
@@ -84,3 +84,4 @@ function strip_cache(cache)
         cache
     end
 end
+

lib/OrdinaryDiffEqLowOrderRK/src/OrdinaryDiffEqLowOrderRK.jl

@@ -17,7 +17,7 @@ import OrdinaryDiffEqCore: alg_order, isfsal, beta2_default, beta1_default,
                            copyat_or_push!,
                            AutoAlgSwitch, _ode_interpolant, _ode_interpolant!, full_cache,
                            accept_step_controller, DerivativeOrderNotPossibleError,
-                           has_lazy_interpolation, du_cache, u_cache, get_fsalfirstlast
+                           du_cache, u_cache, get_fsalfirstlast
 using SciMLBase
 import MuladdMacro: @muladd
 import FastBroadcast: @..

lib/OrdinaryDiffEqLowOrderRK/src/alg_utils.jl

@@ -25,7 +25,7 @@ alg_order(alg::Alshina2) = 2
 alg_order(alg::Alshina3) = 3
 alg_order(alg::Alshina6) = 6
 
-has_lazy_interpolation(alg::BS5) = true
+SciMLBase.has_lazy_interpolation(alg::BS5) = true
 
 isfsal(alg::FRK65) = true
 isfsal(alg::RKO65) = false

lib/OrdinaryDiffEqVerner/src/OrdinaryDiffEqVerner.jl

@@ -13,7 +13,7 @@ import OrdinaryDiffEqCore: alg_order, calculate_residuals!,
                            _ode_interpolant!, _ode_addsteps!, @fold,
                            @OnDemandTableauExtract, AutoAlgSwitch,
                            DerivativeOrderNotPossibleError,
-                           has_lazy_interpolation, get_fsalfirstlast
+                           get_fsalfirstlast
 using FastBroadcast, Polyester, MuladdMacro, RecursiveArrayTools
 using DiffEqBase: @def, @tight_loop_macros
 using Static: False

lib/OrdinaryDiffEqVerner/src/alg_utils.jl

@@ -12,4 +12,4 @@ alg_stability_size(alg::Vern7) = 4.6400
 alg_stability_size(alg::Vern8) = 5.8641
 alg_stability_size(alg::Vern9) = 4.4762
 
-has_lazy_interpolation(alg::Union{Vern6, Vern7, Vern8, Vern9}) = true
+SciMLBase.has_lazy_interpolation(alg::Union{Vern6, Vern7, Vern8, Vern9}) = true

test/interface/ode_strip_test.jl

@@ -11,7 +11,28 @@ u0 = [1.0; 0.0; 0.0]
 tspan = (0.0, 0.5)
 prob = ODEProblem(lorenz!, u0, tspan)
 
-sol = solve(prob, Rosenbrock23())
+rosenbrock_sol = solve(prob, Rosenbrock23())
+TRBDF_sol = solve(prob, TRBDF2())
+vern_sol = solve(prob, Vern7())
+@testset "Interpolation Stripping" begin
+    @test isnothing(SciMLBase.strip_interpolation(rosenbrock_sol.interp).f)
+    @test isnothing(SciMLBase.strip_interpolation(rosenbrock_sol.interp).cache.jac_config)
+    @test isnothing(SciMLBase.strip_interpolation(rosenbrock_sol.interp).cache.grad_config)
+end
+
+@testset "Rosenbrock Solution Stripping" begin
+    @test isnothing(SciMLBase.strip_solution(rosenbrock_sol).prob)
+    @test isnothing(SciMLBase.strip_solution(rosenbrock_sol).alg)
+    @test isnothing(SciMLBase.strip_solution(rosenbrock_sol).interp.f)
+    @test isnothing(SciMLBase.strip_solution(rosenbrock_sol).interp.cache.jac_config)
+    @test isnothing(SciMLBase.strip_solution(rosenbrock_sol).interp.cache.grad_config)
+end
+
+@testset "TRBDF Solution Stripping" begin
+    @test isnothing(SciMLBase.strip_solution(TRBDF_sol).prob)
+    @test isnothing(SciMLBase.strip_solution(TRBDF_sol).alg)
+    @test isnothing(SciMLBase.strip_solution(TRBDF_sol).interp.f)
+    @test isnothing(SciMLBase.strip_solution(TRBDF_sol).interp.cache.nlsolver)
+end
 
-@test isnothing(SciMLBase.strip_interpolation(sol.interp).f)
-@test isnothing(SciMLBase.strip_interpolation(sol.interp).cache.jac_config)
+@test_throws SciMLBase.LazyInterpolationException SciMLBase.strip_solution(vern_sol)