Merge pull request #181 from JuliaGNI/remove-gi

Removed geometric integrators from dependencies.
JuliaGNI · Dec 12, 2024 · cde4d3f · cde4d3f
2 parents 329b083 + e75cdca
commit cde4d3f
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 118 deletions.
diff --git a/Project.toml b/Project.toml
@@ -13,7 +13,6 @@ Distances = "b4f34e82-e78d-54a5-968a-f98e89d6e8f7"
 ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
 GeometricBase = "9a0b12b7-583b-4f04-aa1f-d8551b6addc9"
 GeometricEquations = "c85262ba-a08a-430a-b926-d29770767bf2"
-GeometricIntegrators = "dcce2d33-59f6-5b8d-9047-0defad88ae06"
 GeometricSolutions = "7843afe4-64f4-4df4-9231-049495c56661"
 HDF5 = "f67ccb44-e63f-5c2f-98bd-6dc0ccc4ba2f"
 InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
@@ -41,7 +40,7 @@ Distances = "0.10"
 ForwardDiff = "0.10"
 GeometricBase = "0.10"
 GeometricEquations = "0.18"
-GeometricIntegrators = "0.14"
+GeometricIntegrators = "0.14.2"
 GeometricSolutions = "0.3.24"
 HDF5 = "0.16, 0.17"
 KernelAbstractions = "0.9"
@@ -66,6 +65,7 @@ Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 RungeKutta = "fb486d5c-30a0-4a8a-8415-a8b4ace5a6f7"
 SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+GeometricIntegrators = "dcce2d33-59f6-5b8d-9047-0defad88ae06"
 
 [targets]
-test = ["Documenter", "ChainRulesTestUtils", "Random", "SafeTestsets", "Test", "GeometricProblems", "FiniteDifferences"]
+test = ["Documenter", "ChainRulesTestUtils", "Random", "SafeTestsets", "Test", "GeometricProblems", "FiniteDifferences", "GeometricIntegrators"]
diff --git a/src/GeometricMachineLearning.jl b/src/GeometricMachineLearning.jl
@@ -5,9 +5,8 @@ module GeometricMachineLearning
     using ChainRulesCore
     using Distances
     using GeometricBase
-    using GeometricIntegrators
     using GeometricSolutions: GeometricSolution, EnsembleSolution, DataSeries, StateVariable
-    using GeometricEquations: ODEProblem, HODEProblem, ODEEnsemble, HODEEnsemble
+    using GeometricEquations: EnsembleProblem, ODEProblem, HODEProblem, ODEEnsemble, HODEEnsemble
     using KernelAbstractions
     using LinearAlgebra
     using NNlib
@@ -32,7 +31,6 @@ module GeometricMachineLearning
     import AbstractNeuralNetworks: AbstractPullback, NetworkLoss, _compute_loss
     # export params, architetcure, model
     export dim
-    import GeometricIntegrators.Integrators: method, GeometricIntegrator
     import NNlib: σ, sigmoid, softmax
     import Base: iterate, eltype
     #import LogExpFunctions: softmax
@@ -386,25 +384,6 @@ module GeometricMachineLearning
     export matching
     include("training/matching.jl")
 
-
-    # INCLUDE PROBLEMS
-    export HNNProblem, LNNProblem
-
-    include("integrator/problem_hnn.jl")
-    include("integrator/problem_lnn.jl")
-
-    # INCLUDE INTEGRATOR 
-    export NeuralNetMethod
-    export method
-
-    include("integrator/abstract_neural_net_method.jl")
-
-    # INCLUDE INTEGRATION METHOD
-    export  SympNetMethod
-    export integrate, integrate_step!
-
-    include("integrator/sympnet_integrator.jl")
-
     include("reduced_system/reduced_system.jl")
 
     export HRedSys, reduction_error, projection_error, integrate_reduced_system, integrate_full_system

diff --git a/src/integrator/abstract_neural_net_method.jl b/src/integrator/abstract_neural_net_method.jl
diff --git a/src/integrator/problem_hnn.jl b/src/integrator/problem_hnn.jl
diff --git a/src/integrator/problem_lnn.jl b/src/integrator/problem_lnn.jl
diff --git a/src/integrator/sympnet_integrator.jl b/src/integrator/sympnet_integrator.jl
diff --git a/test/runtests.jl b/test/runtests.jl
@@ -55,10 +55,6 @@ using Documenter: doctest
 @safetestset "Batch                                                                           " begin include("data/test_batch.jl") end
 @safetestset "Method                                                                          " begin include("train!/test_method.jl") end
 @safetestset "Matching                                                                        " begin include("data/test_matching.jl") end
-# @safetestset "TrainingSet                                                                     " begin include("train!/test_trainingSet.jl") end
-# @safetestset "Training                                                                        " begin include("train!/test_training.jl") end
-@safetestset "NeuralNetSolution                                                               " begin include("train!/test_neuralnet_solution.jl") end
-# @safetestset "Problem & Integrators                                                           " begin include("integrator/test_integrator.jl") end
 
 @safetestset "Test data loader for q and p data                                               " begin include("data_loader/batch_data_loader_qp_test.jl") end
 @safetestset "Test mnist_utils.                                                               " begin include("data_loader/mnist_utils.jl") end