Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
dbbfe33
autopush
SCiarella Feb 18, 2025
f611572
Add YAMLloader for attentioncnn
SCiarella Feb 25, 2025
b242d5d
autopush
SCiarella Feb 25, 2025
f015d81
Add CNO loader
SCiarella Feb 26, 2025
2631b7f
autopush
SCiarella Mar 5, 2025
0e429b5
autopush
SCiarella Mar 12, 2025
16b74f9
autopush
SCiarella Mar 12, 2025
633584a
autopush
SCiarella Mar 12, 2025
f0cbb69
Merge branch 'main' into dev
SCiarella Mar 12, 2025
6f95e10
autopush
SCiarella Mar 14, 2025
afb1ee1
Merge branch 'main' into dev
SCiarella Mar 14, 2025
4763b1d
Merge branch 'main' into dev
SCiarella Mar 20, 2025
7a2f01c
autopush
SCiarella Mar 20, 2025
8d28622
Merge branch 'main' into dev
SCiarella Mar 20, 2025
710fd35
autopush
SCiarella Mar 26, 2025
5b184c8
Merge branch 'main' into dev
SCiarella Mar 26, 2025
9b9434c
autopush
SCiarella Mar 27, 2025
3f49058
Merge branch 'main' into dev
SCiarella Mar 27, 2025
f4bbc6f
autopush
SCiarella Apr 7, 2025
e19980f
Add pre-commit
SCiarella Apr 7, 2025
b1ae853
Bump Plots
SCiarella Apr 7, 2025
d38ecd8
Bump down Zygote
SCiarella Apr 7, 2025
84286fe
autopush
SCiarella Apr 7, 2025
6e4a4b8
autopush
SCiarella Apr 7, 2025
fa3be6b
Bump CairoMakie
SCiarella Apr 7, 2025
b74debb
Merge branch 'main' into dev
SCiarella Apr 7, 2025
a8fa41a
autopush
SCiarella Apr 7, 2025
8d2b15d
Merge branch 'main' into dev
SCiarella Apr 7, 2025
8e7b156
autopush
SCiarella Apr 14, 2025
939daba
autopush
SCiarella Apr 14, 2025
15e1aea
autopush
SCiarella Apr 14, 2025
d081727
autopush
SCiarella Apr 14, 2025
53957c0
autopush
SCiarella Apr 14, 2025
5854fc9
autopush
SCiarella Apr 15, 2025
c868505
autopush
SCiarella Apr 15, 2025
f3859fb
Merge branch 'main' into dev
SCiarella Apr 15, 2025
df7927f
autopush
SCiarella Apr 15, 2025
4a46a02
Merge branch 'main' into dev
SCiarella Apr 15, 2025
30c221d
autopush
SCiarella Apr 28, 2025
c464ac0
autopush
SCiarella Apr 29, 2025
e577e9b
Update to INS v3
SCiarella Apr 29, 2025
44ddd11
fix test
SCiarella Apr 29, 2025
e199f49
Comply with INS on CPU backend
SCiarella Apr 29, 2025
bc089d7
Up Zygote
SCiarella Apr 29, 2025
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
15 changes: 8 additions & 7 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@ JuliaFormatter = "98e50ef6-434e-11e9-1051-2b60c6c9e899"
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
Literate = "98b081ad-f1c9-55d3-8b20-4c87d4299306"
Lux = "b2108857-7c20-44ae-9111-449ecde12c47"
LuxCUDA = "d0bbae9a-e099-4d5b-a835-1c6931763bda"
NNlib = "872c559c-99b0-510c-b3b7-b6c96a88d5cd"
OpenSSL_jll = "458c3c95-2e84-50aa-8efc-19380b2a3a95"
Optimization = "7f7a1694-90dd-40f0-9382-eb1efda571ba"
OptimizationOptimisers = "42dfb2eb-d2b4-4451-abcd-913932933ac1"
Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
Expand All @@ -38,15 +40,13 @@ CUDSS = "45b445bb-4962-46a0-9369-b4df9d0f772e"
ConvolutionalNeuralOperators = "d769ba41-1544-53e8-a779-241a28c31cef"
IncompressibleNavierStokes = "5e318141-6589-402b-868d-77d7df8c442e"
Juno = "e5e0dc1b-0480-54bc-9374-aad01c23163d"
LuxCUDA = "d0bbae9a-e099-4d5b-a835-1c6931763bda"
NeuralClosure = "099dac27-d7f2-4047-93d5-0baee36b9c25"
Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
Tullio = "bc48ee85-29a4-5162-ae0b-a64e1601d4bc"
cuDNN = "02a925ec-e4fe-4b08-9a7e-0d78e3d38ccd"

[sources.NeuralClosure]
rev = "main"
url = "https://github.com/DEEPDIP-project/NeuralClosure.jl.git"
[sources]
NeuralClosure = {rev = "main", url = "https://github.com/DEEPDIP-project/NeuralClosure.jl.git"}

[extensions]
AttentionCNN = ["AttentionLayer"]
Expand All @@ -67,7 +67,7 @@ DifferentialEquations = "7"
Documenter = "1"
FFTW = "1"
Glob = "1"
IncompressibleNavierStokes = "^2.0.1"
IncompressibleNavierStokes = "3"
JLD2 = "0.5"
JuliaFormatter = "2"
Juno = "0.8"
Expand All @@ -76,6 +76,7 @@ Lux = "1"
LuxCUDA = "0.3"
NNlib = "0.9"
NeuralClosure = "1.0.0"
OpenSSL_jll = "3.0.13"
Optimization = "4"
OptimizationOptimisers = "0.3"
Plots = "2, 1"
Expand All @@ -85,7 +86,7 @@ ShiftedArrays = "2"
Statistics = "1.10"
Tullio = "0.3"
YAML = "0.4.12"
Zygote = "0.6"
Zygote = "0.6, 0.7"
cuDNN = "1"
julia = "1.11"

Expand All @@ -95,4 +96,4 @@ NeuralClosure = "099dac27-d7f2-4047-93d5-0baee36b9c25"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[targets]
test = ["Test", "LuxCUDA", "cuDNN", "Adapt", "IncompressibleNavierStokes", "NeuralClosure"]
test = ["Test", "IncompressibleNavierStokes", "NeuralClosure", "Adapt", "cuDNN"]
1 change: 0 additions & 1 deletion src/train.jl
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ using Lux: Lux
using Zygote: Zygote
using Optimization: Optimization
using OptimizationOptimisers: OptimizationOptimisers
using CairoMakie: save
using ChainRulesCore: ignore_derivatives

function train(model, ps, st, train_dataloader, loss_function;
Expand Down
2 changes: 1 addition & 1 deletion test/test_io.jl
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ using Random
@test T == Float32

# test parameters
backend = CPU()
backend = IncompressibleNavierStokes.CPU()
conf["params"]["backend"] = backend
ref_params = (;
D = 2,
Expand Down
Loading