【hydra No.18】Adapt DeepCFD to hydra #583
Merged
Conversation
This file contains 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
|
Thanks for your contribution! |
Closed
HydrogenSulfate
requested changes
Oct 26, 2023
docs/zh/examples/deepcfd.md
Outdated
Comment on lines
5
to
13
| ``` sh | ||
| # linux | ||
| wget wget -P ./datasets/ https://paddle-org.bj.bcebos.com/paddlescience/datasets/DeepCFD/dataX.pkl | ||
| wget wget -P ./datasets/ https://paddle-org.bj.bcebos.com/paddlescience/datasets/DeepCFD/dataY.pkl | ||
| # windows | ||
| # curl wget -P ./datasets/ https://paddle-org.bj.bcebos.com/paddlescience/datasets/DeepCFD/dataX.pkl --output dataX.pkl | ||
| # curl wget -P ./datasets/ https://paddle-org.bj.bcebos.com/paddlescience/datasets/DeepCFD/dataY.pkl --output dataY.pkl | ||
| python deepcfd.py | ||
| ``` |
There was a problem hiding this comment.
Suggested change
| ``` sh | |
| # linux | |
| wget wget -P ./datasets/ https://paddle-org.bj.bcebos.com/paddlescience/datasets/DeepCFD/dataX.pkl | |
| wget wget -P ./datasets/ https://paddle-org.bj.bcebos.com/paddlescience/datasets/DeepCFD/dataY.pkl | |
| # windows | |
| # curl wget -P ./datasets/ https://paddle-org.bj.bcebos.com/paddlescience/datasets/DeepCFD/dataX.pkl --output dataX.pkl | |
| # curl wget -P ./datasets/ https://paddle-org.bj.bcebos.com/paddlescience/datasets/DeepCFD/dataY.pkl --output dataY.pkl | |
| python deepcfd.py | |
| ``` | |
| ``` sh | |
| # linux | |
| wget -P ./datasets/ https://paddle-org.bj.bcebos.com/paddlescience/datasets/DeepCFD/dataX.pkl | |
| wget -P ./datasets/ https://paddle-org.bj.bcebos.com/paddlescience/datasets/DeepCFD/dataY.pkl | |
| # windows | |
| # curl -o ./datasets/dataX.pkl https://paddle-org.bj.bcebos.com/paddlescience/datasets/DeepCFD/dataX.pkl | |
| # curl -o ./datasets/dataX.pkl https://paddle-org.bj.bcebos.com/paddlescience/datasets/DeepCFD/dataY.pkl | |
| python deepcfd.py | |
| ``` |
docs/zh/examples/deepcfd.md
Outdated
Comment on lines
121
to
125
| ``` py linenums="47" title="examples/deepcfd/conf/deepcfd.yaml" | ||
| --8<-- | ||
| examples/deepcfd/deepcfd.py:298:301 | ||
| examples/deepcfd/conf/deepcfd.yaml:47:51 | ||
| --8<-- | ||
| ``` |
docs/zh/examples/deepcfd.md
Outdated
| --8<-- | ||
| ``` | ||
|
|
||
| ### 3.5 优化器构建 | ||
| 训练过程会调用优化器来更新模型参数，此处选择较为常用的 `Adam` 优化器，学习率设置为 0.001。 | ||
| 训练过程会调用优化器来更新模型参数，此处选择较为常用的 `Adam` 优化器，学习率设置为 0.001，权值衰减设置为 0.005。 |
examples/deepcfd/conf/deepcfd.yaml
Outdated
|
|
||
| # model settings | ||
| MODEL: | ||
| unetex: |
There was a problem hiding this comment.
unetex这个字段可以删除，单模型的情况下，参数直接放到MODEL:字段下即可
examples/deepcfd/deepcfd.py
Outdated
| # set random seed for reproducibility | ||
| ppsci.utils.misc.set_random_seed(cfg.seed) | ||
| # initialize logger | ||
| logger.init_logger("ppsci", os.path.join(cfg.output_dir, "train.log"), "info") |
examples/deepcfd/deepcfd.py
Outdated
| CHANNEL_SIZE = 3 | ||
| X_SIZE = 172 | ||
| Y_SIZE = 79 | ||
| model = ppsci.arch.UNetEx("input", "output", **cfg.MODEL.unetex) |
There was a problem hiding this comment.
input和output也可以放到配置文件里
examples/deepcfd/deepcfd.py
Outdated
| test_x, test_y = test_dataset | ||
|
|
||
| # initialize model | ||
| model = ppsci.arch.UNetEx("input", "output", **cfg.MODEL.unetex) |
examples/deepcfd/deepcfd.py
Outdated
| # evaluate | ||
| solver.eval() | ||
|
|
||
| PLOT_DIR = os.path.join(cfg.output_dir, "visual") | ||
| os.makedirs(PLOT_DIR, exist_ok=True) | ||
| VISU_INDEX = 0 |
There was a problem hiding this comment.
VISU_INDEX这个变量可以删掉，因为没有第二个使用它的地方
HydrogenSulfate
requested changes
Oct 27, 2023
| optimizer = ppsci.optimizer.Adam(LEARNING_RATE, weight_decay=WEIGHT_DECAY)(model) | ||
| optimizer = ppsci.optimizer.Adam( | ||
| cfg.TRAIN.learning_rate, weight_decay=cfg.TRAIN.weight_decay | ||
| )(model) | ||
|
|
||
| # manually build validator | ||
| eval_dataloader_cfg = { |
There was a problem hiding this comment.
train函数里的eval_dataloader_cfg的batchsize改成cfg里的参数
There was a problem hiding this comment.
好的，辛苦大佬 review
huohuohuohuohuo123
pushed a commit
to huohuohuohuohuo123/PaddleScience
that referenced
this pull request
Aug 12, 2024
* adapt DeepCFD to hydra * fix * fix * fix * fix
# for free
to join this conversation on GitHub.
Already have an account?
# to comment
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.
PR types
Others
PR changes
Others
Describe
DeepCFD 案例代码重构，添加评估函数 evaluate，及其训练命令。