From 11a430070bbb5dea2da06b0a6bb122cb7d747676 Mon Sep 17 00:00:00 2001 From: Oscar Smith Date: Tue, 29 Apr 2025 00:46:54 -0400 Subject: [PATCH 1/3] forwardDiff@1 --- test/Project.toml | 8 ++++---- test/minibatch.jl | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/test/Project.toml b/test/Project.toml index 61c5c22d4..5f4b94004 100644 --- a/test/Project.toml +++ b/test/Project.toml @@ -1,6 +1,7 @@ [deps] Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595" BenchmarkTools = "6e4b80f9-dd63-53aa-95a3-0cdb28fa8baf" +Boltz = "4544d5e4-abc5-4dea-817f-29e4c205d9c8" ChainRulesCore = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4" ComponentArrays = "b0b7db55-cfe3-40fc-9ded-d10e2dbeff66" DiffEqFlux = "aae7a2af-3d4f-5e19-a356-7da93b79d9d0" @@ -11,11 +12,11 @@ ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210" Ipopt = "b6b21f68-93f8-5de0-b562-5493be1d77c9" IterTools = "c8e1da08-722c-5040-9ed9-7db0dc04731e" Lux = "b2108857-7c20-44ae-9111-449ecde12c47" -ModelingToolkit = "961ee093-0014-501f-94e3-6117800e7a78" MLUtils = "f1d291b0-491e-4a28-83b9-f70985020b54" +ModelingToolkit = "961ee093-0014-501f-94e3-6117800e7a78" Optim = "429524aa-4258-5aef-a3af-852621145aeb" Optimisers = "3bd65402-5787-11e9-1adc-39752487f4e2" -OrdinaryDiffEq = "1dea7af3-3e70-54e6-95c3-0bf5283fa5ed" +OrdinaryDiffEqTsit5 = "b1df2697-797e-41e3-8120-5422d3b24e4a" Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" ReverseDiff = "37e2e3b7-166d-5795-8a7a-e32c996b4267" @@ -34,9 +35,8 @@ ComponentArrays = ">= 0.13.9" DiffEqFlux = ">= 2" Flux = "0.13, 0.14, 0.15" IterTools = ">= 1.3.0" -Lux = "1.4" +Lux = "1.12.4" Optim = ">= 1.4.1" Optimisers = ">= 0.2.5" -OrdinaryDiffEq = ">= 5" SafeTestsets = ">= 0.0.1" SciMLSensitivity = ">= 7.0.0" diff --git a/test/minibatch.jl b/test/minibatch.jl index 4e0ca6ce8..e58d3b291 100644 --- a/test/minibatch.jl +++ b/test/minibatch.jl @@ -1,4 +1,4 @@ -using Optimization, OrdinaryDiffEq, OptimizationOptimisers, +using Optimization, OrdinaryDiffEqTsit5, OptimizationOptimisers, SciMLSensitivity, Lux, Random, ComponentArrays, MLUtils using Test From 1020ea1b924f01dceafc550349695548ac1bbd51 Mon Sep 17 00:00:00 2001 From: Oscar Smith Date: Tue, 29 Apr 2025 01:31:12 -0400 Subject: [PATCH 2/3] fix Project --- Project.toml | 71 ++++++++++++++++++++++++++++++++++++++++++++++- test/Project.toml | 42 ---------------------------- 2 files changed, 70 insertions(+), 43 deletions(-) delete mode 100644 test/Project.toml diff --git a/Project.toml b/Project.toml index f6ab17377..382ba5267 100644 --- a/Project.toml +++ b/Project.toml @@ -21,18 +21,87 @@ TerminalLoggers = "5d786b92-1e48-4d6f-9151-6b4477ca9bed" [compat] ADTypes = "1.2" +Aqua = "0.8" ArrayInterface = "7.10" +BenchmarkTools = "1" +Boltz = "1" +ComponentArrays = ">= 0.13.9" ConsoleProgressMonitor = "0.1.1" +DiffEqFlux = "2, 3, 4" DocStringExtensions = "0.9" +Enzyme = "0.13" +FiniteDiff = "2" +Flux = "0.13, 0.14, 0.15, 0.16" +ForwardDiff = "0.10, 1" +Ipopt = "1" +IterTools = "1.3" LBFGSB = "0.4.1" LinearAlgebra = "1.10" Logging = "1.10" LoggingExtras = "0.4, 1" +Lux = "1.12.4" +MLUtils = "0.4" +ModelingToolkit = "9" +Optim = ">= 1.4.1" OptimizationBase = "2" +OptimizationMOI = "0.5" +OptimizationOptimJL = "0.4" +OptimizationOptimisers = "0.3" +OrdinaryDiffEqTsit5 = "1" +Pkg = "1" Printf = "1.10" ProgressLogging = "0.1" +Random = "1.10" Reexport = "1.2" +ReverseDiff = "1" +SafeTestsets = "0.1" SciMLBase = "2.39.0" +SciMLSensitivity = "7" SparseArrays = "1.10" +SparseDiffTools = "2" +Symbolics = "6" TerminalLoggers = "0.1" -julia = "1.9" +Test = "1.10" +Tracker = "0.2" +Optimisers = ">= 0.2.5" +Zygote = "0.6, 0.7" +julia = "1.10" + +[extras] +Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595" +BenchmarkTools = "6e4b80f9-dd63-53aa-95a3-0cdb28fa8baf" +Boltz = "4544d5e4-abc5-4dea-817f-29e4c205d9c8" +ComponentArrays = "b0b7db55-cfe3-40fc-9ded-d10e2dbeff66" +DiffEqFlux = "aae7a2af-3d4f-5e19-a356-7da93b79d9d0" +Enzyme = "7da242da-08ed-463a-9acd-ee780be4f1d9" +FiniteDiff = "6a86dc24-6348-571c-b903-95158fe2bd41" +Flux = "587475ba-b771-5e3f-ad9e-33799f191a9c" +ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210" +Ipopt = "b6b21f68-93f8-5de0-b562-5493be1d77c9" +IterTools = "c8e1da08-722c-5040-9ed9-7db0dc04731e" +Lux = "b2108857-7c20-44ae-9111-449ecde12c47" +MLUtils = "f1d291b0-491e-4a28-83b9-f70985020b54" +ModelingToolkit = "961ee093-0014-501f-94e3-6117800e7a78" +Optim = "429524aa-4258-5aef-a3af-852621145aeb" +Optimisers = "3bd65402-5787-11e9-1adc-39752487f4e2" +OptimizationMOI = "fd9f6733-72f4-499f-8506-86b2bdd0dea1" +OptimizationOptimJL = "36348300-93cb-4f02-beb5-3c3902f8871e" +OptimizationOptimisers = "42dfb2eb-d2b4-4451-abcd-913932933ac1" +OrdinaryDiffEqTsit5 = "b1df2697-797e-41e3-8120-5422d3b24e4a" +Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" +Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" +ReverseDiff = "37e2e3b7-166d-5795-8a7a-e32c996b4267" +SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f" +SciMLSensitivity = "1ed8b502-d754-442c-8d5d-10ac956f44a1" +SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" +SparseDiffTools = "47a9eef4-7e08-11e9-0b38-333d64bd3804" +Symbolics = "0c5d862f-8b57-4792-8d23-62f2024744c7" +Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" +Tracker = "9f7883ad-71c0-57eb-9f7f-b5c9e6d3789c" +Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f" + +[targets] +test = ["Aqua", "BenchmarkTools", "Boltz", "ComponentArrays", "DiffEqFlux", "Enzyme", "FiniteDiff", "Flux", "ForwardDiff", + "Ipopt", "IterTools", "Lux", "MLUtils", "ModelingToolkit", "Optim", "OptimizationMOI", "OptimizationOptimJL", "OptimizationOptimisers", + "OrdinaryDiffEqTsit5", "Pkg", "Random", "ReverseDiff", "SafeTestsets", "SciMLSensitivity", "SparseArrays", "SparseDiffTools", + "Symbolics", "Test", "Tracker", "Zygote"] diff --git a/test/Project.toml b/test/Project.toml deleted file mode 100644 index 5f4b94004..000000000 --- a/test/Project.toml +++ /dev/null @@ -1,42 +0,0 @@ -[deps] -Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595" -BenchmarkTools = "6e4b80f9-dd63-53aa-95a3-0cdb28fa8baf" -Boltz = "4544d5e4-abc5-4dea-817f-29e4c205d9c8" -ChainRulesCore = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4" -ComponentArrays = "b0b7db55-cfe3-40fc-9ded-d10e2dbeff66" -DiffEqFlux = "aae7a2af-3d4f-5e19-a356-7da93b79d9d0" -Enzyme = "7da242da-08ed-463a-9acd-ee780be4f1d9" -FiniteDiff = "6a86dc24-6348-571c-b903-95158fe2bd41" -Flux = "587475ba-b771-5e3f-ad9e-33799f191a9c" -ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210" -Ipopt = "b6b21f68-93f8-5de0-b562-5493be1d77c9" -IterTools = "c8e1da08-722c-5040-9ed9-7db0dc04731e" -Lux = "b2108857-7c20-44ae-9111-449ecde12c47" -MLUtils = "f1d291b0-491e-4a28-83b9-f70985020b54" -ModelingToolkit = "961ee093-0014-501f-94e3-6117800e7a78" -Optim = "429524aa-4258-5aef-a3af-852621145aeb" -Optimisers = "3bd65402-5787-11e9-1adc-39752487f4e2" -OrdinaryDiffEqTsit5 = "b1df2697-797e-41e3-8120-5422d3b24e4a" -Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" -Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" -ReverseDiff = "37e2e3b7-166d-5795-8a7a-e32c996b4267" -SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f" -SciMLSensitivity = "1ed8b502-d754-442c-8d5d-10ac956f44a1" -SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" -SparseDiffTools = "47a9eef4-7e08-11e9-0b38-333d64bd3804" -Symbolics = "0c5d862f-8b57-4792-8d23-62f2024744c7" -Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" -Tracker = "9f7883ad-71c0-57eb-9f7f-b5c9e6d3789c" -Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f" - -[compat] -Aqua = "0.8" -ComponentArrays = ">= 0.13.9" -DiffEqFlux = ">= 2" -Flux = "0.13, 0.14, 0.15" -IterTools = ">= 1.3.0" -Lux = "1.12.4" -Optim = ">= 1.4.1" -Optimisers = ">= 0.2.5" -SafeTestsets = ">= 0.0.1" -SciMLSensitivity = ">= 7.0.0" From c406d040328da730b5993e188ac31661fbf89ad1 Mon Sep 17 00:00:00 2001 From: Oscar Smith Date: Tue, 29 Apr 2025 01:34:43 -0400 Subject: [PATCH 3/3] fix tests --- test/diffeqfluxtests.jl | 2 +- test/downstream/Project.toml | 1 - test/downstream/gpu_neural_ode.jl | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/test/diffeqfluxtests.jl b/test/diffeqfluxtests.jl index 4a6a170c0..3fb9274e7 100644 --- a/test/diffeqfluxtests.jl +++ b/test/diffeqfluxtests.jl @@ -1,4 +1,4 @@ -using OrdinaryDiffEq, DiffEqFlux, Lux, Optimization, OptimizationOptimJL, +using OrdinaryDiffEqTsit5, DiffEqFlux, Lux, Optimization, OptimizationOptimJL, OptimizationOptimisers, ForwardDiff, ComponentArrays, Random rng = Random.default_rng() Random.seed!(123) diff --git a/test/downstream/Project.toml b/test/downstream/Project.toml index c42e38df8..069e022ae 100644 --- a/test/downstream/Project.toml +++ b/test/downstream/Project.toml @@ -1,4 +1,3 @@ [deps] CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba" DiffEqFlux = "aae7a2af-3d4f-5e19-a356-7da93b79d9d0" -OrdinaryDiffEq = "1dea7af3-3e70-54e6-95c3-0bf5283fa5ed" diff --git a/test/downstream/gpu_neural_ode.jl b/test/downstream/gpu_neural_ode.jl index 8e67b1549..9c2ab5993 100644 --- a/test/downstream/gpu_neural_ode.jl +++ b/test/downstream/gpu_neural_ode.jl @@ -1,4 +1,4 @@ -using DiffEqFlux, OrdinaryDiffEq, Flux, CUDA +using DiffEqFlux, OrdinaryDiffEqTsit5, Flux, CUDA CUDA.allowscalar(false) # Makes sure no slow operations are occurring # Generate Data