Skip to content

Commit 1b275c5

Browse files
wangguan1995wangguan1995
committed
merge develop
2 parents f26dcf5 + 0bb3ee5 commit 1b275c5

File tree

6 files changed

+48
-24
lines changed

6 files changed

+48
-24
lines changed

‎examples/cylinder/2d_unsteady/transformer_physx/train_enn.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import paddle
2323

2424
import ppsci
25+
from ppsci.utils import config
2526
from ppsci.utils import logger
2627

2728

@@ -46,9 +47,11 @@ def get_mean_std(data: np.ndarray, visc: np.ndarray):
4647

4748

4849
if __name__ == "__main__":
49-
ppsci.utils.set_random_seed(42)
50-
51-
EPOCHS = 300
50+
args = config.parse_args()
51+
# set random seed for reproducibility
52+
ppsci.utils.misc.set_random_seed(42)
53+
# set training hyper-parameters
54+
EPOCHS = 300 if not args.epochs else args.epochs
5255
TRAIN_BLOCK_SIZE = 4
5356
VALID_BLOCK_SIZE = 32
5457

@@ -57,7 +60,7 @@ def get_mean_std(data: np.ndarray, visc: np.ndarray):
5760
weights = (10.0 * (TRAIN_BLOCK_SIZE - 1), 10.0 * TRAIN_BLOCK_SIZE)
5861
regularization_key = "k_matrix"
5962

60-
OUTPUT_DIR = "./output/cylinder_enn"
63+
OUTPUT_DIR = "./output/cylinder_enn" if not args.output_dir else args.output_dir
6164
TRAIN_FILE_PATH = "./datasets/cylinder_training.hdf5"
6265
VALID_FILE_PATH = "./datasets/cylinder_valid.hdf5"
6366
# initialize logger

‎examples/cylinder/2d_unsteady/transformer_physx/train_transformer.py

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525

2626
import ppsci
2727
from ppsci.arch import base
28+
from ppsci.utils import config
2829
from ppsci.utils import logger
2930
from ppsci.utils import save_load
3031

@@ -53,14 +54,16 @@ def __call__(self, x: Dict[str, paddle.Tensor]) -> Dict[str, paddle.Tensor]:
5354

5455

5556
if __name__ == "__main__":
56-
ppsci.utils.set_random_seed(42)
57-
57+
args = config.parse_args()
58+
# set random seed for reproducibility
59+
ppsci.utils.misc.set_random_seed(42)
60+
# set training hyper-parameters
5861
NUM_LAYERS = 6
5962
NUM_CTX = 16
6063
EMBED_SIZE = 128
6164
NUM_HEADS = 4
6265

63-
EPOCHS = 200
66+
EPOCHS = 200 if not args.epochs else args.epochs
6467
TRAIN_BLOCK_SIZE = 16
6568
VALID_BLOCK_SIZE = 256
6669
input_keys = ("embeds",)
@@ -71,7 +74,9 @@ def __call__(self, x: Dict[str, paddle.Tensor]) -> Dict[str, paddle.Tensor]:
7174
TRAIN_FILE_PATH = "./datasets/cylinder_training.hdf5"
7275
VALID_FILE_PATH = "./datasets/cylinder_valid.hdf5"
7376
EMBEDDING_MODEL_PATH = "./output/cylinder_enn/checkpoints/latest"
74-
OUTPUT_DIR = "./output/cylinder_transformer"
77+
OUTPUT_DIR = (
78+
"./output/cylinder_transformer" if not args.output_dir else args.output_dir
79+
)
7580
# initialize logger
7681
logger.init_logger("ppsci", f"{OUTPUT_DIR}/train.log", "info")
7782

‎examples/lorenz/train_enn.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import paddle
2323

2424
import ppsci
25+
from ppsci.utils import config
2526
from ppsci.utils import logger
2627

2728

@@ -36,9 +37,11 @@ def get_mean_std(data: np.ndarray):
3637

3738

3839
if __name__ == "__main__":
39-
ppsci.utils.set_random_seed(42)
40-
41-
EPOCHS = 300
40+
args = config.parse_args()
41+
# set random seed for reproducibility
42+
ppsci.utils.misc.set_random_seed(42)
43+
# set training hyper-parameters
44+
EPOCHS = 300 if not args.epochs else args.epochs
4245
TRAIN_BLOCK_SIZE = 16
4346
VALID_BLOCK_SIZE = 32
4447

@@ -47,7 +50,7 @@ def get_mean_std(data: np.ndarray):
4750
weights = (1.0 * (TRAIN_BLOCK_SIZE - 1), 1.0e4 * TRAIN_BLOCK_SIZE)
4851
regularization_key = "k_matrix"
4952

50-
OUTPUT_DIR = "./output/lorenz_enn"
53+
OUTPUT_DIR = "./output/lorenz_enn" if not args.output_dir else args.output_dir
5154
TRAIN_FILE_PATH = "./datasets/lorenz_training_rk.hdf5"
5255
VALID_FILE_PATH = "./datasets/lorenz_valid_rk.hdf5"
5356
# initialize logger

