【PPSCI Export&Infer No. 29】 add export and inference #793
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! |
HydrogenSulfate
requested changes
Mar 3, 2024
| === "模型导出命令" | ||
|
|
||
| ``` sh | ||
| python topopt.py mode=export INFER.pretrained_model_name=Uniform |
There was a problem hiding this comment.
是否可以以注释的形式补充另外几个Poisson系列的模型呢？模型推理命令同
examples/topopt/conf/topopt.yaml
Outdated
| @@ -14,8 +14,13 @@ hydra: | |||
| - EVAL.pretrained_model_path_dict | |||
| - EVAL.batch_size | |||
| - EVAL.num_val_step | |||
| - EXPORT.pretrained_model_name | |||
examples/topopt/conf/topopt.yaml
Outdated
| INFER: | ||
| pretrained_model_name: null # a string, indicating which model you want to export. Support [Uniform, Poisson5, Poisson10, Poisson30]. | ||
| pretrained_model_path_dict: {'Uniform': 'https://paddle-org.bj.bcebos.com/paddlescience/models/topopt/uniform_pretrained.pdparams', 'Poisson5': 'https://paddle-org.bj.bcebos.com/paddlescience/models/topopt/poisson5_pretrained.pdparams', 'Poisson10': 'https://paddle-org.bj.bcebos.com/paddlescience/models/topopt/poisson10_pretrained.pdparams', 'Poisson30': 'https://paddle-org.bj.bcebos.com/paddlescience/models/topopt/poisson30_pretrained.pdparams'} | ||
| export_path: ./inference/topopt |
There was a problem hiding this comment.
如果在pretrained_model_path_dict里的模型是互相独立的，可以把export_path改为./inference/topopt_${INFER.pretrained_model_name}
examples/topopt/conf/topopt.yaml
Outdated
| sampler_num: 8 # a integer number, indicating the sampling rate of the sampling method, supported when `sampler_key` is Fixed or Poisson. | ||
| img_num: 4 | ||
| res_img_figsize: null | ||
| save_res_path: ./inference/predicted |
There was a problem hiding this comment.
此处的save_res_path也可以改为./inference/predicted_${INFER.pretrained_model_name}
examples/topopt/topopt.py
Outdated
| model, | ||
| eval_with_no_grad=True, | ||
| pretrained_model_path=cfg.INFER.pretrained_model_path_dict[ | ||
| cfg.EXPORT.pretrained_model_name |
examples/topopt/topopt.py
Outdated
| solver.export(input_spec, cfg.INFER.export_path) | ||
|
|
||
|
|
||
| # model inference |
examples/topopt/topopt.py
Outdated
Comment on lines
389
to
391
| def save_topopt_img( | ||
| input_dict, output_dict, ground_truth, res_path, figsize=None, npy=False | ||
| ): |
There was a problem hiding this comment.
- save_topopt_img函数可以加一下typehint
- 为了更容易理解和更符合语义，建议这两个参数名改一下：
npy->save_npy，res_path->save_dir
examples/topopt/topopt.py
Outdated
Comment on lines
408
to
413
| print(output[i]) | ||
| plt.title("Prediction") | ||
| plt.subplot(1, 4, 4) | ||
| plt.axis("off") | ||
| plt.imshow(np.round(ground_truth[i][0]), cmap="gray") | ||
| print(ground_truth[i]) |
There was a problem hiding this comment.
两处print可以删除，否则会打印大量矩阵元素，如果是为了友好提示可以在for循环的最后一行使用logger.message信息打印保存成功的提示
examples/topopt/topopt.py
Outdated
Comment on lines
416
to
419
| plt.savefig(osp.join(res_path, "Prediction_" + str(i) + ".png")) | ||
| plt.close() | ||
| if npy: | ||
| with open(osp(res_path, "Prediction_" + str(i) + ".npy"), "wb") as f: |
There was a problem hiding this comment.
两处字符串拼接改为f-string："Prediction_" + str(i) + ".png"改为f"Prediction_{i}.png"
| ): | ||
|
|
||
| input = input_dict["input"] | ||
| output = output_dict["output"] |
There was a problem hiding this comment.
保存前先创建文件夹，否则会报错
Suggested change
| output = output_dict["output"] | |
| output = output_dict["output"] | |
| import os | |
| os.makedirs(res_path, exist_ok=True) |
HydrogenSulfate
requested changes
Mar 3, 2024
examples/topopt/topopt.py
Outdated
Comment on lines
20
to
29
| import matplotlib.pyplot as plt | ||
| import numpy as np | ||
| import paddle | ||
| from omegaconf import DictConfig | ||
| from paddle import nn | ||
| from paddle.static import InputSpec | ||
| from topoptmodel import TopOptNN | ||
|
|
||
| import ppsci | ||
| from deploy.python_infer import pinn_predictor |
There was a problem hiding this comment.
这几行import建议放在对应函数内部，否则会影响整体topopt的代码块行数定位
已验证推理结果符合预期 |
huohuohuohuohuo123
pushed a commit
to huohuohuohuohuo123/PaddleScience
that referenced
this pull request
Aug 12, 2024
* add export and inference * update
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in 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
#788