fix: dependencies

SciML · Oct 13, 2024 · 7055632 · 7055632
1 parent 7c7cde8
commit 7055632
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 55 deletions.
diff --git a/Project.toml b/Project.toml
@@ -23,8 +23,8 @@ Lux = "b2108857-7c20-44ae-9111-449ecde12c47"
 MCMCChains = "c7f686f2-ff18-58e9-bc7b-31028e88f75d"
 ModelingToolkit = "961ee093-0014-501f-94e3-6117800e7a78"
 MonteCarloMeasurements = "0987c9cc-fe09-11e8-30f0-b96dd679fdca"
-Optim = "429524aa-4258-5aef-a3af-852621145aeb"
 Optimization = "7f7a1694-90dd-40f0-9382-eb1efda571ba"
+OptimizationOptimJL = "36348300-93cb-4f02-beb5-3c3902f8871e"
 OptimizationOptimisers = "42dfb2eb-d2b4-4451-abcd-913932933ac1"
 QuasiMonteCarlo = "8a4e6c94-4038-4cdc-81c3-7e6ffdb2a71b"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
@@ -65,9 +65,8 @@ MCMCChains = "6"
 MethodOfLines = "0.11"
 ModelingToolkit = "9.9"
 MonteCarloMeasurements = "1.1"
-Optim = "1.7.8"
 Optimization = "4"
-OptimizationOptimJL = "0.2.1"
+OptimizationOptimJL = "0.4"
 OptimizationOptimisers = "0.3"
 OrdinaryDiffEq = "6.87"
 Pkg = "1.10"
@@ -95,12 +94,11 @@ LuxCUDA = "d0bbae9a-e099-4d5b-a835-1c6931763bda"
 LuxCore = "bb33d45b-7691-41d6-9220-0943567d0623"
 LuxLib = "82251201-b29d-42c6-8e01-566dec8acb11"
 MethodOfLines = "94925ecb-adb7-4558-8ed8-f975c56a0bf4"
-OptimizationOptimJL = "36348300-93cb-4f02-beb5-3c3902f8871e"
 OrdinaryDiffEq = "1dea7af3-3e70-54e6-95c3-0bf5283fa5ed"
 Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
 Preferences = "21216c6a-2e73-6563-6e65-726566657250"
 SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [targets]
-test = ["Aqua", "CUDA", "Flux", "LineSearches", "LuxCUDA", "LuxCore", "LuxLib", "MethodOfLines", "OptimizationOptimJL", "OrdinaryDiffEq", "Pkg", "Preferences", "SafeTestsets", "Test"]
+test = ["Aqua", "CUDA", "Flux", "LineSearches", "LuxCUDA", "LuxCore", "LuxLib", "MethodOfLines", "OrdinaryDiffEq", "Pkg", "Preferences", "SafeTestsets", "Test"]
diff --git a/src/NeuralPDE.jl b/src/NeuralPDE.jl
@@ -11,14 +11,14 @@ using Reexport, Statistics
 using Zygote, ForwardDiff, Random, Distributions
 using Adapt, DiffEqNoiseProcess
 using Optimization
-using OptimizationOptimisers
+using OptimizationOptimisers, OptimizationOptimJL
 using Integrals, Cubature
 using QuasiMonteCarlo: LatinHypercubeSample
 import QuasiMonteCarlo
 using RuntimeGeneratedFunctions
 using Statistics
 using ArrayInterface
-import Optim
+
 using Symbolics: wrap, unwrap, arguments, operation
 using SymbolicUtils
 using AdvancedHMC, LogDensityProblems, LinearAlgebra, Functors, MCMCChains

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -20,64 +20,43 @@ end
 
 @time begin
     if GROUP == "All" || GROUP == "QA"
-        @time @safetestset "Quality Assurance" begin
-            include("qa.jl")
-        end
+        @time @safetestset "Quality Assurance" include("qa.jl")
     end
+
     if GROUP == "All" || GROUP == "ODEBPINN"
