Merge pull request #2473 from jClugstor/strip_sol_fix

Cache stripping fix

Author: ChrisRackauckas

Project.toml

@@ -133,7 +133,7 @@ PrecompileTools = "1"
 Preferences = "1.3"
 RecursiveArrayTools = "2.36, 3"
 Reexport = "1.0"
-SciMLBase = "2.53"
+SciMLBase = "2.53.2"
 SciMLOperators = "0.3"
 SciMLStructures = "1"
 SimpleNonlinearSolve = "1"

lib/OrdinaryDiffEqCore/Project.toml

@@ -1,7 +1,7 @@
 name = "OrdinaryDiffEqCore"
 uuid = "bbf590c4-e513-4bbe-9b18-05decba2e5d8"
 authors = ["ParamThakkar123 <[email protected]>"]
-version = "1.6.0"
+version = "1.6.1"
 
 [deps]
 ADTypes = "47edcb42-4c32-4615-8424-f2b9edc5f35b"

lib/OrdinaryDiffEqCore/src/interp_func.jl

@@ -75,14 +75,21 @@ function SciMLBase.strip_interpolation(id::InterpolationData)
 end
 
 function strip_cache(cache)
-    if hasfield(typeof(cache), :jac_config) || hasfield(typeof(cache), :grad_config) ||
-       hasfield(typeof(cache), :nlsolver) || hasfield(typeof(cache), :tf) ||
-       hasfield(typeof(cache), :uf)
-        fieldnums = length(fieldnames(typeof(cache)))
-        noth_list = fill(nothing, fieldnums)
-        cache_type_name = Base.typename(typeof(cache)).wrapper
-        cache_type_name(noth_list...)
-    else
-        cache
+    if hasfield(typeof(cache), :jac_config) 
+        SciMLBase.@reset cache.jac_config = nothing
     end
+    if hasfield(typeof(cache), :grad_config)
+        SciMLBase.@reset cache.grad_config = nothing
+    end
+    if hasfield(typeof(cache), :nlsolver)
+        SciMLBase.@reset cache.nlsolver = nothing
+    end
+    if hasfield(typeof(cache), :tf)
+        SciMLBase.@reset cache.tf = nothing
+    end
+    if hasfield(typeof(cache), :uf)
+        SciMLBase.@reset cache.uf = nothing
+    end
+    
+    cache
 end

test/interface/ode_strip_test.jl

@@ -14,15 +14,16 @@ prob = ODEProblem(lorenz!, u0, tspan)
 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 SciMLBase.strip_solution(rosenbrock_sol).prob isa NamedTuple
+    @test isnothing(SciMLBase.strip_solution(rosenbrock_sol, strip_alg = true).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)
@@ -31,8 +32,8 @@ end
 end
 
 @testset "TRBDF Solution Stripping" begin
-    @test isnothing(SciMLBase.strip_solution(TRBDF_sol).prob)
-    @test isnothing(SciMLBase.strip_solution(TRBDF_sol).alg)
+    @test SciMLBase.strip_solution(TRBDF_sol).prob isa NamedTuple
+    @test isnothing(SciMLBase.strip_solution(TRBDF_sol, strip_alg = true).alg)
     @test isnothing(SciMLBase.strip_solution(TRBDF_sol).interp.f)
     @test isnothing(SciMLBase.strip_solution(TRBDF_sol).interp.cache.nlsolver)
 end