From 2245f924bea269f45d63125b048f25ac936e6067 Mon Sep 17 00:00:00 2001 From: Simon Exner <43469235+0815Creeper@users.noreply.github.com> Date: Mon, 30 Sep 2024 14:24:15 +0200 Subject: [PATCH 1/5] fix for svgs --- .github/workflows/Example.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/Example.yml b/.github/workflows/Example.yml index ae19d78d..3d99b893 100644 --- a/.github/workflows/Example.yml +++ b/.github/workflows/Example.yml @@ -41,10 +41,17 @@ jobs: run: pip install jupyter nbconvert - name: "Execute notebook" + env: + FILE: examples/jupyter-src/${{ matrix.file-name }}.ipynb + run: jupyter nbconvert --ExecutePreprocessor.kernel_name="julia-${{ matrix.julia-version }}" --to notebook --inplace --execute ${{ env.FILE }} + + - name: "Fix SVGs" + run: julia -e 'using Pkg; Pkg.add("JSON"); using JSON; data = JSON.parsefile("examples/jupyter-src/${{ matrix.file-name }}.ipynb"); function search_and_remove!(json, tag, content=""); if typeof(json) == Vector{Any}; for e in json; search_and_remove!(e, tag, content); end; elseif typeof(json) == Dict{String, Any}; for (t, c) in json; if contains(t, tag) && (content == "" || any([contains(line, content) for line in c])); pop!(json, t); else; search_and_remove!(c, tag, content); end; end; end; end; search_and_remove!(data, "text/html", " Date: Tue, 1 Oct 2024 10:43:31 +0200 Subject: [PATCH 2/5] fixes for action to prevent windows IO Errors --- .github/workflows/Example.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Example.yml b/.github/workflows/Example.yml index 3d99b893..16d7fe42 100644 --- a/.github/workflows/Example.yml +++ b/.github/workflows/Example.yml @@ -46,7 +46,7 @@ jobs: run: jupyter nbconvert --ExecutePreprocessor.kernel_name="julia-${{ matrix.julia-version }}" --to notebook --inplace --execute ${{ env.FILE }} - name: "Fix SVGs" - run: julia -e 'using Pkg; Pkg.add("JSON"); using JSON; data = JSON.parsefile("examples/jupyter-src/${{ matrix.file-name }}.ipynb"); function search_and_remove!(json, tag, content=""); if typeof(json) == Vector{Any}; for e in json; search_and_remove!(e, tag, content); end; elseif typeof(json) == Dict{String, Any}; for (t, c) in json; if contains(t, tag) && (content == "" || any([contains(line, content) for line in c])); pop!(json, t); else; search_and_remove!(c, tag, content); end; end; end; end; search_and_remove!(data, "text/html", " Date: Tue, 1 Oct 2024 15:20:29 +0200 Subject: [PATCH 3/5] comments in example.yml --- .github/workflows/Example.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/Example.yml b/.github/workflows/Example.yml index 16d7fe42..a4af026c 100644 --- a/.github/workflows/Example.yml +++ b/.github/workflows/Example.yml @@ -45,7 +45,7 @@ jobs: FILE: examples/jupyter-src/${{ matrix.file-name }}.ipynb run: jupyter nbconvert --ExecutePreprocessor.kernel_name="julia-${{ matrix.julia-version }}" --to notebook --inplace --execute ${{ env.FILE }} - - name: "Fix SVGs" + - name: "Fix SVGs" # on notebook (json) level: removes all cells, that have the tag "text/html" AND have " Date: Tue, 1 Oct 2024 15:24:10 +0200 Subject: [PATCH 4/5] Typo fixes --- docs/src/examples/overview.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/src/examples/overview.md b/docs/src/examples/overview.md index a0a6b8b5..0a769f75 100644 --- a/docs/src/examples/overview.md +++ b/docs/src/examples/overview.md @@ -16,10 +16,10 @@ The examples show how to combine FMUs with machine learning ("NeuralFMU") and il - [__Modelica Conference 2021: NeuralFMUs__](https://thummeto.github.io/FMIFlux.jl/dev/examples/modelica_conference_2021/): Showing basics on how to train a NeuralFMU (Contribution for the *Modelica Conference 2021*). ## Workshops -[__Pluto workshops__](https://thummeto.github.io/FMI.jl/dev/examples/workshops/): [Pluto](https://plutojl.org/) based notebooks, that can easily be executed on your own Pluto-Setup. -- [__Scientific Machine Learning using Functional Mock-up Units__](https://thummeto.github.io/FMI.jl/dev/examples/pluto-src/SciMLUsingFMUs/SciMLUsingFMUs.html): Workshop at JuliaCon 2024 (Eindhoven University, Netherlands) +[__Pluto workshops__](https://thummeto.github.io/FMIFlux.jl/dev/examples/workshops/): [Pluto](https://plutojl.org/) based notebooks, that can easily be executed on your own Pluto-Setup. +- [__Scientific Machine Learning using Functional Mock-up Units__](https://thummeto.github.io/FMIFlux.jl/dev/examples/pluto-src/SciMLUsingFMUs/SciMLUsingFMUs.html): Workshop at JuliaCon 2024 (Eindhoven University, Netherlands) ## Archived - [__MDPI 2022: Physics-enhanced NeuralODEs in real-world applications__](https://thummeto.github.io/FMIFlux.jl/dev/examples/mdpi_2022/): An example for a NeuralODE in a real world modeling scenario (Contribution in *MDPI Electronics 2022*). - [__Growing Horizon ME-NeuralFMU__](https://thummeto.github.io/FMIFlux.jl/dev/examples/growing_horizon_ME/): Growing horizon training technique for a ME-NeuralFMU. -- [__Hands-on: Hybrid Modeling using FMI__](https://thummeto.github.io/FMI.jl/dev/examples/pluto-src/HybridModelingUsingFMI/HybridModelingUsingFMI.html): Workshop at MODPROD 2024 (Linköping University, Sweden) +- [__Hands-on: Hybrid Modeling using FMI__](https://thummeto.github.io/FMIFlux.jl/dev/examples/pluto-src/HybridModelingUsingFMI/HybridModelingUsingFMI.html): Workshop at MODPROD 2024 (Linköping University, Sweden) From ad1c55dea4eeaf228740835e03641b79c07646ae Mon Sep 17 00:00:00 2001 From: CompatHelper Julia Date: Wed, 23 Oct 2024 00:54:10 +0000 Subject: [PATCH 5/5] CompatHelper: bump compat for Colors to 0.13, (keep existing compat) --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index b4883650..8e10fe88 100644 --- a/Project.toml +++ b/Project.toml @@ -21,7 +21,7 @@ JLD2 = "033835bb-8acc-5ee8-8aae-3f567f8a3819" JLD2Ext = ["JLD2"] [compat] -Colors = "0.12" +Colors = "0.12, 0.13" DifferentiableEigen = "0.2.0" FMIImport = "1.0.6" FMISensitivity = "0.2.0"