-        @time @safetestset "Bpinn ODE solver" begin
-            include("BPINN_Tests.jl")
-        end
+        @time @safetestset "Bpinn ODE solver" include("BPINN_Tests.jl")
     end
 
     if GROUP == "All" || GROUP == "PDEBPINN"
-        @time @safetestset "Bpinn PDE solver" begin
-            include("BPINN_PDE_tests.jl")
-        end
-        @time @safetestset "Bpinn PDE invaddloss solver" begin
-            include("BPINN_PDEinvsol_tests.jl")
-        end
+        @time @safetestset "Bpinn PDE solver" include("BPINN_PDE_tests.jl")
+        @time @safetestset "Bpinn PDE invaddloss solver" include("BPINN_PDEinvsol_tests.jl")
     end
 
     if GROUP == "All" || GROUP == "NNPDE1"
-        @time @safetestset "NNPDE" begin
-            include("NNPDE_tests.jl")
-        end
+        @time @safetestset "NNPDE" include("NNPDE_tests.jl")
     end
+
     if GROUP == "All" || GROUP == "NNODE"
-        @time @safetestset "NNODE" begin
-            include("NNODE_tests.jl")
-        end
-        @time @safetestset "NNODE_tstops" begin
-            include("NNODE_tstops_test.jl")
-        end
-        @time @safetestset "NNDAE" begin
-            include("NNDAE_tests.jl")
-        end
+        @time @safetestset "NNODE" include("NNODE_tests.jl")
+        @time @safetestset "NNODE_tstops" include("NNODE_tstops_test.jl")
+        @time @safetestset "NNDAE" include("NNDAE_tests.jl")
     end
 
     if GROUP == "All" || GROUP == "NNPDE2"
-        @time @safetestset "Additional Loss" begin
-            include("additional_loss_tests.jl")
-        end
-        @time @safetestset "Direction Function Approximation" begin
-            include("direct_function_tests.jl")
-        end
+        @time @safetestset "Additional Loss" include("additional_loss_tests.jl")
+        @time @safetestset "Direction Function Approximation" include("direct_function_tests.jl")
     end
+
     if GROUP == "All" || GROUP == "NeuralAdapter"
-        @time @safetestset "NeuralAdapter" begin
-            include("neural_adapter_tests.jl")
-        end
+        @time @safetestset "NeuralAdapter" include("neural_adapter_tests.jl")
     end
+
     if GROUP == "All" || GROUP == "IntegroDiff"
-        @time @safetestset "IntegroDiff" begin
-            include("IDE_tests.jl")
-        end
+        @time @safetestset "IntegroDiff" include("IDE_tests.jl")
     end
+
     if GROUP == "All" || GROUP == "AdaptiveLoss"
-        @time @safetestset "AdaptiveLoss" begin
-            include("adaptive_loss_tests.jl")
-        end
+        @time @safetestset "AdaptiveLoss" include("adaptive_loss_tests.jl")
     end
 
     #=
@@ -88,24 +67,20 @@ end
     =#
 
     if GROUP == "All" || GROUP == "Forward"
-        @time @safetestset "Forward" begin
-            include("forward_tests.jl")
-        end
+        @time @safetestset "Forward" include("forward_tests.jl")
     end
+
     if GROUP == "All" || GROUP == "Logging"
         dev_subpkg("NeuralPDELogging")
         subpkg_path = joinpath(dirname(@__DIR__), "lib", "NeuralPDELogging")
         Pkg.test(PackageSpec(name = "NeuralPDELogging", path = subpkg_path))
     end
+
     if !is_APPVEYOR && GROUP == "GPU"
-        @safetestset "NNPDE_gpu_Lux" begin
-            include("NNPDE_tests_gpu_Lux.jl")
-        end
+        @safetestset "NNPDE_gpu_Lux" include("NNPDE_tests_gpu_Lux.jl")
     end
 
     if GROUP == "All" || GROUP == "DGM"
-        @time @safetestset "Deep Galerkin solver" begin
-            include("dgm_test.jl")
-        end
+        @time @safetestset "Deep Galerkin solver" include("dgm_test.jl")
     end
 end