【hydra No.18】Adapt DeepCFD to hydra #583

MayYouBeProsperous · 2023-10-20T03:18:53Z

PR types

Others

PR changes

Others

Describe

DeepCFD 案例代码重构，添加评估函数 evaluate，及其训练命令。

paddle-bot · 2023-10-20T03:18:57Z

Thanks for your contribution!

HydrogenSulfate

辛苦大佬再修改一下

HydrogenSulfate · 2023-10-26T11:08:21Z

docs/zh/examples/deepcfd.md

+    ``` 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
+    ```


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

```

HydrogenSulfate · 2023-10-26T11:08:40Z

docs/zh/examples/deepcfd.md

+``` py linenums="47" title="examples/deepcfd/conf/deepcfd.yaml"
 --8<--
-examples/deepcfd/deepcfd.py:298:301
+examples/deepcfd/conf/deepcfd.yaml:47:51
 --8<--
 ```


==> ``` yaml

HydrogenSulfate · 2023-10-26T11:09:24Z

docs/zh/examples/deepcfd.md


 ### 3.5 优化器构建
-训练过程会调用优化器来更新模型参数，此处选择较为常用的 `Adam` 优化器，学习率设置为 0.001。
+训练过程会调用优化器来更新模型参数，此处选择较为常用的 `Adam` 优化器，学习率设置为 0.001，权值衰减设置为 0.005。


==> 权重衰减

HydrogenSulfate · 2023-10-26T11:10:13Z

examples/deepcfd/conf/deepcfd.yaml

+
+# model settings
+MODEL:
+  unetex:


unetex这个字段可以删除，单模型的情况下，参数直接放到MODEL:字段下即可

HydrogenSulfate · 2023-10-26T11:12:36Z

examples/deepcfd/deepcfd.py

+    # 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")


==> eval.log

HydrogenSulfate · 2023-10-26T11:13:27Z

examples/deepcfd/deepcfd.py

-    CHANNEL_SIZE = 3
-    X_SIZE = 172
-    Y_SIZE = 79
+    model = ppsci.arch.UNetEx("input", "output", **cfg.MODEL.unetex)


input和output也可以放到配置文件里

HydrogenSulfate · 2023-10-26T11:13:31Z

examples/deepcfd/deepcfd.py

+    test_x, test_y = test_dataset
+
+    # initialize model
+    model = ppsci.arch.UNetEx("input", "output", **cfg.MODEL.unetex)


HydrogenSulfate · 2023-10-26T11:14:41Z

examples/deepcfd/deepcfd.py

+
+    PLOT_DIR = os.path.join(cfg.output_dir, "visual")
    os.makedirs(PLOT_DIR, exist_ok=True)
    VISU_INDEX = 0


VISU_INDEX这个变量可以删掉，因为没有第二个使用它的地方

好的已修改

HydrogenSulfate

其他没什么问题了，辛苦大佬修改，顺便麻烦合一下最新的develop分支，里面解决了ldc2d_steady在CI上挂掉的问题

HydrogenSulfate · 2023-10-27T02:54:40Z

examples/deepcfd/deepcfd.py

+    )(model)

    # manually build validator
    eval_dataloader_cfg = {


train函数里的eval_dataloader_cfg的batchsize改成cfg里的参数

好的，辛苦大佬 review

… into dc

HydrogenSulfate

LGTM

* adapt DeepCFD to hydra * fix * fix * fix * fix

adapt DeepCFD to hydra

e8d6e2e

paddle-bot bot added the contributor label Oct 20, 2023

luotao1 added the HappyOpenSource 快乐开源活动issue与PR label Oct 20, 2023

luotao1 assigned luotao1 and HydrogenSulfate Oct 20, 2023

luotao1 changed the title ~~Adapt DeepCFD to hydra~~ 【hydra No.18】Adapt DeepCFD to hydra Oct 20, 2023

luotao1 mentioned this pull request Oct 20, 2023

【快乐开源】基于hydra的案例改造计划 #571

Closed

fix

d0de9e8

HydrogenSulfate requested changes Oct 26, 2023

View reviewed changes

MayYouBeProsperous added 2 commits October 27, 2023 10:29

fix

8f3eb12

fix

cc48c8d

HydrogenSulfate requested changes Oct 27, 2023

View reviewed changes

MayYouBeProsperous added 2 commits October 27, 2023 11:04

Merge branch 'develop' of https://github.com/PaddlePaddle/PaddleScience…

472a769

… into dc

fix

34544a3

HydrogenSulfate approved these changes Oct 27, 2023

View reviewed changes

HydrogenSulfate merged commit b3bad65 into PaddlePaddle:develop Oct 27, 2023

huohuohuohuohuo123 pushed a commit to huohuohuohuohuo123/PaddleScience that referenced this pull request Aug 12, 2024

【hydra No.18】Adapt DeepCFD to hydra (PaddlePaddle#583)

ae693ec

* adapt DeepCFD to hydra * fix * fix * fix * fix

【hydra No.18】Adapt DeepCFD to hydra #583

【hydra No.18】Adapt DeepCFD to hydra #583

Uh oh!

Conversation

MayYouBeProsperous commented Oct 20, 2023

PR types

PR changes

Describe

Uh oh!

paddle-bot bot commented Oct 20, 2023

Uh oh!

HydrogenSulfate left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

HydrogenSulfate left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

HydrogenSulfate left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

HydrogenSulfate left a comment •

edited

Loading