Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GCNGalerkin+PINO论文复现 #566

Merged
merged 12 commits into from
Nov 8, 2023
Merged

Conversation

zlynna
Copy link
Contributor

@zlynna zlynna commented Oct 11, 2023

@paddle-bot
Copy link

paddle-bot bot commented Oct 11, 2023

Thanks for your contribution!

@paddle-bot
Copy link

paddle-bot bot commented Oct 11, 2023

❌ The PR is not created using PR's template. You can refer to this Demo.
Please use PR's template, it helps save our maintainers' time so that more developers get helped.

@CLAassistant
Copy link

CLAassistant commented Oct 11, 2023

CLA assistant check
All committers have signed the CLA.

Copy link
Contributor

@wangguan1995 wangguan1995 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

to fix

docs/images/deephpms/burgers_diff_lbfgs.png Outdated Show resolved Hide resolved
modelCircleDet.npy Outdated Show resolved Hide resolved
jointContribution/graphGalerkin/demo1/grad.txt Outdated Show resolved Hide resolved
jointContribution/graphGalerkin/demo1/init.pdparams Outdated Show resolved Hide resolved
jointContribution/graphGalerkin/demo1/param.txt Outdated Show resolved Hide resolved
jointContribution/graphGalerkin/demo0/result/Demo.pdf Outdated Show resolved Hide resolved
jointContribution/graphGalerkin/demo0/result/ErFinal.txt Outdated Show resolved Hide resolved
jointContribution/graphGalerkin/demo0/result/Loss.txt Outdated Show resolved Hide resolved
jointContribution/graphGalerkin/demo0/result/Demo.pdf Outdated Show resolved Hide resolved
@lijialin03
Copy link
Contributor

lijialin03 commented Oct 17, 2023

  1. 重新拉一下paddlescience develop,不要拉我fork的仓库里的,现在的版本不对,多了很多随着版本更新删掉的文件。可以改一下git远程仓库地址。
  2. 用 pre-commit 修正一下格式。
  3. 即使在同一个文件中,也把文件中不同功能的部分写成函数封装一下,比如训练部分写在main函数里,把画图部分单独写成函数并添加必要注释如 type hint(参考ppsci文件夹下的代码书写格式)。
  4. 尽量复用代码,如同一个demo下只是更换了结构/公式等,这也是上一条中对不同功能的代码进行封装的原因。

另外如果review的改完了,可以点一下resolved

jointContribution/graphGalerkin/demo0/DiskPossionHard.py Outdated Show resolved Hide resolved
# 3. 业内方案调研
## 3.1 解决的问题
本项目基于嵌入物理信息的图神经网络求解偏微分方程,方程主要以以下形式出现:
$$ \nabla \cdot F(u, \nabla u; \boldsymbol\mu) = S(u, \nabla u; \boldsymbol\mu) \: in \: \Omega $$
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

公式没有正常显示,点击
image

jointContribution/graphGalerkin/rfcs/graphGalerkin.md Outdated Show resolved Hide resolved
jointContribution/graphGalerkin/rfcs/graphGalerkin.md Outdated Show resolved Hide resolved
@lijialin03
Copy link
Contributor

删除多余文件

Copy link
Contributor

@wangguan1995 wangguan1995 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

delete useless files

jointContribution/PINO/PINO_paddle/Dockerfile Outdated Show resolved Hide resolved
jointContribution/PINO/PINO_paddle/models/fourier1d.py Outdated Show resolved Hide resolved
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

我理解,没用到2d.py

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

2d.py和3d.py都被用到了

jointContribution/PINO/PINO_paddle/.gitignore Outdated Show resolved Hide resolved
jointContribution/PINO/PINO_paddle/.dockerignore Outdated Show resolved Hide resolved
jointContribution/graphGalerkin/utils/GCNConv.py Outdated Show resolved Hide resolved
jointContribution/graphGalerkin/utils/GCNConv.py Outdated Show resolved Hide resolved
jointContribution/graphGalerkin/utils/GCNConv.py Outdated Show resolved Hide resolved
jointContribution/graphGalerkin/utils/GCNConv.py Outdated Show resolved Hide resolved
jointContribution/graphGalerkin/utils/helpers.py Outdated Show resolved Hide resolved
jointContribution/graphGalerkin/source/GCNNModel.py Outdated Show resolved Hide resolved
jointContribution/graphGalerkin/source/GCNNModel.py Outdated Show resolved Hide resolved
jointContribution/graphGalerkin/source/GCNNModel.py Outdated Show resolved Hide resolved
jointContribution/graphGalerkin/source/GCNNModel.py Outdated Show resolved Hide resolved
@lijialin03
Copy link
Contributor

lijialin03 commented Oct 29, 2023

辛苦大佬提交代码~
麻烦检查一下:

  1. 代码是否存在没有用到/不必要的部分和文件!是否可以不进行某些封装!
  2. 注释中是否存在问题,如废弃代码/中文注释/不恰当用词等
  3. 是否存在不正确的API,如paddle中不存在的API
  4. 代码是否简洁,如需要避免重复/冗余/废弃/嵌套过多的代码,尽量只保留必要代码
  5. 下面CI也有报错,需要检查一下代码中的问题
    谢谢

Copy link
Contributor

@lijialin03 lijialin03 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

现在是能跑通的吗……?
image
而且看下面流水线检查里的"code-style-check",一直都有错误,可以点开检查一下
以及删掉一些代码之后,比如TestNet已经找不到了,但是它依然写在import代码里
以及import的一些函数并没有被用到,比如灰色的这些
image
先整体检查一下,最起码代码需要跑通呀
另外,可以把这两个案例分开提一下pr,不然它俩都动不了

paddle.seed(1334)
from random import sample

sys.path.insert(0, 'pycamotk')
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这个文件放demo0下面之后,这样添加路径是调不到pycamotk的

from pyCaMOtk.solve_fem import solve_fem
from pyCaMOtk.visualize_fem import visualize_fem

sys.path.insert(0, 'source')
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

同上

@wangguan1995
Copy link
Contributor

现在是能跑通的吗……? image 而且看下面流水线检查里的"code-style-check",一直都有错误,可以点开检查一下 以及删掉一些代码之后,比如TestNet已经找不到了,但是它依然写在import代码里 以及import的一些函数并没有被用到,比如灰色的这些 image 先整体检查一下,最起码代码需要跑通呀 另外,可以把这两个案例分开提一下pr,不然它俩都动不了

可能是没有安装 pre-commit导致
参考 https://paddlescience-docs.readthedocs.io/zh/latest/zh/development/#41-pre-commit

@HydrogenSulfate HydrogenSulfate merged commit 014218a into PaddlePaddle:develop Nov 8, 2023
1 of 3 checks passed
@luotao1
Copy link
Collaborator

luotao1 commented Nov 8, 2023

hi, @zlynna

  • 非常感谢你对飞桨框架的贡献,我们正在运营一个PFCC组织,会通过定期分享技术知识与发布开发者主导任务的形式持续为飞桨框架做贡献,详情可见 https://github.com/luotao1 主页说明。
  • 如果你对PFCC有兴趣,请发送邮件至 [email protected],我们会邀请你加入~

huohuohuohuohuo123 pushed a commit to huohuohuohuohuo123/PaddleScience that referenced this pull request Aug 12, 2024
* add submodule as a git submodule

* pre commit

* change the md file

* md file

* review

* delete useless file

* delete useless file

* change the files according to the review

* change graphGalerkin

* change graphGalerkin

* graphGalerkin

* update1

---------

Co-authored-by: lijialin03 <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants