为equatiohn/pde/linear_elasticity.py添加单元测试 #416

ruoyunbai · 2023-07-02T17:20:49Z

PR types

Others

PR changes

Others

Describe

为equatiohn/pde/linear_elasticity.py添加单元测试

test:equation/pde/linear_elasticity.py

paddle-bot · 2023-07-02T17:20:53Z

Thanks for your contribution!

HydrogenSulfate · 2023-07-03T06:51:40Z

这个单测的认领人好像不是你这个账号

HydrogenSulfate · 2023-07-03T12:00:02Z

test/equation/test_linear_elasticity.py

+import pytest
+from paddle import nn
+
+from ppsci.equation import LinearElasticity


不要从模块中直接导入某一个类，改为 from ppsci import equation

HydrogenSulfate · 2023-07-03T12:00:41Z

test/equation/test_linear_elasticity.py

+
+
+def jacobian(y: paddle.Tensor, x: paddle.Tensor) -> paddle.Tensor:
+    return paddle.grad(y, x, create_graph=True, allow_unused=True)[0]


去掉 allow_unused=True

HydrogenSulfate · 2023-07-03T13:00:31Z

test/equation/test_linear_elasticity.py

+def jacobian(y: paddle.Tensor, x: paddle.Tensor) -> paddle.Tensor:
+    return paddle.grad(y, x, create_graph=True, allow_unused=True)[0]
+
+
+def hessian(y: paddle.Tensor, x: paddle.Tensor) -> paddle.Tensor:
+    return jacobian(jacobian(y, x), x)


jacobian 和 hessian 的函数移动到所有函数的上方

HydrogenSulfate · 2023-07-03T13:01:35Z

test/equation/test_linear_elasticity.py

+        sigma_xx, sigma_xy, sigma_xz, sigma_yy, sigma_yz, sigma_zz = (
+            output[:, 3:4],
+            output[:, 4:5],
+            output[:, 5:6],
+            output[:, 6:7],
+            output[:, 7:8],
+            output[:, 8:9],
+        )


用 paddle.split 而不是手动切片得到各个分量的结果

HydrogenSulfate · 2023-07-03T13:21:30Z

test/equation/test_linear_elasticity.py

+if __name__ == "__main__":
+    pytest.main()
+
+# test_linear_elasticity_navier_y(1e4, 0.3, None, None, 1, 2, True)


删除注释

HydrogenSulfate · 2023-07-03T13:22:14Z

test/equation/test_linear_elasticity.py

+    "E, nu, lambda_, mu, rho, dim, time",
+    [
+        (1e4, 0.3, None, None, 1, 2, False),
+        (1e4, 0.3, None, None, 1, 2, True),
+        (1e4, 0.3, None, None, 1, 3, False),
+        (1e4, 0.3, None, None, 1, 3, True),
+    ],


目前这个类还未添加对 E 和 nu 的处理逻辑，应该为 E 和 nu 设置为None，而 lambda_ 和 mu 设置为实数值

ruoyunbai · 2023-07-04T05:46:16Z

这个单测的认领人好像不是你这个账号

老师让我看看这个，我没认领/(ㄒoㄒ)/~~

HydrogenSulfate · 2023-07-04T05:53:35Z

这个单测的认领人好像不是你这个账号

老师让我看看这个，我没认领/(ㄒoㄒ)/~~

那没事儿，可以按照review改一下，到时候合你的PR

ruoyunbai · 2023-07-04T06:07:26Z

好滴，正在改

ruoyunbai · 2023-07-04T12:29:46Z

已经按照review修改，请过目

HydrogenSulfate · 2023-07-05T03:56:57Z

test/equation/test_linear_elasticity.py

+    if lambda_ is None or mu is None:
+        lambda_ = (E * nu) / ((1 + nu) * (1 - 2 * nu))
+        mu = E / (2 * (1 + nu))


目前 LinearElasticity 对给定 E和nu的情况没有进行处理，可以先把这部分的单测case和相关代码删掉

HydrogenSulfate · 2023-07-05T03:57:02Z

test/equation/test_linear_elasticity.py

+        (1e4, 0.3, None, None, 1, 2, False),
+        (1e4, 0.3, None, None, 1, 2, True),
+        (1e4, 0.3, None, None, 1, 3, False),
+        (1e4, 0.3, None, None, 1, 3, True),


目前 LinearElasticity 对给定 E和nu的情况没有进行处理，可以先把这部分的单测case删掉

HydrogenSulfate · 2023-07-05T03:57:13Z

test/equation/test_linear_elasticity.py

+    # generate output through the model
+    output = model(input_data)
+
+    # 提取输出中的u, v, w, sigma_xx, sigma_xy, sigma_xz, sigma_yy, sigma_yz, sigma_zz


删除这行注释

HydrogenSulfate · 2023-07-05T03:59:39Z

test/equation/test_linear_elasticity.py

