-
Notifications
You must be signed in to change notification settings - Fork 2
Updates for 128x128, optimizer config #309
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 20 commits
Commits
Show all changes
21 commits
Select commit
Hold shift + click to select a range
c71b843
Add datamodules for 128x128
sgreenbury 26a7e77
Move config
sgreenbury 32b7b67
Add AE config for 128x128
sgreenbury a26fdd3
Add pin_memory=True
sgreenbury 43f474e
Add 4 GPU ViT config
sgreenbury b69d7f0
Add disable mod embedding when not trained
sgreenbury 05cf9ff
Merge remote-tracking branch 'origin/main' into test-scripts/run-128x128
sgreenbury 7b48e99
Merge branch 'cache-latents' into test-scripts/run-128x128
sgreenbury dc547df
Update GPE config
sgreenbury bc53839
Add alpha fair CRPS loss config
sgreenbury 1348f30
Merge remote-tracking branch 'origin/main' into test-scripts/run-128x128
sgreenbury dc3472f
Update single GPU
sgreenbury feb5e43
Add separate config for single GPE AE
sgreenbury 5650513
Add MAE config
sgreenbury 60114bf
Add concat and n_noise_channels config
sgreenbury 8c5f696
Add ensemble MAE
sgreenbury c3c9713
Fix eval
sgreenbury 7555007
Fix metrics override
sgreenbury 13eba33
Ignore paths for tests, add __init__ in tets modules
sgreenbury 2007857
Update optimizer
sgreenbury 624503b
Fix pyproject
sgreenbury File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| # @package _global_ | ||
| defaults: | ||
| - /distributed: ddp_4gpu_slurm | ||
| - override /datamodule: advection_diffusion | ||
| - override /model: autoencoder_dc_large | ||
| - override /optimizer: psgd | ||
| - _self_ | ||
|
|
||
| experiment_name: ae_dc_large | ||
|
|
||
| datamodule: | ||
| use_normalization: false | ||
| batch_size: 64 | ||
|
|
||
|
|
||
| logging: | ||
| wandb: | ||
| enabled: false | ||
|
|
||
| optimizer: | ||
| learning_rate: 1e-5 | ||
| weight_decay: 0.0 | ||
| scheduler: cosine | ||
|
|
||
| trainer: | ||
| gradient_clip_val: 1.0 |
File renamed without changes.
31 changes: 31 additions & 0 deletions
31
local_hydra/local_experiment/ae/ae_dc_large_periodic_128.yaml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| # @package _global_ | ||
| defaults: | ||
| - /distributed: ddp_4gpu_slurm | ||
| - override /datamodule: advection_diffusion | ||
| - override /model: autoencoder_dc_large | ||
| - override /optimizer: psgd | ||
| - _self_ | ||
|
|
||
| experiment_name: ae_dc_large | ||
|
|
||
| datamodule: | ||
| use_normalization: false | ||
| batch_size: 64 | ||
|
|
||
| model: | ||
| encoder: | ||
| periodic: true | ||
| decoder: | ||
| periodic: true | ||
|
|
||
| logging: | ||
| wandb: | ||
| enabled: false | ||
|
|
||
| optimizer: | ||
| learning_rate: 1e-5 | ||
| weight_decay: 0.0 | ||
| scheduler: cosine | ||
|
|
||
| trainer: | ||
| gradient_clip_val: 1.0 |
33 changes: 33 additions & 0 deletions
33
local_hydra/local_experiment/ae/ae_dc_large_periodic_single_gpu.yaml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| # @package _global_ | ||
| defaults: | ||
| - /distributed: single_gpu_slurm | ||
| - override /datamodule: advection_diffusion | ||
| - override /model: autoencoder_dc_large | ||
| - override /optimizer: psgd | ||
| - _self_ | ||
|
|
||
| experiment_name: ae_dc_large | ||
|
|
||
| datamodule: | ||
| # use_normalization: false | ||
| # batch_size: 64 | ||
| use_normalization: true | ||
| batch_size: 256 | ||
|
|
||
| model: | ||
| encoder: | ||
| periodic: true | ||
| decoder: | ||
| periodic: true | ||
|
|
||
| logging: | ||
| wandb: | ||
| enabled: false | ||
|
|
||
| optimizer: | ||
| learning_rate: 1e-5 | ||
| weight_decay: 0.0 | ||
| scheduler: cosine | ||
|
|
||
| trainer: | ||
| gradient_clip_val: 1.0 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| # @package _global_ | ||
| defaults: | ||
| - /distributed: ddp_4gpu_slurm | ||
| - override /datamodule: advection_diffusion_multichannel_64_64 | ||
| - override /encoder@model.encoder: permute_concat | ||
| - override /decoder@model.decoder: channels_last | ||
| # - override /processor@model.processor: vit_azula_large | ||
| #- override /input_noise_injector@model.input_noise_injector: concat | ||
| - _self_ | ||
|
|
||
| experiment_name: epd_crps_vit_azula | ||
|
|
||
| datamodule: | ||
| use_normalization: true | ||
| batch_size: 32 | ||
|
|
||
| logging: | ||
| wandb: | ||
| enabled: true | ||
|
|
||
| optimizer: | ||
| learning_rate: 0.0002 | ||
|
|
||
| model: | ||
| train_in_latent_space: false | ||
| n_members: 10 | ||
| encoder: | ||
| with_constants: true | ||
| loss_func: | ||
| _target_: autocast.losses.ensemble.CRPSLoss | ||
| train_metrics: | ||
| crps: | ||
| _target_: autocast.metrics.ensemble.CRPS | ||
|
|
34 changes: 34 additions & 0 deletions
34
local_hydra/local_experiment/epd_crps_vit_azula_afcrps.yaml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| # @package _global_ | ||
| defaults: | ||
| - /distributed: single_gpu_slurm | ||
| - override /datamodule: advection_diffusion_multichannel_64_64 | ||
| - override /encoder@model.encoder: permute_concat | ||
| - override /decoder@model.decoder: channels_last | ||
| # - override /processor@model.processor: vit_azula_large | ||
| #- override /input_noise_injector@model.input_noise_injector: concat | ||
| - _self_ | ||
|
|
||
| experiment_name: epd_crps_vit_azula | ||
|
|
||
| datamodule: | ||
| use_normalization: true | ||
| batch_size: 32 | ||
|
|
||
| logging: | ||
| wandb: | ||
| enabled: true | ||
|
|
||
| optimizer: | ||
| learning_rate: 0.0002 | ||
|
|
||
| model: | ||
| train_in_latent_space: false | ||
| n_members: 10 | ||
| encoder: | ||
| with_constants: true | ||
| loss_func: | ||
| _target_: autocast.losses.ensemble.AlphaFairCRPSLoss | ||
| train_metrics: | ||
| crps: | ||
| _target_: autocast.metrics.ensemble.CRPS | ||
|
|
34 changes: 34 additions & 0 deletions
34
local_hydra/local_experiment/epd_crps_vit_azula_concat.yaml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| # @package _global_ | ||
| defaults: | ||
| - /distributed: single_gpu_slurm | ||
| - override /datamodule: advection_diffusion_multichannel_64_64 | ||
| - override /encoder@model.encoder: permute_concat | ||
| - override /decoder@model.decoder: channels_last | ||
| # - override /processor@model.processor: vit_azula_large | ||
| - override /input_noise_injector@model.input_noise_injector: concat | ||
| - _self_ | ||
|
|
||
| experiment_name: epd_crps_vit_azula | ||
|
|
||
| datamodule: | ||
| use_normalization: true | ||
| batch_size: 32 | ||
|
|
||
| logging: | ||
| wandb: | ||
| enabled: true | ||
|
|
||
| optimizer: | ||
| learning_rate: 0.0002 | ||
|
|
||
| model: | ||
| train_in_latent_space: false | ||
| n_members: 10 | ||
| encoder: | ||
| with_constants: true | ||
| loss_func: | ||
| _target_: autocast.losses.ensemble.CRPSLoss | ||
| train_metrics: | ||
| crps: | ||
| _target_: autocast.metrics.ensemble.CRPS | ||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| # @package _global_ | ||
| defaults: | ||
| - /distributed: single_gpu_slurm | ||
| - override /datamodule: advection_diffusion_multichannel_64_64 | ||
| - override /encoder@model.encoder: permute_concat | ||
| - override /decoder@model.decoder: channels_last | ||
| # - override /processor@model.processor: vit_azula_large | ||
| #- override /input_noise_injector@model.input_noise_injector: concat | ||
| - _self_ | ||
|
|
||
| experiment_name: epd_crps_vit_azula | ||
|
|
||
| datamodule: | ||
| use_normalization: true | ||
| batch_size: 32 | ||
|
|
||
| logging: | ||
| wandb: | ||
| enabled: true | ||
|
|
||
| optimizer: | ||
| learning_rate: 0.0002 | ||
|
|
||
| model: | ||
| train_in_latent_space: false | ||
| n_members: 10 | ||
| encoder: | ||
| with_constants: true | ||
| loss_func: | ||
| _target_: autocast.losses.ensemble.EnsembleMAELoss | ||
| train_metrics: | ||
| crps: | ||
| _target_: autocast.metrics.ensemble.CRPS | ||
|
|
36 changes: 36 additions & 0 deletions
36
local_hydra/local_experiment/epd_crps_vit_azula_n_noise_1024.yaml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| # @package _global_ | ||
| defaults: | ||
| - /distributed: single_gpu_slurm | ||
| - override /datamodule: advection_diffusion_multichannel_64_64 | ||
| - override /encoder@model.encoder: permute_concat | ||
| - override /decoder@model.decoder: channels_last | ||
| # - override /processor@model.processor: vit_azula_large | ||
| #- override /input_noise_injector@model.input_noise_injector: concat | ||
| - _self_ | ||
|
|
||
| experiment_name: epd_crps_vit_azula | ||
|
|
||
| datamodule: | ||
| use_normalization: true | ||
| batch_size: 32 | ||
|
|
||
| logging: | ||
| wandb: | ||
| enabled: true | ||
|
|
||
| optimizer: | ||
| learning_rate: 0.0002 | ||
|
|
||
| model: | ||
| train_in_latent_space: false | ||
| n_members: 10 | ||
| encoder: | ||
| with_constants: true | ||
| processor: | ||
| n_noise_channels: 1024 | ||
| loss_func: | ||
| _target_: autocast.losses.ensemble.CRPSLoss | ||
| train_metrics: | ||
| crps: | ||
| _target_: autocast.metrics.ensemble.CRPS | ||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 10 additions & 0 deletions
10
src/autocast/configs/datamodule/conditioned_navier_stokes_128.yaml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| _target_: autocast.data.datamodule.SpatioTemporalDataModule | ||
| data_path: "${oc.env:AUTOCAST_DATASETS,./datasets}/128x128/conditioned_navier_stokes_2d_b106e4d" | ||
| batch_size: 16 | ||
| n_steps_input: 1 | ||
| n_steps_output: 4 | ||
| stride: 1 | ||
| verbose: false | ||
| use_normalization: false | ||
| normalization_path: ${.data_path}/stats.yml | ||
| num_workers: 0 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 10 additions & 0 deletions
10
src/autocast/configs/datamodule/gpe_laser_only_wake_128.yaml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| _target_: autocast.data.datamodule.SpatioTemporalDataModule | ||
| data_path: "${oc.env:AUTOCAST_DATASETS,./datasets}/128x128/gpe/laser_only_wake_f15bdbb" | ||
| batch_size: 16 | ||
| n_steps_input: 1 | ||
| n_steps_output: 4 | ||
| stride: 1 | ||
| verbose: false | ||
| use_normalization: false | ||
| normalization_path: ${.data_path}/stats.yml | ||
| num_workers: 0 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| _target_: autocast.data.datamodule.SpatioTemporalDataModule | ||
| data_path: "${oc.env:AUTOCAST_DATASETS,./datasets}/128x128/shallow_water2d_433068d" | ||
| batch_size: 16 | ||
| n_steps_input: 1 | ||
| n_steps_output: 4 | ||
| stride: 1 | ||
| verbose: false | ||
| use_normalization: false | ||
| normalization_path: ${.data_path}/stats.yml | ||
| num_workers: 0 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| # Compatibility with: https://github.com/francois-rozet/lola/blob/21a4354b327e6e5ee06da5075ba3bd1dd88c61f1/experiments/configs/optim/adamw.yaml | ||
| name: "${.optimizer}_${.learning_rate}_${.scheduler}_half" | ||
| optimizer: "adamw" | ||
| betas: [0.9, 0.99] | ||
| learning_rate: 1e-4 | ||
| weight_decay: 0.0 | ||
| scheduler: "cosine" | ||
|
|
||
| # lr_lambda(t) = (1 + cos(pi * t / epochs)) / 2 | ||
| # cold_lr_lambda(t) = min(1, (t + 1) / (warmup + 1)) * lr_lambda(t) | ||
| scheduler_interval: "epoch" | ||
| cosine_epochs: ${trainer.max_epochs} | ||
|
|
||
| # Horizon precedence (highest to lowest): | ||
| # 1) Explicit interval key: cosine_epochs (epoch) or cosine_steps (step) | ||
| # 2) Trainer-derived value (max_epochs / estimated_stepping_batches) | ||
| # 3) cosine_t_max fallback | ||
| # In this file, cosine_epochs is set, so cosine_t_max is used only if that | ||
| # interpolation is unavailable. | ||
| cosine_t_max: 130 | ||
|
|
||
| warmup: 0 | ||
| min_lr_ratio: 0.0 | ||
| grad_clip: 1 |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.