From 661bd35c64a3bdf937faa8b00748a2aa2063a798 Mon Sep 17 00:00:00 2001 From: ChrisRackauckas-Claude Date: Wed, 29 Jul 2026 11:37:42 -0400 Subject: [PATCH] Keep owner imports compatible with SciMLBase 3.39 The direct SciMLOperators imports do not require SciMLBase 3.40. Restore the four prior floors so monorepo tests remain resolvable before 3.40 is registered, and make affected tests import MatrixOperator and update_coefficients! from their public owner. Co-Authored-By: Chris Rackauckas --- lib/DiffEqBase/Project.toml | 2 +- lib/OrdinaryDiffEqCore/Project.toml | 2 +- lib/OrdinaryDiffEqDifferentiation/Project.toml | 2 +- lib/OrdinaryDiffEqDifferentiation/test/sparse/Project.toml | 2 ++ .../test/sparse/nonfulldiagonal_sparse_tests.jl | 1 + lib/OrdinaryDiffEqNonlinearSolve/Project.toml | 2 +- .../test/linear_solver_split_ode_tests.jl | 1 + lib/OrdinaryDiffEqNonlinearSolve/test/linear_solver_tests.jl | 1 + lib/OrdinaryDiffEqNonlinearSolve/test/mass_matrix_tests.jl | 1 + 9 files changed, 10 insertions(+), 4 deletions(-) diff --git a/lib/DiffEqBase/Project.toml b/lib/DiffEqBase/Project.toml index e07814ef44e..098c1a2a0eb 100644 --- a/lib/DiffEqBase/Project.toml +++ b/lib/DiffEqBase/Project.toml @@ -112,7 +112,7 @@ RespecializeParams = "1" ReverseDiff = "1" RecursiveArrayToolsRaggedArrays = "1" SafeTestsets = "0.1" -SciMLBase = "3.40" +SciMLBase = "3.39" SciMLLogging = "1.10.1, 2.0" SciMLOperators = "1.7.0" SciMLStructures = "1.5" diff --git a/lib/OrdinaryDiffEqCore/Project.toml b/lib/OrdinaryDiffEqCore/Project.toml index 851e267100e..a8d8a49821f 100644 --- a/lib/OrdinaryDiffEqCore/Project.toml +++ b/lib/OrdinaryDiffEqCore/Project.toml @@ -86,7 +86,7 @@ Random = "<0.0.1, 1" RecursiveArrayTools = "4.2.0" Reexport = "1.2.2" SafeTestsets = "0.1.0" -SciMLBase = "3.40" +SciMLBase = "3.39" SciMLLogging = "1.10.1, 2" SciMLOperators = "1.24.3" SciMLStructures = "1.7" diff --git a/lib/OrdinaryDiffEqDifferentiation/Project.toml b/lib/OrdinaryDiffEqDifferentiation/Project.toml index 5bdde3c0a22..fd2ceacc1ce 100644 --- a/lib/OrdinaryDiffEqDifferentiation/Project.toml +++ b/lib/OrdinaryDiffEqDifferentiation/Project.toml @@ -24,7 +24,7 @@ DifferentiationInterface = "0.7.18" LinearSolve = "5.1" ConstructionBase = "1.5.8" LinearAlgebra = "1.10" -SciMLBase = "3.40" +SciMLBase = "3.39" OrdinaryDiffEqCore = "4" OrdinaryDiffEqBDF = "2" OrdinaryDiffEqRosenbrock = "2" diff --git a/lib/OrdinaryDiffEqDifferentiation/test/sparse/Project.toml b/lib/OrdinaryDiffEqDifferentiation/test/sparse/Project.toml index 93868ce9dd5..2528a97069c 100644 --- a/lib/OrdinaryDiffEqDifferentiation/test/sparse/Project.toml +++ b/lib/OrdinaryDiffEqDifferentiation/test/sparse/Project.toml @@ -4,6 +4,7 @@ LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" LinearSolve = "7ed4a6bd-45f5-4d41-b270-4a48e9bafcae" OrdinaryDiffEq = "1dea7af3-3e70-54e6-95c3-0bf5283fa5ed" OrdinaryDiffEqSDIRK = "2d112036-d095-4a1e-ab9a-08536f3ecdbf" +SciMLOperators = "c0aeaf25-5076-4817-a8d5-81caf7dfa961" SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" @@ -15,3 +16,4 @@ OrdinaryDiffEqSDIRK = {path = "../../../OrdinaryDiffEqSDIRK"} ComponentArrays = "0.15, 1" LinearSolve = "5.1" OrdinaryDiffEq = "7" +SciMLOperators = "1.24.4" diff --git a/lib/OrdinaryDiffEqDifferentiation/test/sparse/nonfulldiagonal_sparse_tests.jl b/lib/OrdinaryDiffEqDifferentiation/test/sparse/nonfulldiagonal_sparse_tests.jl index ad1f841bfeb..fc99d5e14be 100644 --- a/lib/OrdinaryDiffEqDifferentiation/test/sparse/nonfulldiagonal_sparse_tests.jl +++ b/lib/OrdinaryDiffEqDifferentiation/test/sparse/nonfulldiagonal_sparse_tests.jl @@ -1,6 +1,7 @@ using OrdinaryDiffEq, SparseArrays, LinearSolve, LinearAlgebra, Test using OrdinaryDiffEqSDIRK using ComponentArrays +using SciMLOperators: MatrixOperator function enclosethetimedifferential(parameters::NamedTuple)::Function @info "Enclosing the time differential" diff --git a/lib/OrdinaryDiffEqNonlinearSolve/Project.toml b/lib/OrdinaryDiffEqNonlinearSolve/Project.toml index c4cd6de53d9..878b998cc15 100644 --- a/lib/OrdinaryDiffEqNonlinearSolve/Project.toml +++ b/lib/OrdinaryDiffEqNonlinearSolve/Project.toml @@ -67,7 +67,7 @@ OrdinaryDiffEqFIRK = "2" OrdinaryDiffEqRosenbrock = "2" OrdinaryDiffEqSDIRK = "2" Statistics = "1.10.0" -SciMLBase = "3.40" +SciMLBase = "3.39" OrdinaryDiffEqCore = "4.6" SimpleNonlinearSolve = "2.11.1" FastClosures = "0.3.2" diff --git a/lib/OrdinaryDiffEqNonlinearSolve/test/linear_solver_split_ode_tests.jl b/lib/OrdinaryDiffEqNonlinearSolve/test/linear_solver_split_ode_tests.jl index 6407597951e..eb50fba9bea 100644 --- a/lib/OrdinaryDiffEqNonlinearSolve/test/linear_solver_split_ode_tests.jl +++ b/lib/OrdinaryDiffEqNonlinearSolve/test/linear_solver_split_ode_tests.jl @@ -1,6 +1,7 @@ using Test using OrdinaryDiffEqBDF, OrdinaryDiffEqSDIRK using LinearAlgebra, LinearSolve +using SciMLOperators: MatrixOperator n = 8 dt = 1 / 1000 diff --git a/lib/OrdinaryDiffEqNonlinearSolve/test/linear_solver_tests.jl b/lib/OrdinaryDiffEqNonlinearSolve/test/linear_solver_tests.jl index ec3f827f025..7dc08f767fe 100644 --- a/lib/OrdinaryDiffEqNonlinearSolve/test/linear_solver_tests.jl +++ b/lib/OrdinaryDiffEqNonlinearSolve/test/linear_solver_tests.jl @@ -1,6 +1,7 @@ using Test, OrdinaryDiffEqRosenbrock, OrdinaryDiffEqSDIRK, OrdinaryDiffEqBDF using SparseArrays, LinearSolve using LinearAlgebra, Random, StaticArrays +using SciMLOperators: MatrixOperator N = 30 AA = sprand(MersenneTwister(12), N, N, 0.5) mm = sprand(MersenneTwister(123), N, N, 0.5) diff --git a/lib/OrdinaryDiffEqNonlinearSolve/test/mass_matrix_tests.jl b/lib/OrdinaryDiffEqNonlinearSolve/test/mass_matrix_tests.jl index fbd06cd3fb2..5389b611b18 100644 --- a/lib/OrdinaryDiffEqNonlinearSolve/test/mass_matrix_tests.jl +++ b/lib/OrdinaryDiffEqNonlinearSolve/test/mass_matrix_tests.jl @@ -2,6 +2,7 @@ using OrdinaryDiffEqSDIRK, OrdinaryDiffEqBDF, OrdinaryDiffEqRosenbrock, Ordinary OrdinaryDiffEqNonlinearSolve, Test, LinearAlgebra, Statistics using OrdinaryDiffEqCore using OrdinaryDiffEqNonlinearSolve: NLFunctional, NLAnderson, NLNewton +using SciMLOperators: MatrixOperator, update_coefficients! using LinearAlgebra: Diagonal using ADTypes: AutoForwardDiff