Skip to content

Commit f5200fd

Browse files
authored
Merge pull request #158 from ModiaSim/SciMLBaseFullSpecialize
Use DiffEqBase 6.104.3 + reactivate MonteCarloSimulation tests
2 parents e409813 + 619d0e0 commit f5200fd

File tree

2 files changed

+43
-24
lines changed

2 files changed

+43
-24
lines changed

Manifest.toml

Lines changed: 39 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# This file is machine-generated - editing it directly is not advised
22

3-
julia_version = "1.7.3"
3+
julia_version = "1.8.1"
44
manifest_format = "2.0"
5-
project_hash = "2829599ff99320f949dafcb539c87d6acb385bac"
5+
project_hash = "becb03a89b85534a06e2b6728f89ca47ad92290e"
66

77
[[deps.Adapt]]
88
deps = ["LinearAlgebra"]
@@ -12,6 +12,7 @@ version = "3.4.0"
1212

1313
[[deps.ArgTools]]
1414
uuid = "0dad84c5-d112-42e6-8d28-ef12dabb789f"
15+
version = "1.1.1"
1516

1617
[[deps.ArnoldiMethod]]
1718
deps = ["LinearAlgebra", "Random", "StaticArrays"]
@@ -140,6 +141,7 @@ version = "4.2.0"
140141
[[deps.CompilerSupportLibraries_jll]]
141142
deps = ["Artifacts", "Libdl"]
142143
uuid = "e66e0078-7015-5450-92f7-15fbd957f2ae"
144+
version = "0.5.2+0"
143145

144146
[[deps.ConstructionBase]]
145147
deps = ["LinearAlgebra"]
@@ -198,9 +200,9 @@ version = "0.4.0"
198200

199201
[[deps.DiffEqBase]]
200202
deps = ["ArrayInterfaceCore", "ChainRulesCore", "DataStructures", "Distributions", "DocStringExtensions", "FastBroadcast", "ForwardDiff", "FunctionWrappers", "FunctionWrappersWrappers", "LinearAlgebra", "Logging", "MuladdMacro", "NonlinearSolve", "Parameters", "Printf", "RecursiveArrayTools", "Reexport", "Requires", "SciMLBase", "Setfield", "SparseArrays", "Static", "StaticArrays", "Statistics", "Tricks", "ZygoteRules"]
201-
git-tree-sha1 = "ff3b0abda9ee27c36019fffce8aca4394505e503"
203+
git-tree-sha1 = "9cf35875034e50058848b2eeca9efa560cfa0ae6"
202204
uuid = "2b5f629d-d688-5b77-993f-72d75c75574e"
203-
version = "6.104.2"
205+
version = "6.104.3"
204206

205207
[[deps.DiffEqCallbacks]]
206208
deps = ["DataStructures", "DiffEqBase", "ForwardDiff", "LinearAlgebra", "Markdown", "NLsolve", "Parameters", "RecipesBase", "RecursiveArrayTools", "SciMLBase", "StaticArrays"]
@@ -244,9 +246,9 @@ uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b"
244246

245247
[[deps.Distributions]]
246248
deps = ["ChainRulesCore", "DensityInterface", "FillArrays", "LinearAlgebra", "PDMats", "Printf", "QuadGK", "Random", "SparseArrays", "SpecialFunctions", "Statistics", "StatsBase", "StatsFuns", "Test"]
247-
git-tree-sha1 = "ee407ce31ab2f1bacadc3bd987e96de17e00aed3"
249+
git-tree-sha1 = "34a557ce10eb2d9142f4ef60726b4f17c1c30941"
248250
uuid = "31c24e10-a181-5473-b8eb-7969acd0382f"
249-
version = "0.25.71"
251+
version = "0.25.73"
250252

251253
[[deps.DocStringExtensions]]
252254
deps = ["LibGit2"]
@@ -257,6 +259,7 @@ version = "0.9.1"
257259
[[deps.Downloads]]
258260
deps = ["ArgTools", "FileWatching", "LibCURL", "NetworkOptions"]
259261
uuid = "f43a241f-c20a-4ad4-852c-f6b1247861c6"
262+
version = "1.6.0"
260263

261264
[[deps.DualNumbers]]
262265
deps = ["Calculus", "NaNMath", "SpecialFunctions"]
@@ -266,9 +269,9 @@ version = "0.6.8"
266269

267270
[[deps.ExponentialUtilities]]
268271
deps = ["ArrayInterfaceCore", "GPUArraysCore", "GenericSchur", "LinearAlgebra", "Printf", "SparseArrays", "libblastrampoline_jll"]
269-
git-tree-sha1 = "b40c9037e1a33990466bc5d224ced34b34eebdb0"
272+
git-tree-sha1 = "b19c3f5001b11b71d0f970f354677d604f3a1a97"
270273
uuid = "d4d017d3-3776-5f7e-afef-a10c40355c18"
271-
version = "1.18.0"
274+
version = "1.19.0"
272275

