Skip to content

Commit 7cb570d

Browse files
charleskawczynskicharleskawczynski
authored
Merge pull request #1977 from CliMA/ck/reduce_deps_iter2
Reduce dependence on OrdinaryDiffEq
2 parents 9eb9662 + 116f989 commit 7cb570d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+100
-76
lines changed

‎.buildkite/Manifest.toml

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
julia_version = "1.10.4"
44
manifest_format = "2.0"
5-
project_hash = "652f90825513bed89484e0ca25f9a53f61dedb8c"
5+
project_hash = "a3b8e1623c974758b823be61fb12f149202fadbb"
66

77
[[deps.ADTypes]]
88
git-tree-sha1 = "99a6f5d0ce1c7c6afdb759daa30226f71c54f6b0"
@@ -1744,6 +1744,28 @@ git-tree-sha1 = "a8b2d333cd90562b58b977b4033739360b37fb1f"
17441744
uuid = "1dea7af3-3e70-54e6-95c3-0bf5283fa5ed"
17451745
version = "6.87.0"
17461746

1747+
[[deps.OrdinaryDiffEqCore]]
1748+
deps = ["ADTypes", "Adapt", "ArrayInterface", "DataStructures", "DiffEqBase", "DocStringExtensions", "EnumX", "FastBroadcast", "FastClosures", "FillArrays", "FunctionWrappersWrappers", "InteractiveUtils", "LinearAlgebra", "Logging", "MacroTools", "MuladdMacro", "Polyester", "PrecompileTools", "Preferences", "RecursiveArrayTools", "Reexport", "SciMLBase", "SciMLOperators", "SciMLStructures", "SimpleUnPack", "Static", "StaticArrayInterface", "StaticArraysCore", "TruncatedStacktraces"]
1749+
git-tree-sha1 = "bc70a38874c801549d415c16a23ec632ad91afd1"
1750+
uuid = "bbf590c4-e513-4bbe-9b18-05decba2e5d8"
1751+
version = "1.4.0"
1752+
weakdeps = ["EnzymeCore"]
1753+
1754+
[deps.OrdinaryDiffEqCore.extensions]
1755+
OrdinaryDiffEqCoreEnzymeCoreExt = "EnzymeCore"
1756+
1757+
[[deps.OrdinaryDiffEqSSPRK]]
1758+
deps = ["DiffEqBase", "FastBroadcast", "MuladdMacro", "OrdinaryDiffEqCore", "Polyester", "PrecompileTools", "Preferences", "RecursiveArrayTools", "Reexport", "Static", "StaticArrays"]
1759+
git-tree-sha1 = "7dbe4ac56f930df5e9abd003cedb54e25cbbea86"
1760+
uuid = "669c94d9-1f4b-4b64-b377-1aa079aa2388"
1761+
version = "1.2.0"
1762+
1763+
[[deps.OrdinaryDiffEqTsit5]]
1764+
deps = ["DiffEqBase", "FastBroadcast", "LinearAlgebra", "MuladdMacro", "OrdinaryDiffEqCore", "PrecompileTools", "Preferences", "RecursiveArrayTools", "Reexport", "Static", "TruncatedStacktraces"]
1765+
git-tree-sha1 = "96552f7d4619fabab4038a29ed37dd55e9eb513a"
1766+
uuid = "b1df2697-797e-41e3-8120-5422d3b24e4a"
1767+
version = "1.1.0"
1768+
17471769
[[deps.P11Kit_jll]]
17481770
deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
17491771
git-tree-sha1 = "2cd396108e178f3ae8dedbd8e938a18726ab2fbf"

‎.buildkite/Project.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ NCDatasets = "85f8d34a-cbdd-5861-8df4-14fed0d494ab"
3535
NVTX = "5da4648a-3479-48b8-97b9-01cb529c0a1f"
3636
OrderedCollections = "bac558e1-5e72-5ebc-8fee-abe8a469f55d"
3737
OrdinaryDiffEq = "1dea7af3-3e70-54e6-95c3-0bf5283fa5ed"
38+
OrdinaryDiffEqSSPRK = "669c94d9-1f4b-4b64-b377-1aa079aa2388"
39+
OrdinaryDiffEqTsit5 = "b1df2697-797e-41e3-8120-5422d3b24e4a"
3840
PProf = "e4faabce-9ead-11e9-39d9-4379958e3056"
3941
Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
4042
PrettyTables = "08abe8d2-0d0c-5749-adfa-8a2ac140af0d"

‎examples/bickleyjet/bickleyjet_cg.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import ClimaCore:
1212
Quadratures
1313
import ClimaCore.Geometry: ⊗
1414

15-
using OrdinaryDiffEq: ODEProblem, solve, SSPRK33
15+
using OrdinaryDiffEqSSPRK: ODEProblem, solve, SSPRK33
1616

1717
import Logging
1818
import TerminalLoggers

‎examples/bickleyjet/bickleyjet_cg_invariant_hypervisc.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import ClimaCore:
1111
Topologies,
1212
Quadratures,
1313
DataLayouts
14-
using OrdinaryDiffEq: ODEProblem, solve, SSPRK33
14+
using OrdinaryDiffEqSSPRK: ODEProblem, solve, SSPRK33
1515

1616
using Logging
1717
ClimaComms.@import_required_backends

‎examples/bickleyjet/bickleyjet_cg_unsmesh.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import ClimaCore:
1212
Quadratures
1313
import ClimaCore.Geometry: ⊗
1414

15-
using OrdinaryDiffEq: ODEProblem, solve, SSPRK33
15+
using OrdinaryDiffEqSSPRK: ODEProblem, solve, SSPRK33
1616

1717
import Logging
1818
import TerminalLoggers

‎examples/bickleyjet/bickleyjet_dg.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import ClimaCore:
1414
import ClimaCore.Geometry: ⊗
1515
import ClimaCore.RecursiveApply: ⊞, rdiv, rmap
1616

17-
using OrdinaryDiffEq: ODEProblem, solve, SSPRK33
17+
using OrdinaryDiffEqSSPRK: ODEProblem, solve, SSPRK33
1818

1919
import Logging
2020
import TerminalLoggers

‎examples/column/advect.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import ClimaCore:
1010
Geometry,
1111
Spaces
1212

13-
using OrdinaryDiffEq: ODEProblem, solve, SSPRK33
13+
using OrdinaryDiffEqSSPRK: ODEProblem, solve, SSPRK33
1414

1515
import Logging
1616
import TerminalLoggers

‎examples/column/advect_diffusion.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import ClimaCore:
1010
Geometry,
1111
Spaces
1212

13-
using OrdinaryDiffEq: ODEProblem, solve, SSPRK33
13+
using OrdinaryDiffEqSSPRK: ODEProblem, solve, SSPRK33
1414

1515
import Logging
1616
import TerminalLoggers

‎examples/column/bb_fct_advection.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import ClimaComms
22
ClimaComms.@import_required_backends
33
using Test
44
using LinearAlgebra
5-
using OrdinaryDiffEq: ODEProblem, solve
5+
using SciMLBase: ODEProblem, solve
66
using ClimaTimeSteppers
77

88
import ClimaCore:

‎examples/column/ekman.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import ClimaCore:
1111
Geometry,
1212
Spaces
1313

14-
using OrdinaryDiffEq: OrdinaryDiffEq, ODEProblem, solve, SSPRK33
14+
using OrdinaryDiffEqSSPRK: ODEProblem, solve, SSPRK33
1515

1616
import Logging
1717
import TerminalLoggers

0 commit comments

Comments
 (0)