Skip to content

Commit e557ece

Browse files
authored
V0.11.0 1 (#107)
* reactive tests * adjustments for FMISensitivity.jl * adjustments for FMISensitivity.jl * adjustments for FMISensitivity.jl * modifications for FMICore 0.19.0 * updated project * rm DiffEqCallbacks * rm DiffEqCallbacks * rm FMI dependency in tests * updated tests * optimized tests * optimized tests * corrected fmu_params example * fixed test * minor fix * changed tests order * fixed examples * started example refactoring * updated examples * modified examples * updated examples * fixed examples issues
1 parent bb2f11f commit e557ece

35 files changed

+1644
-1380
lines changed

.github/workflows/Example.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ jobs:
1919
fail-fast: false
2020
matrix:
2121
os: [windows-latest] # , ubuntu-latest]
22-
file-name: [advanced_hybrid_ME, modelica_conference_2021, simple_hybrid_CS, simple_hybrid_ME, mdpi_2022, juliacon_2023]
23-
julia-version: ['1.8']
22+
file-name: [growing_horizon_ME, modelica_conference_2021, simple_hybrid_CS, simple_hybrid_ME, mdpi_2022, juliacon_2023]
23+
julia-version: ['1.9']
2424
julia-arch: [x64]
2525
experimental: [false]
2626

@@ -44,7 +44,7 @@ jobs:
4444
env:
4545
FILE: examples/src/${{ matrix.file-name }}.ipynb
4646
run: |
47-
jupyter nbconvert --ExecutePreprocessor.kernel_name="julia-1.8" --to notebook --inplace --execute ${{ env.FILE }}
47+
jupyter nbconvert --ExecutePreprocessor.kernel_name="julia-1.9" --to notebook --inplace --execute ${{ env.FILE }}
4848
jupyter nbconvert --to script ${{ env.FILE }}
4949
jupyter nbconvert --to markdown ${{ env.FILE }}
5050

Project.toml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
name = "FMIFlux"
22
uuid = "fabad875-0d53-4e47-9446-963b74cae21f"
3-
version = "0.10.6"
3+
version = "0.11.0"
44

55
[deps]
66
Colors = "5ae59095-9a9b-59fe-a467-6f913c188581"
7-
DiffEqCallbacks = "459566f4-90b8-5000-8ac3-15dfb0a30def"
87
DifferentiableEigen = "73a20539-4e65-4dcb-a56d-dc20f210a01b"
98
DifferentialEquations = "0c46a032-eb83-5123-abaf-570d42b7fbaa"
109
FMIImport = "9fcbc62e-52a0-44e9-a616-1359a0008194"
10+
FMISensitivity = "3e748fe5-cd7f-4615-8419-3159287187d2"
1111
Flux = "587475ba-b771-5e3f-ad9e-33799f191a9c"
1212
Optim = "429524aa-4258-5aef-a3af-852621145aeb"
1313
Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
@@ -18,13 +18,13 @@ ThreadPools = "b189fb0b-2eb5-4ed4-bc0c-d34c51242431"
1818

1919
[compat]
2020
Colors = "0.12.8"
21-
DiffEqCallbacks = "2.26.0"
2221
DifferentiableEigen = "0.2.0"
23-
DifferentialEquations = "7.8.0"
24-
FMIImport = "0.15.8"
25-
Flux = "0.13, 0.14"
22+
DifferentialEquations = "7.10.0 - 7.11"
23+
FMIImport = "0.16.2"
24+
FMISensitivity = "0.1.2"
25+
Flux = "0.13.0 - 0.14"
2626
Optim = "1.7.0"
27-
ProgressMeter = "1.7.0"
27+
ProgressMeter = "1.7.0 - 1.9"
2828
Requires = "1.3.0"
2929
ThreadPools = "2.1.1"
3030
julia = "1.6"

README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,12 @@ You can evaluate FMUs inside of your loss function.
4141
- building and training NeuralFMUs consisiting of multiple FMUs
4242
- building and training FMUINNs (PINNs)
4343
- different AD-frameworks: ForwardDiff.jl (CI-tested), ReverseDiff.jl (CI-tested, default setting), FiniteDiff.jl (not CI-tested) and Zygote.jl (not CI-tested)
44+
- use `Flux.jl` optimisers as well as the ones from `Optim.jl`
4445
- ...
4546

4647
## What is under development in FMIFlux.jl?
4748
- performance optimizations
49+
- multi threaded CPU training
4850
- improved documentation
4951
- more examples
5052
- FMI3 integration
@@ -62,6 +64,7 @@ To keep dependencies nice and clean, the original package [*FMI.jl*](https://git
6264
- [*FMIImport.jl*](https://github.com/ThummeTo/FMIImport.jl): Importing FMUs into Julia
6365
- [*FMIExport.jl*](https://github.com/ThummeTo/FMIExport.jl): Exporting stand-alone FMUs from Julia Code
6466
- [*FMICore.jl*](https://github.com/ThummeTo/FMICore.jl): C-code wrapper for the FMI-standard
67+
- [*FMISensitivity.jl*](https://github.com/ThummeTo/FMISensitivity.jl): Static and dynamic sensitivities over FMUs
6568
- [*FMIBuild.jl*](https://github.com/ThummeTo/FMIBuild.jl): Compiler/Compilation dependencies for FMIExport.jl
6669
- [*FMIFlux.jl*](https://github.com/ThummeTo/FMIFlux.jl): Machine Learning with FMUs (differentiation over FMUs)
6770
- [*FMIZoo.jl*](https://github.com/ThummeTo/FMIZoo.jl): A collection of testing and example FMUs

docs/make.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ makedocs(sitename="FMIFlux.jl",
2020
"Overview" => "examples/overview.md"
2121
"Simple CS-NeuralFMU" => "examples/simple_hybrid_CS.md"
2222
"Simple ME-NeuralFMU" => "examples/simple_hybrid_ME.md"
23-
"Advanced ME-NeuralFMU" => "examples/advanced_hybrid_ME.md"
23+
"Growing Horizon ME-NeuralFMU" => "examples/growing_horizon_ME.md"
2424
"JuliaCon 2023" => "examples/juliacon_2023.md"
2525
"MDPI 2022" => "examples/mdpi_2022.md"
2626
"Modelica Conference 2021" => "examples/modelica_conference_2021.md"

docs/src/examples/overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ The examples show how to combine FMUs with machine learning ("NeuralFMU") and il
1010
## Examples
1111
- [__Simple CS-NeuralFMU__](https://thummeto.github.io/FMIFlux.jl/dev/examples/simple_hybrid_CS/): Showing how to train a NeuralFMU in Co-Simulation-Mode.
1212
- [__Simple ME-NeuralFMU__](https://thummeto.github.io/FMIFlux.jl/dev/examples/simple_hybrid_ME/): Showing how to train a NeuralFMU in Model-Exchange-Mode.
13-
- [__Advanced ME-NeuralFMU__](https://thummeto.github.io/FMIFlux.jl/dev/examples/advanced_hybrid_ME/): Advanced training techniques for a ME-NeuralFMU.
13+
- [__Growing Horizon ME-NeuralFMU__](https://thummeto.github.io/FMIFlux.jl/dev/examples/growing_horizon_ME/): Growing horizon training technique for a ME-NeuralFMU.
1414

1515
## Advanced examples: Demo applications
1616
- [__JuliaCon 2023: Using NeuralODEs in real life applications__](https://thummeto.github.io/FMIFlux.jl/dev/examples/juliacon_2023/): An example for a NeuralODE in a real world engineering scenario.

0 commit comments

Comments
 (0)