273276
[[deps.ExprTools]]
274277
git-tree-sha1 = "56559bbef6ca5ea0c0818fa5c90320398a6fbf8d"
@@ -456,10 +459,12 @@ version = "1.0.0"
456459
[[deps.LibCURL]]
457460
deps = ["LibCURL_jll", "MozillaCACerts_jll"]
458461
uuid = "b27032c2-a3e7-50c8-80cd-2d36dbcbfd21"
462+
version = "0.6.3"
459463

460464
[[deps.LibCURL_jll]]
461465
deps = ["Artifacts", "LibSSH2_jll", "Libdl", "MbedTLS_jll", "Zlib_jll", "nghttp2_jll"]
462466
uuid = "deac9b47-8bc7-5906-a0fe-35ac56dc84c0"
467+
version = "7.84.0+0"
463468

464469
[[deps.LibGit2]]
465470
deps = ["Base64", "NetworkOptions", "Printf", "SHA"]
@@ -468,6 +473,7 @@ uuid = "76f85450-5226-5b5a-8eaa-529ad045b433"
468473
[[deps.LibSSH2_jll]]
469474
deps = ["Artifacts", "Libdl", "MbedTLS_jll"]
470475
uuid = "29816b5a-b9ab-546f-933c-edad1886dfa8"
476+
version = "1.10.2+0"
471477

472478
[[deps.Libdl]]
473479
uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
@@ -521,6 +527,7 @@ uuid = "d6f4376e-aef5-505a-96c1-9c027394607a"
521527
[[deps.MbedTLS_jll]]
522528
deps = ["Artifacts", "Libdl"]
523529
uuid = "c8ffd9c3-330d-5841-b78e-0817d7145fa1"
530+
version = "2.28.0+0"
524531

525532
[[deps.Measurements]]
526533
deps = ["Calculus", "LinearAlgebra", "Printf", "RecipesBase", "Requires"]
@@ -551,6 +558,7 @@ version = "1.0.10"
551558

552559
[[deps.MozillaCACerts_jll]]
553560
uuid = "14a3606d-f60d-562e-9121-12d972cd8159"
561+
version = "2022.2.1"
554562

555563
[[deps.MuladdMacro]]
556564
git-tree-sha1 = "c6190f9a7fc5d9d5915ab29f2134421b12d24a68"
@@ -577,6 +585,7 @@ version = "1.0.1"
577585

578586
[[deps.NetworkOptions]]
579587
uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908"
588+
version = "1.2.0"
580589

581590
[[deps.NonlinearSolve]]
582591
deps = ["ArrayInterfaceCore", "FiniteDiff", "ForwardDiff", "IterativeSolvers", "LinearAlgebra", "RecursiveArrayTools", "RecursiveFactorization", "Reexport", "SciMLBase", "Setfield", "StaticArrays", "UnPack"]
@@ -593,10 +602,12 @@ version = "1.12.7"
593602
[[deps.OpenBLAS_jll]]
594603
deps = ["Artifacts", "CompilerSupportLibraries_jll", "Libdl"]
595604
uuid = "4536629a-c528-5b80-bd46-f80d51c5b363"
605+
version = "0.3.20+0"
596606

597607
[[deps.OpenLibm_jll]]
598608
deps = ["Artifacts", "Libdl"]
599609
uuid = "05823500-19ac-5b8b-9628-191a04bc5112"
610+
version = "0.8.1+0"
600611

601612
[[deps.OpenSpecFun_jll]]
602613
deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl", "Pkg"]
@@ -616,10 +627,10 @@ uuid = "bac558e1-5e72-5ebc-8fee-abe8a469f55d"
616627
version = "1.4.1"
617628