‎examples/lorenz/train_transformer.py

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424

2525
import ppsci
2626
from ppsci.arch import base
27+
from ppsci.utils import config
2728
from ppsci.utils import logger
2829
from ppsci.utils import save_load
2930

@@ -53,14 +54,16 @@ def __call__(self, x: Dict[str, paddle.Tensor]):
5354
# train time-series: 2048 time-steps: 256 block-size: 64 stride: 64
5455
# valid time-series: 64 time-steps: 1024 block-size: 256 stride: 1024
5556
# test time-series: 256 time-steps: 1024
56-
ppsci.utils.set_random_seed(42)
57-
57+
args = config.parse_args()
58+
# set random seed for reproducibility
59+
ppsci.utils.misc.set_random_seed(42)
60+
# set training hyper-parameters
5861
NUM_LAYERS = 4
5962
NUM_CTX = 64
6063
EMBED_SIZE = 32
6164
NUM_HEADS = 4
6265

63-
EPOCHS = 200
66+
EPOCHS = 200 if not args.epochs else args.epochs
6467
TRAIN_BLOCK_SIZE = 64
6568
VALID_BLOCK_SIZE = 256
6669
input_keys = ("embeds",)
@@ -71,7 +74,9 @@ def __call__(self, x: Dict[str, paddle.Tensor]):
7174
TRAIN_FILE_PATH = "./datasets/lorenz_training_rk.hdf5"
7275
VALID_FILE_PATH = "./datasets/lorenz_valid_rk.hdf5"
7376
EMBEDDING_MODEL_PATH = "./output/lorenz_enn/checkpoints/latest"
74-
OUTPUT_DIR = "./output/lorenz_transformer"
77+
OUTPUT_DIR = (
78+
"./output/lorenz_transformer" if not args.output_dir else args.output_dir
79+
)
7580
# initialize logger
7681
logger.init_logger("ppsci", f"{OUTPUT_DIR}/train.log", "info")
7782

‎examples/rossler/train_enn.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import paddle
2323

2424
import ppsci
25+
from ppsci.utils import config
2526
from ppsci.utils import logger
2627

2728

@@ -40,9 +41,11 @@ def get_mean_std(data: np.ndarray):
4041

4142

4243
if __name__ == "__main__":
43-
ppsci.utils.set_random_seed(42)
44-
45-
EPOCHS = 300
44+
args = config.parse_args()
45+
# set random seed for reproducibility
46+
ppsci.utils.misc.set_random_seed(42)
47+
# set training hyper-parameters
48+
EPOCHS = 300 if not args.epochs else args.epochs
4649
TRAIN_BLOCK_SIZE = 16
4750
VALID_BLOCK_SIZE = 32
4851

@@ -51,7 +54,7 @@ def get_mean_std(data: np.ndarray):
5154
weights = (1.0 * (TRAIN_BLOCK_SIZE - 1), 1.0e3 * TRAIN_BLOCK_SIZE)
5255
regularization_key = "k_matrix"
5356

54-
OUTPUT_DIR = "./output/rossler_enn"
57+
OUTPUT_DIR = "./output/rossler_enn" if not args.output_dir else args.output_dir
5558
TRAIN_FILE_PATH = "./datasets/rossler_training.hdf5"
5659
VALID_FILE_PATH = "./datasets/rossler_valid.hdf5"
5760
# initialize logger

‎examples/rossler/train_transformer.py

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424

2525
import ppsci
2626
from ppsci.arch import base
27+
from ppsci.utils import config
2728
from ppsci.utils import logger
2829
from ppsci.utils import save_load
2930

@@ -50,14 +51,16 @@ def __call__(self, x: Dict[str, paddle.Tensor]):
5051

5152

5253
if __name__ == "__main__":
53-
ppsci.utils.set_random_seed(42)
54-
54+
args = config.parse_args()
55+
# set random seed for reproducibility
56+
ppsci.utils.misc.set_random_seed(42)
57+
# set training hyper-parameters
5558
NUM_LAYERS = 4
5659
NUM_CTX = 64
5760
EMBED_SIZE = 32
5861
NUM_HEADS = 4
5962

60-
EPOCHS = 200
63+
EPOCHS = 200 if not args.epochs else args.epochs
6164
TRAIN_BLOCK_SIZE = 32
6265
VALID_BLOCK_SIZE = 256
6366
input_keys = ("embeds",)
@@ -68,7 +71,9 @@ def __call__(self, x: Dict[str, paddle.Tensor]):
6871
TRAIN_FILE_PATH = "./datasets/rossler_training.hdf5"
6972
VALID_FILE_PATH = "./datasets/rossler_valid.hdf5"
7073
EMBEDDING_MODEL_PATH = "./output/rossler_enn/checkpoints/latest"
71-
OUTPUT_DIR = "./output/rossler_transformer"
74+
OUTPUT_DIR = (
75+
"./output/rossler_transformer" if not args.output_dir else args.output_dir
76+
)
7277
# initialize logger
7378
logger.init_logger("ppsci", f"{OUTPUT_DIR}/train.log", "info")
7479

0 commit comments

Comments
 (0)