update code

Author: HydrogenSulfate

examples/NLS-MB/NLS-MB_optical_rogue_wave.py

@@ -256,8 +256,12 @@ def train(cfg: DictConfig):
         OUTPUT_DIR,
         optimizer=optimizer_lbfgs,
         epochs=EPOCHS,
+        iters_per_epoch=cfg.TRAIN.lbfgs.iters_per_epoch,
+        eval_during_train=cfg.TRAIN.lbfgs.eval_during_train,
+        eval_freq=cfg.TRAIN.lbfgs.eval_freq,
         equation=equation,
         validator=validator,
+        cfg=cfg,
     )
     # train model
     solver.train()

examples/NLS-MB/NLS-MB_optical_soliton.py

@@ -232,8 +232,10 @@ def train(cfg: DictConfig):
         constraint,
         OUTPUT_DIR,
         optimizer_lbfgs,
-        EPOCHS,
-        cfg.TRAIN.lbfgs.iters_per_epoch,
+        epochs=EPOCHS,
+        iters_per_epoch=cfg.TRAIN.lbfgs.iters_per_epoch,
+        eval_during_train=cfg.TRAIN.lbfgs.eval_during_train,
+        eval_freq=cfg.TRAIN.lbfgs.eval_freq,
         equation=equation,
         validator=validator,
         cfg=cfg,

examples/advection/conf/adv_plain.yaml

@@ -197,6 +197,7 @@ def output_transform_p(self, in_, out):
         model,
         constraint,
         optimizer=optimizer,
+        iters_per_epoch=int(x.shape[0] / cfg.TRAIN.batch_size),
         equation=equation,
         cfg=cfg,
     )

examples/aneurysm/aneurysm_flow.py

@@ -199,17 +199,11 @@ def train(cfg: DictConfig):
     solver = ppsci.solver.Solver(
         model,
         constraint,
-        cfg.output_dir,
-        optimizer,
-        None,
-        cfg.TRAIN.epochs,
-        cfg.TRAIN.iters_per_epoch,
-        eval_during_train=cfg.TRAIN.eval_during_train,
-        eval_freq=cfg.TRAIN.eval_freq,
+        optimizer=optimizer,
         equation=equation,
         validator=validator,
         visualizer=visualizer,
-        checkpoint_path=cfg.TRAIN.checkpoint_path,
+        cfg=cfg,
     )
     # train model
     solver.train()
@@ -283,10 +277,9 @@ def evaluate(cfg: DictConfig):
     # initialize solver
     solver = ppsci.solver.Solver(
         model,
-        output_dir=cfg.output_dir,
         validator=validator,
         visualizer=visualizer,
-        pretrained_model_path=cfg.EVAL.pretrained_model_path,
+        cfg=cfg,
     )
     # evaluate
     solver.eval()

examples/convection_diffusion/conf/5_best.yaml

@@ -163,6 +163,7 @@ def train(cfg: DictConfig):
         model,
         constraint,
         optimizer=optimizer,
+        iters_per_epoch=ITERS_PER_EPOCH,
         validator=validator,
         cfg=cfg,
     )

examples/convection_diffusion/conf/6.yaml

@@ -159,6 +159,7 @@ def train(cfg: DictConfig):
     solver = ppsci.solver.Solver(
         model,
         constraint,
+        iters_per_epoch=ITERS_PER_EPOCH,
         optimizer=optimizer,
         validator=validator,
         cfg=cfg,

examples/cylinder/2d_unsteady/cylinder2d_unsteady_Re100.py

@@ -152,6 +152,7 @@ def train(cfg: DictConfig):
     solver = ppsci.solver.Solver(
         model,
         constraint,
+        iters_per_epoch=ITERS_PER_EPOCH,
         optimizer=optimizer,
         validator=validator,
         cfg=cfg,