+    test_stress_disp_xx = linear_elasticity.equations["stress_disp_xx"](data_dict)
+    test_stress_disp_yy = linear_elasticity.equations["stress_disp_yy"](data_dict)
+    test_stress_disp_xy = linear_elasticity.equations["stress_disp_xy"](data_dict)
+    test_equilibrium_x = linear_elasticity.equations["equilibrium_x"](data_dict)
+    test_equilibrium_y = linear_elasticity.equations["equilibrium_y"](data_dict)
+    test_navier_x = linear_elasticity.equations["navier_x"](data_dict)
+    test_navier_y = linear_elasticity.equations["navier_y"](data_dict)
+    test_traction_x = linear_elasticity.equations["traction_x"](data_dict)
+    test_traction_y = linear_elasticity.equations["traction_y"](data_dict)
+    if dim == 3:
+        test_stress_zz = linear_elasticity.equations["stress_disp_zz"](data_dict)
+        test_stress_xz = linear_elasticity.equations["stress_disp_xz"](data_dict)
+        test_stress_yz = linear_elasticity.equations["stress_disp_yz"](data_dict)
+        test_equilibrium_z = linear_elasticity.equations["equilibrium_z"](data_dict)
+        test_navier_z = linear_elasticity.equations["navier_z"](data_dict)
+        test_traction_z = linear_elasticity.equations["traction_z"](data_dict)
+
+    assert paddle.allclose(expected_stress_disp_xx, test_stress_disp_xx)
+    assert paddle.allclose(expected_stress_disp_yy, test_stress_disp_yy)
+    assert paddle.allclose(expected_stress_disp_xy, test_stress_disp_xy)
+    assert paddle.allclose(expected_equilibrium_x, test_equilibrium_x)
+    assert paddle.allclose(expected_equilibrium_y, test_equilibrium_y)
+    assert paddle.allclose(expected_navier_x, test_navier_x)
+    assert paddle.allclose(expected_navier_y, test_navier_y)
+    assert paddle.allclose(expected_traction_x, test_traction_x)
+    assert paddle.allclose(expected_traction_y, test_traction_y)
+    if dim == 3:
+        assert paddle.allclose(expected_stress_disp_zz, test_stress_zz)
+        assert paddle.allclose(expected_stress_disp_xz, test_stress_xz)
+        assert paddle.allclose(expected_stress_disp_yz, test_stress_yz)
+        assert paddle.allclose(expected_equilibrium_z, test_equilibrium_z)
+        assert paddle.allclose(expected_traction_z, test_traction_z)
+        assert paddle.allclose(expected_navier_z, test_navier_z)


把test_xxx用for循环放到字典里，减少冗余代码

test_output_names = ["stress_disp_xx", "stress_disp_yy", ...] test_output = {} for name in test_output_names: test_output[name] = linear_elasticity.equations[name](data_dict)

下面的 assert 同理

好滴，马上改

HydrogenSulfate · 2023-07-06T02:18:52Z

test/equation/test_linear_elasticity.py

+    linear_elasticity = equation.LinearElasticity(
+        E=None, nu=None, lambda_=lambda_, mu=mu, rho=rho, dim=dim, time=time
+    )


虽然E和nu暂时只会是None，但这里的E和nu应该用传进来的参数填写吧

HydrogenSulfate · 2023-07-06T02:20:31Z

test/equation/test_linear_elasticity.py

+    test_output_names = [
+        "stress_disp_xx",
+        "stress_disp_yy",
+        "stress_disp_xy",
+        "equilibrium_x",
+        "equilibrium_y",
+        "navier_x",
+        "navier_y",
+        "traction_x",
+        "traction_y",
+    ]
+    test_output = {}
+    for name in test_output_names:
+        test_output[name] = linear_elasticity.equations[name](data_dict)
+    test_output_names = [
+        "stress_disp_xx",
+        "stress_disp_yy",
+        "stress_disp_xy",
+        "equilibrium_x",
+        "equilibrium_y",
+        "navier_x",
+        "navier_y",
+        "traction_x",
+        "traction_y",
+    ]


这里为什么要给 test_output_names 赋值两次呢

test/equation/test_linear_elasticity.py

HydrogenSulfate

再改一处就OK了

HydrogenSulfate · 2023-07-07T06:11:41Z

test/equation/test_linear_elasticity.py

+    if dim == 3:
+        input_data = paddle.concat([input_data, z], axis=1)
+    if time:
+        input_data = paddle.concat([input_data, t], axis=1)


PaddleScience里，时间数据t如果有的话，会排在通道维度的最前面，input_data = paddle.concat([t, input_data], axis=1)

okok

感觉你应该理解错了，我的意思是时间t和其他通道的数据堆叠在一起时，应该排在第一个通道上……
也就是第 177行代码应该改成 input_data = paddle.concat([t, input_data], axis=1)

哦哦好的

…elop

HydrogenSulfate · 2023-07-07T07:38:27Z

test/equation/test_linear_elasticity.py

+    if dim == 3:
+        input_data = paddle.concat([input_data, z], axis=1)
+    if time:
+        input_data = paddle.concat([input_data, t], axis=1)


okok

感觉你应该理解错了，我的意思是时间t和其他通道的数据堆叠在一起时，应该排在第一个通道上……
也就是第 177行代码应该改成 input_data = paddle.concat([t, input_data], axis=1)

