Merge pull request #4626 from SciML/as/fix-ci

ci: several CI fixes

Author: AayushSabharwal

Project.toml

@@ -132,7 +132,7 @@ DynamicQuantities = "1"
 JumpProcesses = "9"
 Latexify = "0.16"
 Random = "1"
-RecursiveArrayTools = "3"
+RecursiveArrayTools = "3, 4"
 ReferenceTests = "0.10"
 SafeTestsets = "0.1"
 SciCompDSL = "1"
@@ -142,7 +142,7 @@ SpecialFunctions = "2"
 StableRNGs = "1"
 Statistics = "1"
 SteadyStateDiffEq = "2"
-Sundials = "4"
+Sundials = "4, 5, 6"
 Test = "1"
 TestEnv = "1"
 URIs = "1"

docs/Project.toml

@@ -38,7 +38,7 @@ Symbolics = "0c5d862f-8b57-4792-8d23-62f2024744c7"
 [compat]
 Attractors = "1.24"
 BenchmarkTools = "1.3"
-BifurcationKit = "0.5, 0.6, 0.7"
+BifurcationKit = "0.5, 0.6, 0.7, 0.8"
 CairoMakie = "0.15"
 CommonSolve = "0.2"
 ControlSystemsBase = "1.20"

lib/ModelingToolkitBase/Project.toml

@@ -156,6 +156,7 @@ OrdinaryDiffEqFunctionMap = "1, 2"
 OrdinaryDiffEqNonlinearSolve = "1.5.0, 2"
 OrdinaryDiffEqRosenbrock = "1, 2"
 OrdinaryDiffEqSDIRK = "1, 2"
+OrdinaryDiffEqTsit5 = "1, 2"
 Pkg = "1"
 PreallocationTools = "0.4.27, 1"
 PrecompileTools = "1.2.1"
@@ -219,6 +220,7 @@ OrdinaryDiffEqFunctionMap = "d3585ca7-f5d3-4ba6-8057-292ed1abd90f"
 OrdinaryDiffEqNonlinearSolve = "127b3ac7-2247-4354-8eb6-78cf4e7c58e8"
 OrdinaryDiffEqRosenbrock = "43230ef6-c299-4910-a778-202eb28ce4ce"
 OrdinaryDiffEqSDIRK = "2d112036-d095-4a1e-ab9a-08536f3ecdbf"
+OrdinaryDiffEqTsit5 = "b1df2697-797e-41e3-8120-5422d3b24e4a"
 Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
 REPL = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
@@ -232,4 +234,4 @@ Sundials = "c3572dad-4567-51f8-b174-8c6c989267f4"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [targets]
-test = ["BenchmarkTools", "BoundaryValueDiffEqMIRK", "BoundaryValueDiffEqAscher", "ControlSystemsBase", "DataInterpolations", "DelayDiffEq", "NonlinearSolve", "ForwardDiff", "ModelingToolkitStandardLibrary", "Optimization", "OptimizationIpopt", "OptimizationOptimJL", "OrdinaryDiffEq", "OrdinaryDiffEqDefault", "REPL", "Random", "ReferenceTests", "SafeTestsets", "StableRNGs", "Statistics", "SteadyStateDiffEq", "Test", "StochasticDiffEq", "Sundials", "Pkg", "OrdinaryDiffEqNonlinearSolve", "Logging", "OptimizationBase", "LinearSolve", "Latexify", "Distributed", "DiffEqNoiseProcess", "DynamicQuantities", "OrdinaryDiffEqSDIRK", "OrdinaryDiffEqRosenbrock", "OrdinaryDiffEqBDF", "OrdinaryDiffEqFunctionMap"]
+test = ["BenchmarkTools", "BoundaryValueDiffEqMIRK", "BoundaryValueDiffEqAscher", "ControlSystemsBase", "DataInterpolations", "DelayDiffEq", "NonlinearSolve", "ForwardDiff", "ModelingToolkitStandardLibrary", "Optimization", "OptimizationIpopt", "OptimizationOptimJL", "OrdinaryDiffEq", "OrdinaryDiffEqDefault", "REPL", "Random", "ReferenceTests", "SafeTestsets", "StableRNGs", "Statistics", "SteadyStateDiffEq", "Test", "StochasticDiffEq", "Sundials", "Pkg", "OrdinaryDiffEqNonlinearSolve", "Logging", "OptimizationBase", "LinearSolve", "Latexify", "Distributed", "DiffEqNoiseProcess", "DynamicQuantities", "OrdinaryDiffEqSDIRK", "OrdinaryDiffEqRosenbrock", "OrdinaryDiffEqBDF", "OrdinaryDiffEqFunctionMap", "OrdinaryDiffEqTsit5"]

lib/ModelingToolkitBase/test/extensions/bifurcationkit.jl

@@ -215,7 +215,7 @@ end
         0 ~ -k1*X1 + k2*(-X1 + Γ[1])
         0 ~ X2 + X1 - Γ[1]
     ]
-    @mtkcompile nsys2 = System(eqs)
+    @mtkcompile nsys2 = System(eqs; maybe_zeros = [k1, k2])
 
     @test_nowarn BifurcationKit.BifurcationProblem(
         nsys2, [X1 => 5.0, X2 => 8.0], [k1 => 8.0, k2 => 1.0, Γ => [13.0]], k1; plot_var = X1

lib/ModelingToolkitBase/test/index_cache.jl

@@ -192,7 +192,7 @@ end
     ps = (setter, prob, getter)
     @test costfn([2.0, 3.0], ps) ≠ zeros(2)
     prep = DI.prepare_gradient(Base.Fix2(costfn, ps), AutoForwardDiff(), [2.0, 3.0])
-    if VERSION >= v"1.12-"
+    if VERSION >= v"1.12-" && VERSION < v"1.13-"
         @test_nowarn @inferred DI.gradient(Base.Fix2(costfn, ps), prep, AutoForwardDiff(), [2.0, 3.0])
     else
         @test_nowarn DI.gradient(Base.Fix2(costfn, ps), prep, AutoForwardDiff(), [2.0, 3.0])

lib/ModelingToolkitBase/test/initializationsystem.jl

@@ -1727,7 +1727,17 @@ end
     # AutoSpecialize uses Union types for compilation sharing, so @inferred
     # is only expected to pass with FullSpecialize.
     prob = ODEProblem{true, SciMLBase.FullSpecialize}(complete(sys), [], (0.0, 1))
-    if v"1.12-" <= VERSION < v"1.13-"
+    if v"1.13-" <= VERSION
+        if @isdefined(ModelingToolkit)
+            @inferred remake(prob; u0 = 2 .* prob.u0, p = prob.p)
+            @inferred solve(prob)
+        else
+            # Changes in how the initialization system simplifies cause changes in generated
+            # code and thus in inference behavior.
+            @test_broken @inferred remake(prob; u0 = 2 .* prob.u0, p = prob.p)
+            @test_broken @inferred solve(prob)
+        end
+    elseif v"1.12-" <= VERSION
         @inferred remake(prob; u0 = 2 .* prob.u0, p = prob.p)
         @inferred solve(prob)
     else

lib/ModelingToolkitBase/test/multithreading.jl

@@ -1,5 +1,5 @@
 using ModelingToolkitBase, OrdinaryDiffEqTsit5, SciMLBase
-using ModelingToolkit: t_nounits as t, D_nounits as D, SymbolicT
+using ModelingToolkitBase: t_nounits as t, D_nounits as D, SymbolicT
 using SciMLBase: EnsembleProblem, EnsembleThreads
 
 const TRAJECTORIES = 100