Skip to content

Commit e484df1

Browse files
ThummeTo0815CreeperTobias Thummerer
authored
v0.14.0 (#158)
* updated tests * updated version identifiers * pluto notebook check * action version bumps and fixes (#160) * Update TestLatest.yml dependabots "Bump codecov/codecov-action from 4 to 5" * fix PkgEval Xvfb error * added julia caching * Added Julia-caching to eval --------- Co-authored-by: Simon Exner <[email protected]> * relaxed deps * Flux update, prepare for (optional) Lux * PlotsExt, new Scheduler * WIP * WIP * repaired save/load * roundtolength for Inf * snapshot corrections * reenabled try/catch in train * exception catch fix * keyword for assertion length * fixed scheduler default values, Unions in hasmethod * debug messages * support for fmibase 1.2 * fixed project version * added termination statement * added autoCI_managing (#161) * layers updated * fine grained callback control * removed solution saving * new losses fix * snapshot fix * adding comments * rm printing * ... * fixing snapshot system * fixing snapshots * fixing snaphsots * ... * fixing snapshots * error message enhanced * scheduler fix * callbak order * .. * fixing test FD * fixing tests, notebooks * formatter * reenabled tests * support for Julia 1.12 * fixing batching test --------- Co-authored-by: Simon Exner <[email protected]> Co-authored-by: Simon Exner <[email protected]> Co-authored-by: Tobias Thummerer <[email protected]>
1 parent 9ddca85 commit e484df1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+4522
-2324
lines changed

‎.github/workflows/Eval.yml‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ jobs:
1818
julia-arch: [x64]
1919

2020
steps:
21+
# Required by PkgEval.jl as xvfb runs into issues with ubuntu 24. See ci.yml workflow of PkgEval.jl repo
22+
- name: "Allow unprivileged user namespaces"
23+
run: sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0
24+
2125
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
2226
- name: Check out repository
2327
uses: actions/checkout@v4
@@ -30,7 +34,11 @@ jobs:
3034
arch: ${{ matrix.julia-arch }}
3135
id: version
3236

33-
# Set up cache
37+
# Set up julia-cache
38+
- name: Set up julia-cache
39+
uses: julia-actions/cache@v2
40+
41+
# Set up cache
3442
- name: "Set up cache"
3543
uses: actions/cache@v4
3644
env:

‎.github/workflows/Formatter.yml‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎.github/workflows/TestLTS.yml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Test v1.6 (LTS)
1+
name: Test (LTS)
22

33
on:
44
workflow_dispatch:
@@ -18,7 +18,7 @@ jobs:
1818
strategy:
1919
fail-fast: false
2020
matrix:
21-
julia-version: ['1.6']
21+
julia-version: ['lts']
2222
julia-arch: [x64]
2323
os: [ubuntu-latest, windows-latest]
2424
experimental: [false]
@@ -35,6 +35,10 @@ jobs:
3535
version: ${{ matrix.julia-version }}
3636
arch: ${{ matrix.julia-arch }}
3737

38+
# Set up julia-cache
39+
- name: Set up julia-cache
40+
uses: julia-actions/cache@v2
41+
3842
# Set up cache
3943
- name: "Set up cache"
4044
uses: actions/cache@v4

‎.github/workflows/TestLatest.yml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@ jobs:
3535
version: ${{ matrix.julia-version }}
3636
arch: ${{ matrix.julia-arch }}
3737

38+
# Set up julia-cache
39+
- name: Set up julia-cache
40+
uses: julia-actions/cache@v2
41+
3842
# Set up cache
3943
- name: "Set up cache"
4044
uses: actions/cache@v4
@@ -62,8 +66,8 @@ jobs:
6266

6367
# Run codecov
6468
- name: "Run CodeCov"
65-
uses: codecov/codecov-action@v4
69+
uses: codecov/codecov-action@v5
6670
env:
6771
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
6872
with:
69-
file: lcov.info
73+
files: lcov.info

‎.github/workflows/auxme_manage_JuliaCIWorkflows.yml‎

Lines changed: 280 additions & 0 deletions
Large diffs are not rendered by default.

‎Project.toml‎

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,46 @@
11
name = "FMIFlux"
22
uuid = "fabad875-0d53-4e47-9446-963b74cae21f"
3-
version = "0.13.0"
3+
version = "0.14.0"
44

55
[deps]
66
Colors = "5ae59095-9a9b-59fe-a467-6f913c188581"
77
DifferentiableEigen = "73a20539-4e65-4dcb-a56d-dc20f210a01b"
88
FMIImport = "9fcbc62e-52a0-44e9-a616-1359a0008194"
99
FMISensitivity = "3e748fe5-cd7f-4615-8419-3159287187d2"
10-
Flux = "587475ba-b771-5e3f-ad9e-33799f191a9c"
1110
Optim = "429524aa-4258-5aef-a3af-852621145aeb"
1211
OrdinaryDiffEq = "1dea7af3-3e70-54e6-95c3-0bf5283fa5ed"
1312
Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
1413
Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
14+
StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
1515
ThreadPools = "b189fb0b-2eb5-4ed4-bc0c-d34c51242431"
1616

1717
[weakdeps]
18+
Flux = "587475ba-b771-5e3f-ad9e-33799f191a9c"
1819
JLD2 = "033835bb-8acc-5ee8-8aae-3f567f8a3819"
20+
Lux = "b2108857-7c20-44ae-9111-449ecde12c47"
21+
Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
1922

2023
[extensions]
24+
FluxExt = ["Flux"]
2125
JLD2Ext = ["JLD2"]
26+
LuxExt = ["Lux"]
27+
PlotsExt = ["Plots"]
2228

2329
[compat]
24-
Colors = "0.12"
30+
Colors = "0.12, 0.13"
2531
DifferentiableEigen = "0.2.0"
26-
FMIImport = "1.0.6"
27-
FMISensitivity = "0.2.0"
28-
Flux = "0.9 - 0.14"
32+
FMIImport = "1.1.0"
33+
FMISensitivity = "0.3.0"
34+
Flux = "0.9 - 0.16"
2935
Optim = "1.6"
3036
OrdinaryDiffEq = "6.0"
31-
Statistics = "1"
37+
Statistics = "1.10"
38+
StatsBase = "0.34"
3239
ThreadPools = "2.1"
33-
julia = "1.6"
40+
julia = "1.10"
41+
42+
[extras]
43+
Flux = "587475ba-b771-5e3f-ad9e-33799f191a9c"
44+
JLD2 = "033835bb-8acc-5ee8-8aae-3f567f8a3819"
45+
Lux = "b2108857-7c20-44ae-9111-449ecde12c47"
46+
Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"

‎examples/jupyter-src/.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
.ipynb_checkpoints/
22
params/
33
*.png
4-
./*.gif
4+
*.gif

‎examples/jupyter-src/juliacon_2023_helpers.jl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,9 @@ function plotEnhancements(
7373

7474
# Finite differences for acceleration
7575
dt = data.consumption_t[2] - data.consumption_t[1]
76-
acceleration_val = (data.speed_val[2:end] - data.speed_val[1:end-1]) / dt
76+
acceleration_val = (data.speed_val[2:end] - data.speed_val[1:(end-1)]) / dt
7777
acceleration_val = [acceleration_val..., 0.0]
78-
acceleration_dev = (data.speed_dev[2:end] - data.speed_dev[1:end-1]) / dt
78+
acceleration_dev = (data.speed_dev[2:end] - data.speed_dev[1:(end-1)]) / dt
7979
acceleration_dev = [acceleration_dev..., 0.0]
8080

8181
ANNInputs = getValue(resultNFMU, :derivatives) # collect([0.0, 0.0, 0.0, data.speed_val[i], acceleration_val[i], data.consumption_val[i]] for i in 1:length(data.consumption_t))
@@ -244,7 +244,7 @@ function plotCumulativeConsumption(
244244
)
245245

246246
len = length(data.consumption_t)
247-
steps = (1+round(Int, range[1] * len)):(round(Int, range[end] * len))
247+
steps = (1+round(Int, range[1]*len)):(round(Int, range[end]*len))
248248

249249
t = data.consumption_t
250250
nfmu_val = getState(solutionNFMU, 6; isIndex = true)

‎examples/pluto-src/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* backup *.jl

0 commit comments

Comments
 (0)