HydrogenSulfate

LGTM

luotao1 · 2023-07-10T03:51:22Z

hi, @ruoyunbai

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

* Create test_linear_elasticity.py test:equation/pde/linear_elasticity.py * Update test_linear_elasticity.py * fix:修正了review提出的问题 * fix:code style * fix:删除注释 * fix:code style * fix:重复代码 * Update test_linear_elasticity.py * time排在dim之前 * fix:t front * style

ruoyunbai added 2 commits July 3, 2023 00:59

Create test_linear_elasticity.py

3ac988e

test:equation/pde/linear_elasticity.py

Update test_linear_elasticity.py

49ddb06

paddle-bot bot added contributor status: proposed labels Jul 2, 2023

ruoyunbai changed the title ~~Develop~~ 为equatiohn/pde/linear_elasticity.py添加单元测试 Jul 2, 2023

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

luotao1 mentioned this pull request Jun 23, 2023

【快乐开源】为 PaddleScience 的 equation 模块添加单元测试 #378

Closed

luotao1 assigned luotao1 and HydrogenSulfate Jul 3, 2023

HydrogenSulfate requested changes Jul 3, 2023

View reviewed changes

ruoyunbai added 2 commits July 4, 2023 14:22

fix:修正了review提出的问题

0b96149

fix:code style

236a5f9

fix:删除注释

3ef9c5e

HydrogenSulfate requested changes Jul 5, 2023

View reviewed changes

fix:code style

0665d60

HydrogenSulfate requested changes Jul 6, 2023

View reviewed changes

ruoyunbai and others added 2 commits July 6, 2023 13:47

fix:重复代码

83d63e7

Update test_linear_elasticity.py

37defc8

HydrogenSulfate requested changes Jul 7, 2023

View reviewed changes

ruoyunbai added 2 commits July 7, 2023 14:41

time排在dim之前

2104ccd

Merge branch 'develop' of github.com:ruoyunbai/PaddleScience into dev…

6fc9381

…elop

HydrogenSulfate requested changes Jul 7, 2023

View reviewed changes

ruoyunbai added 2 commits July 9, 2023 15:38

fix:t front

0123570

style

519216c

HydrogenSulfate approved these changes Jul 10, 2023

View reviewed changes

HydrogenSulfate merged commit 83be9d9 into PaddlePaddle:develop Jul 10, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

为equatiohn/pde/linear_elasticity.py添加单元测试 #416

为equatiohn/pde/linear_elasticity.py添加单元测试 #416

ruoyunbai commented Jul 2, 2023

paddle-bot bot commented Jul 2, 2023

HydrogenSulfate commented Jul 3, 2023

HydrogenSulfate Jul 3, 2023

HydrogenSulfate Jul 3, 2023

HydrogenSulfate Jul 3, 2023

HydrogenSulfate Jul 3, 2023

HydrogenSulfate Jul 3, 2023

HydrogenSulfate Jul 3, 2023

ruoyunbai commented Jul 4, 2023

HydrogenSulfate commented Jul 4, 2023

ruoyunbai commented Jul 4, 2023

ruoyunbai commented Jul 4, 2023

HydrogenSulfate Jul 5, 2023 •

edited

Loading

HydrogenSulfate Jul 5, 2023

HydrogenSulfate Jul 5, 2023

HydrogenSulfate Jul 5, 2023 •

edited

Loading

ruoyunbai Jul 5, 2023

HydrogenSulfate Jul 6, 2023

ruoyunbai Jul 6, 2023

HydrogenSulfate Jul 6, 2023

ruoyunbai Jul 6, 2023

HydrogenSulfate left a comment

HydrogenSulfate Jul 7, 2023

ruoyunbai Jul 7, 2023

HydrogenSulfate Jul 7, 2023

ruoyunbai Jul 9, 2023

HydrogenSulfate Jul 7, 2023

HydrogenSulfate left a comment

luotao1 commented Jul 10, 2023



		def jacobian(y: paddle.Tensor, x: paddle.Tensor) -> paddle.Tensor:
		return paddle.grad(y, x, create_graph=True, allow_unused=True)[0]

为equatiohn/pde/linear_elasticity.py添加单元测试 #416

为equatiohn/pde/linear_elasticity.py添加单元测试 #416

Conversation

ruoyunbai commented Jul 2, 2023

PR types

PR changes

Describe

paddle-bot bot commented Jul 2, 2023

HydrogenSulfate commented Jul 3, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ruoyunbai commented Jul 4, 2023

HydrogenSulfate commented Jul 4, 2023

ruoyunbai commented Jul 4, 2023

ruoyunbai commented Jul 4, 2023

HydrogenSulfate Jul 5, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

HydrogenSulfate Jul 5, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

HydrogenSulfate left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

HydrogenSulfate left a comment

Choose a reason for hiding this comment

luotao1 commented Jul 10, 2023

HydrogenSulfate Jul 5, 2023 •

edited

Loading

HydrogenSulfate Jul 5, 2023 •

edited

Loading