618629
[[deps.OrdinaryDiffEq]]
619-
deps = ["Adapt", "ArrayInterface", "ArrayInterfaceGPUArrays", "ArrayInterfaceStaticArrays", "DataStructures", "DiffEqBase", "DocStringExtensions", "ExponentialUtilities", "FastBroadcast", "FastClosures", "FiniteDiff", "ForwardDiff", "FunctionWrappersWrappers", "LinearAlgebra", "LinearSolve", "Logging", "LoopVectorization", "MacroTools", "MuladdMacro", "NLsolve", "NonlinearSolve", "Polyester", "PreallocationTools", "RecursiveArrayTools", "Reexport", "SciMLBase", "SnoopPrecompile", "SparseArrays", "SparseDiffTools", "StaticArrays", "UnPack"]
620-
git-tree-sha1 = "d20891e46072ad2826fab4b9c8fcb4e4654eb8c9"
630+
deps = ["Adapt", "ArrayInterface", "ArrayInterfaceGPUArrays", "ArrayInterfaceStaticArrays", "DataStructures", "DiffEqBase", "DocStringExtensions", "ExponentialUtilities", "FastBroadcast", "FastClosures", "FiniteDiff", "ForwardDiff", "FunctionWrappersWrappers", "LinearAlgebra", "LinearSolve", "Logging", "LoopVectorization", "MacroTools", "MuladdMacro", "NLsolve", "NonlinearSolve", "Polyester", "PreallocationTools", "Preferences", "RecursiveArrayTools", "Reexport", "SciMLBase", "SnoopPrecompile", "SparseArrays", "SparseDiffTools", "StaticArrays", "UnPack"]
631+
git-tree-sha1 = "1977e3012d36690852d550839c71f0b1c87fb12c"
621632
uuid = "1dea7af3-3e70-54e6-95c3-0bf5283fa5ed"
622-
version = "6.26.4"
633+
version = "6.27.0"
623634

624635
[[deps.PDMats]]
625636
deps = ["LinearAlgebra", "SparseArrays", "SuiteSparse"]
@@ -642,6 +653,7 @@ version = "2.4.0"
642653
[[deps.Pkg]]
643654
deps = ["Artifacts", "Dates", "Downloads", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "Serialization", "TOML", "Tar", "UUIDs", "p7zip_jll"]
644655
uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
656+
version = "1.8.0"
645657

646658
[[deps.PoissonRandom]]
647659
deps = ["Random"]
@@ -769,6 +781,7 @@ version = "0.3.0+0"
769781

770782
[[deps.SHA]]
771783
uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce"
784+
version = "0.7.0"
772785

773786
[[deps.SIMDDualNumbers]]
774787
deps = ["ForwardDiff", "IfElse", "SLEEFPirates", "VectorizationBase"]
@@ -789,9 +802,9 @@ version = "0.6.35"
789802

790803
[[deps.SciMLBase]]
791804
deps = ["ArrayInterfaceCore", "CommonSolve", "ConstructionBase", "Distributed", "DocStringExtensions", "FunctionWrappersWrappers", "IteratorInterfaceExtensions", "LinearAlgebra", "Logging", "Markdown", "Preferences", "RecipesBase", "RecursiveArrayTools", "StaticArraysCore", "Statistics", "Tables"]
792-
git-tree-sha1 = "8c7acbc1a974db5f533b59ab74b69042fa05b002"
805+
git-tree-sha1 = "ce26aa756fd46913a6139e5259749f72169f5b5d"
793806
uuid = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
794-
version = "1.57.0"
807+
version = "1.58.0"
795808

796809
[[deps.Serialization]]
797810
uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
@@ -895,9 +908,9 @@ version = "1.9.0"
895908

896909
[[deps.StochasticDiffEq]]
897910
deps = ["Adapt", "ArrayInterface", "DataStructures", "DiffEqBase", "DiffEqNoiseProcess", "DocStringExtensions", "FillArrays", "FiniteDiff", "ForwardDiff", "JumpProcesses", "LevyArea", "LinearAlgebra", "Logging", "MuladdMacro", "NLsolve", "OrdinaryDiffEq", "Random", "RandomNumbers", "RecursiveArrayTools", "Reexport", "SciMLBase", "SparseArrays", "SparseDiffTools", "StaticArrays", "UnPack"]
898-
git-tree-sha1 = "47648a908783ddbd124cf3deb3eb0d18b7cffcce"
911+
git-tree-sha1 = "8062351f645bb23725c494be74619ef802a2ffa8"
899912
uuid = "789caeaf-c7a9-5a7d-9973-96adeb23e2a0"
900-
version = "6.53.0"
913+
version = "6.54.0"
901914

902915
[[deps.StrideArraysCore]]
903916
deps = ["ArrayInterface", "CloseOpenIntervals", "IfElse", "LayoutPointers", "ManualMemory", "SIMDTypes", "Static", "ThreadingUtilities"]
@@ -912,6 +925,7 @@ uuid = "4607b0f0-06f3-5cda-b6b1-a6196a1729e9"
912925
[[deps.SuiteSparse_jll]]
913926
deps = ["Artifacts", "Libdl", "Pkg", "libblastrampoline_jll"]
914927
uuid = "bea87d4a-7f5b-5778-9afe-8cc45184846c"
928+
version = "5.10.1+0"
915929

916930
[[deps.Sundials]]
917931
deps = ["CEnum", "DataStructures", "DiffEqBase", "Libdl", "LinearAlgebra", "Logging", "Reexport", "SnoopPrecompile", "SparseArrays", "Sundials_jll"]
@@ -928,6 +942,7 @@ version = "5.2.1+0"
928942
[[deps.TOML]]
929943
deps = ["Dates"]
930944
uuid = "fa267f1f-6049-4f14-aa54-33bafae1ed76"
945+
version = "1.0.0"
931946

