From c19f9c665c0f03d6d30cf98ddcdf16b65fe8e031 Mon Sep 17 00:00:00 2001 From: Emmanuel Benazera Date: Tue, 4 Sep 2018 15:42:40 +0200 Subject: [PATCH 1/2] default training config has long term divergence --- pytorch/config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pytorch/config.yaml b/pytorch/config.yaml index c103e26..bbcf8c1 100644 --- a/pytorch/config.yaml +++ b/pytorch/config.yaml @@ -34,8 +34,8 @@ modelParam: divL1Lambda: 0 # MSE of long term divergence # If > 0, implements the Long Term divergence concept from FluidNet - divLongTermLambda: 0 - # Time step: default simulation timestep. + divLongTermLambda: 1 + # Time step: default simulation timestep only when long term divergence is active. dt: 0.1 # buoyancyScale : Buoyancy forces scale # gravityScale : Gravity forces scale From fab842fde27a5b542119a70893af0e21c0772566 Mon Sep 17 00:00:00 2001 From: Emmanuel Benazera Date: Tue, 4 Sep 2018 15:51:25 +0200 Subject: [PATCH 2/2] renamed preprocOnly into preprocOriginalFluidNetDataOnly --- pytorch/config.yaml | 2 +- pytorch/fluid_net_train.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pytorch/config.yaml b/pytorch/config.yaml index bbcf8c1..2e24416 100644 --- a/pytorch/config.yaml +++ b/pytorch/config.yaml @@ -96,7 +96,7 @@ modelParam: numWorkers: 3 # If true, dataset is preprocessed and programs exists. # Preprocessing is automatic if no previous preproc is detected on current dataset. -preprocOnly: false +preprocOriginalFluidNetDataOnly: false # printTraining : Debug options for training. # Prints or shows validation dataset and compares net # output to GT. diff --git a/pytorch/fluid_net_train.py b/pytorch/fluid_net_train.py index 62ec90e..78ffe76 100644 --- a/pytorch/fluid_net_train.py +++ b/pytorch/fluid_net_train.py @@ -96,7 +96,7 @@ conf['shuffleTraining'] = not arguments.noShuffle # Preprocessing dataset message (will exit after preproc) -if (conf['preprocOnly']): +if (conf['preprocOriginalFluidNetDataOnly']): print('Running preprocessing only') resume = False @@ -106,7 +106,7 @@ tr = lib.FluidNetDataset(conf, 'tr', save_dt=4, resume=resume) te = lib.FluidNetDataset(conf, 'te', save_dt=4, resume=resume) -if (conf['preprocOnly']): +if (conf['preprocOriginalFluidNetDataOnly']): sys.exit() # We create two conf dicts, general params and model params.