Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "GeometricMachineLearning"
uuid = "194d25b2-d3f5-49f0-af24-c124f4aa80cc"
authors = ["Michael Kraus <michael.kraus@ipp.mpg.de>"]
version = "0.4.6"
authors = ["Michael Kraus <michael.kraus@ipp.mpg.de>"]

[deps]
AbstractNeuralNetworks = "60874f82-5ada-4c70-bd1c-fa6be7711c8a"
Expand Down Expand Up @@ -29,7 +29,6 @@ StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
SymbolicNeuralNetworks = "aed23131-dcd0-47ca-8090-d21e605652e3"
Symbolics = "0c5d862f-8b57-4792-8d23-62f2024744c7"
TimerOutputs = "a759f4b9-e2f1-59dc-863e-4aeb61b1ea8f"
UpdateJulia = "770da0de-323d-4d28-9202-0e205c1e0aff"
Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f"
ZygoteRules = "700de1a5-db45-46bc-99cf-38207098b444"

Expand All @@ -54,7 +53,6 @@ StatsBase = "0.33, 0.34"
SymbolicNeuralNetworks = "0.3"
Symbolics = "6.22"
TimerOutputs = "0.5"
UpdateJulia = "0.4"
Zygote = "0.6"
ZygoteRules = "0.2.7"
julia = "1.8"
Expand Down
28 changes: 14 additions & 14 deletions src/GeometricMachineLearning.jl
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ module GeometricMachineLearning
using ChainRulesCore
using Distances
using GeometricBase
using GeometricSolutions: GeometricSolution, EnsembleSolution, DataSeries, StateVariable
using GeometricSolutions: GeometricSolution, EnsembleSolution, DataSeries, StateVariable, TimeSeries
Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also importing TimeSeries now.

using GeometricEquations: EnsembleProblem, ODEProblem, HODEProblem, ODEEnsemble, HODEEnsemble
using KernelAbstractions
using LinearAlgebra
Expand Down Expand Up @@ -46,7 +46,7 @@ module GeometricMachineLearning
export initialparameters
export parameterlength
export NeuralNetworkParameters

export σ, sigmoid, softmax

# from GeometricBase to print docs
Expand Down Expand Up @@ -106,7 +106,7 @@ module GeometricMachineLearning

# this defines empty retraction type structs (doesn't rely on anything)
include("optimizers/manifold_related/retraction_types.jl")

export MatrixSoftmax, VectorSoftmax
include("activations/softmax.jl")

Expand All @@ -115,7 +115,7 @@ module GeometricMachineLearning

# + operation has been overloaded to work with NamedTuples!
export _add, apply_toNT, split_and_flatten, add!

# GPU specific operations
export convert_to_dev, Device, CPUDevice

Expand All @@ -139,7 +139,7 @@ module GeometricMachineLearning
include("optimizers/optimizer_caches.jl")
include("optimizers/optimizer.jl")
include("optimizers/gradient_optimizer.jl")
include("optimizers/momentum_optimizer.jl")
include("optimizers/momentum_optimizer.jl")
include("optimizers/adam_optimizer.jl")
include("optimizers/adam_optimizer_with_learning_rate_decay.jl")
include("optimizers/bfgs_cache.jl")
Expand Down Expand Up @@ -202,11 +202,11 @@ module GeometricMachineLearning
export AbstractTrainingMethod

export loss_single #, loss

export HnnTrainingMethod
export LnnTrainingMethod
export SympNetTrainingMethod

include("training_method/abstract_training_method.jl")

# INCLUDE DATA TRAINING STRUCTURE
Expand All @@ -227,8 +227,8 @@ module GeometricMachineLearning
export TrainingMethod
export symbol, shape
export min_length_batch


include("training_method/training_method.jl")

# INCLUDE DATA TRAINING STRUCTURE
Expand All @@ -237,11 +237,11 @@ module GeometricMachineLearning
export shape, symbols, dim, noisemaker, data_symbols # , problem
export reduce_symbols, reshape_intoSampledData
export aresame

include("data/data_training.jl")

export get_batch, complete_batch_size, check_batch_size

include("data/batch.jl")

# INCLUDE BACKENDS
Expand Down Expand Up @@ -329,7 +329,7 @@ module GeometricMachineLearning
export NeuralNetSolution
export problem, timestep, history, size_history
export set_sizemax_history

include("nnsolution/neural_net_solution.jl")

export EnsembleNeuralNetSolution
Expand Down Expand Up @@ -386,7 +386,7 @@ module GeometricMachineLearning
include("training_method/sympnet_basic_method.jl")

export default_method

include("training/default_method.jl")


Expand All @@ -409,4 +409,4 @@ module GeometricMachineLearning
export SymplecticTransformer

include("map_to_cpu.jl")
end
end
Loading
Loading