Cleanup (#50)

.gitignore

@@ -5,8 +5,14 @@ mlruns/
 playground.py
 pg.py
 study.db
-models/**
-
+models/
+run/
+outputs/
+out_models/
+finished_models/
+finished_pi/
+finished_reduced/
+**/results.csv
 
 # Byte-compiled / optimized / DLL files
 __pycache__/

benchmarks/conf/benchmark/transmission_loss_fno.yaml

@@ -0,0 +1,16 @@
+_target_: nos.benchmarks.benchmark.Benchmark
+train_set:
+  _target_: nos.data.transmission_loss.TLDatasetCompactWave
+  path:
+    _target_: pathlib.Path
+    _args_: ["data/train/transmission_loss_smooth"]
+test_set:
+  _target_: nos.data.transmission_loss.TLDatasetCompactWave
+  path:
+    _target_: pathlib.Path
+    _args_: ["data/test/transmission_loss_smooth"]
+metrics:
+  - _target_: nos.metrics.error_metrics.L1Error
+  - _target_: nos.metrics.error_metrics.MSError
+  - _target_: nos.metrics.operator_metrics.NumberOfParameters
+  - _target_: nos.metrics.operator_metrics.SpeedOfEvaluation

benchmarks/conf/benchmark/transmission_loss_smooth.yaml

@@ -0,0 +1,16 @@
+_target_: nos.benchmarks.benchmark.Benchmark
+train_set:
+  _target_: nos.data.transmission_loss.TLDatasetCompact
+  path:
+    _target_: pathlib.Path
+    _args_: ["data/train/transmission_loss_smooth"]
+test_set:
+  _target_: nos.data.transmission_loss.TLDatasetCompact
+  path:
+    _target_: pathlib.Path
+    _args_: ["data/test/transmission_loss_smooth"]
+metrics:
+  - _target_: nos.metrics.error_metrics.L1Error
+  - _target_: nos.metrics.error_metrics.MSError
+  - _target_: nos.metrics.operator_metrics.NumberOfParameters
+  - _target_: nos.metrics.operator_metrics.SpeedOfEvaluation

benchmarks/conf/config.yaml

@@ -5,12 +5,12 @@ defaults:
   - lr_scheduler: default
 
 training:
-  epochs: 100
-  batch_size: 16
+  epochs: 1000
+  batch_size: 12
 
 hydra:
   mode: MULTIRUN
   sweeper:
     params:
-      +benchmark: transmission_loss_lin
-      +operator: deep_neural_small
+      +benchmark: transmission_loss_smooth
+      +operator: deep_dot_big, deep_neural_big, deep_o_big

benchmarks/conf/lr_scheduler/default.yaml

@@ -1,3 +1,3 @@
-_target_: torch.optim.lr_scheduler.CosineAnnealingWarmRestarts
-T_0: 16
-T_mult: 2
+_target_: torch.optim.lr_scheduler.CosineAnnealingLR
+T_max: 1000
+eta_min: 5e-5

benchmarks/conf/operator/deep_dot_big.yaml

@@ -1,10 +1,10 @@
 _target_: nos.operators.deep_dot_operator.DeepDotOperator
-branch_width: 32
-branch_depth: 64
-trunk_width: 32
-trunk_depth:  64
-dot_width: 32
-dot_depth: 32
-stride: 4
+branch_width: 64
+branch_depth: 48
+trunk_depth: 48
+trunk_width: 64
+dot_depth: 48
+dot_width: 112
+stride: 8
 act:
   _target_: torch.nn.Tanh

benchmarks/conf/operator/deep_dot_medium.yaml

@@ -1,10 +1,10 @@
 _target_: nos.operators.deep_dot_operator.DeepDotOperator
 branch_width: 32
 branch_depth: 16
+trunk_depth: 16
 trunk_width: 32
-trunk_depth:  16
-dot_width: 32
-dot_depth: 16
+dot_depth: 32
+dot_width: 46
 stride: 4
 act:
   _target_: torch.nn.Tanh

benchmarks/conf/operator/deep_dot_small.yaml

@@ -1,10 +1,10 @@
 _target_: nos.operators.deep_dot_operator.DeepDotOperator
-branch_width: 16
-branch_depth: 2
-trunk_width: 16
-trunk_depth:  2
-dot_width: 16
-dot_depth: 2
-stride: 1
+branch_width: 28
+branch_depth: 4
+trunk_depth: 4
+trunk_width: 32
+dot_depth: 4
+dot_width: 32
+stride: 2
 act:
   _target_: torch.nn.Tanh

benchmarks/conf/operator/deep_neural_big.yaml

@@ -1,5 +1,6 @@
 _target_: nos.operators.deep_neural_operator.DeepNeuralOperator
-width: 128
 depth: 64
+width: 125
+stride: 8
 act:
   _target_: torch.nn.Tanh

benchmarks/conf/operator/deep_neural_medium.yaml

@@ -1,5 +1,6 @@
 _target_: nos.operators.deep_neural_operator.DeepNeuralOperator
-width: 64
-depth: 22
+depth: 32
+width: 56
+stride: 4
 act:
   _target_: torch.nn.Tanh

benchmarks/conf/operator/deep_neural_small.yaml

@@ -1,5 +1,6 @@
 _target_: nos.operators.deep_neural_operator.DeepNeuralOperator
-width: 32
-depth: 16
+depth: 8
+width: 36
+stride: 2
 act:
   _target_: torch.nn.Tanh

benchmarks/conf/operator/deep_o_big.yaml

@@ -1,6 +1,7 @@
 _target_: nos.operators.deep_o_net.DeepONet
 branch_width: 64
-branch_depth: 64
-trunk_width: 64
+branch_depth: 96
 trunk_depth: 64
-basis_functions: 96
+trunk_width: 96
+stride: 8
+basis_functions: 48

benchmarks/conf/operator/deep_o_medium.yaml

@@ -1,6 +1,7 @@
 _target_: nos.operators.deep_o_net.DeepONet
-branch_width: 64
-branch_depth: 32
-trunk_width: 64
-trunk_depth: 32
-basis_functions: 64
+branch_width: 42
+branch_depth: 24
+trunk_depth: 28
+trunk_width: 44
+stride: 4
+basis_functions: 48

benchmarks/conf/operator/deep_o_small.yaml

@@ -1,6 +1,7 @@
 _target_: nos.operators.deep_o_net.DeepONet
-branch_width: 64
-branch_depth: 12
-trunk_width: 64
-trunk_depth: 12
-basis_functions: 32
+branch_width: 32
+branch_depth: 4
+trunk_depth: 5
+trunk_width: 32
+stride: 1
+basis_functions: 4

benchmarks/conf/optim/default.yaml

@@ -1,3 +1,3 @@
 _target_: torch.optim.Adam
 lr: 1e-3
-weight_decay: 1e-3
+weight_decay: 1e-4

benchmarks/conf/trainer/default.yaml

@@ -1,4 +1,4 @@
 _target_: nos.trainers.Trainer
 criterion:
   _target_: torch.nn.MSELoss
-max_n_saved_models: 5
+max_n_saved_models: 10