932947
[[deps.TableTraits]]
933948
deps = ["IteratorInterfaceExtensions"]
@@ -937,13 +952,14 @@ version = "1.0.1"
937952

938953
[[deps.Tables]]
939954
deps = ["DataAPI", "DataValueInterfaces", "IteratorInterfaceExtensions", "LinearAlgebra", "OrderedCollections", "TableTraits", "Test"]
940-
git-tree-sha1 = "5ce79ce186cc678bbb5c5681ca3379d1ddae11a1"
955+
git-tree-sha1 = "7149a60b01bf58787a1b83dad93f90d4b9afbe5d"
941956
uuid = "bd369af6-aec1-5ad0-b16a-f7cc5008161c"
942-
version = "1.7.0"
957+
version = "1.8.1"
943958

944959
[[deps.Tar]]
945960
deps = ["ArgTools", "SHA"]
946961
uuid = "a4e569a6-e804-4fa4-b0f3-eef7a1d5b13e"
962+
version = "1.10.0"
947963

948964
[[deps.Test]]
949965
deps = ["InteractiveUtils", "Logging", "Random", "Serialization"]
@@ -992,9 +1008,9 @@ uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5"
9921008

9931009
[[deps.Unitful]]
9941010
deps = ["ConstructionBase", "Dates", "LinearAlgebra", "Random"]
995-
git-tree-sha1 = "b649200e887a487468b71821e2644382699f1b0f"
1011+
git-tree-sha1 = "d57a4ed70b6f9ff1da6719f5f2713706d57e0d66"
9961012
uuid = "1986cc42-f94f-5a68-af5c-568840ba703d"
997-
version = "1.11.0"
1013+
version = "1.12.0"
9981014

9991015
[[deps.VectorizationBase]]
10001016
deps = ["ArrayInterface", "CPUSummary", "HostCPUFeatures", "IfElse", "LayoutPointers", "Libdl", "LinearAlgebra", "SIMDTypes", "Static"]
@@ -1011,6 +1027,7 @@ version = "0.2.0"
10111027
[[deps.Zlib_jll]]
10121028
deps = ["Libdl"]
10131029
uuid = "83775a58-1f1d-513f-b197-d71354ab007a"
1030+
version = "1.2.12+3"
10141031

10151032
[[deps.ZygoteRules]]
10161033
deps = ["MacroTools"]
@@ -1021,11 +1038,14 @@ version = "0.2.2"
10211038
[[deps.libblastrampoline_jll]]
10221039
deps = ["Artifacts", "Libdl", "OpenBLAS_jll"]
10231040
uuid = "8e850b90-86db-534c-a0d3-1478176c7d93"
1041+
version = "5.1.1+0"
10241042

10251043
[[deps.nghttp2_jll]]
10261044
deps = ["Artifacts", "Libdl"]
10271045
uuid = "8e850ede-7688-5339-a07c-302acd2aaf8d"
1046+
version = "1.48.0+0"
10281047

10291048
[[deps.p7zip_jll]]
10301049
deps = ["Artifacts", "Libdl"]
10311050
uuid = "3f19e933-33d8-53b3-aaab-bd5110c3b7a0"
1051+
version = "17.4.0+0"

test/include_all.jl

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,16 @@ end
1717

1818

1919
Test.@testset "Test units, uncertainties" begin
20-
Test.@test_skip include("TestUnitAsString.jl") # skip since MonteCarloMeasurements hangs in newest DiffEqBase
21-
# see https://github.com/SciML/DiffEqBase.jl/issues/828
20+
include("TestUnitAsString.jl")
2221
include("TestUnits.jl")
2322
include("TestUncertainties.jl")
2423
include("TestUnitsAndUncertainties.jl")
2524
include("TestTwoInertiasAndIdealGear.jl")
2625
include("TestTwoInertiasAndIdealGearWithUnits.jl")
2726
include("TestTwoInertiasAndIdealGearWithUnitsAndUncertainties.jl")
28-
Test.@test_skip include("TestTwoInertiasAndIdealGearWithMonteCarlo.jl")
29-
Test.@test_skip include("TestTwoInertiasAndIdealGearWithUnitsAndMonteCarlo.jl")
30-
Test.@test_skip include("TestLinearEquationSystemWithUnitsAndMonteCarlo.jl")
27+
include("TestTwoInertiasAndIdealGearWithMonteCarlo.jl")
28+
include("TestTwoInertiasAndIdealGearWithUnitsAndMonteCarlo.jl")
29+
include("TestLinearEquationSystemWithUnitsAndMonteCarlo.jl")
3130
end
3231

3332

0 commit comments

Comments
 (0)