remove nets.py in fluid #51717

longranger2 · 2023-03-15T12:43:08Z

PR types

Others

PR changes

APIs

Description

To clean the code in paddle.fluid, the useless codes should be removed and code still be used should move to a new position.

fluid 目录下的 nets.py 包含较多预定义的简单网络，已基本在1期工作中改成了2.0API组网。只在单测使用，因此将其迁移到单测里提供单测的组网依赖。

paddle-bot · 2023-03-15T12:43:12Z

你的PR提交成功，感谢你对开源项目的贡献!
请关注后续CI自动化测试结果，详情请参考Paddle-CI手册。
Your PR has been submitted. Thanks for your contribution!
Please wait for the result of CI firstly. See Paddle CI Manual for details.

zoooo0820 · 2023-03-16T02:48:44Z

python/paddle/fluid/tests/unittests/nets.py


 __all__ = [
    "simple_img_conv_pool",
    "sequence_conv_pool",
-    "glu",
    "scaled_dot_product_attention",
    "img_conv_group",
 ]


__all__没必要保留了

zoooo0820 · 2023-03-16T02:57:40Z

python/paddle/fluid/tests/unittests/nets.py

-    out = paddle.multiply(x=a, y=act_b)
-    return out
-
-
 def scaled_dot_product_attention(


需要明确每条单测的作用，进而确定单测使用到的函数的作用，原则上我们不为某个单测保留函数：

如果某个单测核心目的是测试某个其他功能，只是借助到这里的某个函数组网，那么这个函数可以作为依赖保留。例如simple_img_conv_pool

如果某个单测的核心目的就是测试这个函数，那么如果函数可以移除的话，单测也相应移除即可。例如scaled_dot_product_attention。

zoooo0820 · 2023-03-16T02:59:47Z

python/paddle/fluid/tests/unittests/test_glu.py

@@ -41,7 +41,7 @@ def setUp(self):
    def check_identity(self, place):
        with dg.guard(place):
            x_var = dg.to_variable(self.x)
-            y_var = fluid.nets.glu(x_var, self.dim)
+            y_var = paddle.nn.functional.glu(x_var, self.dim)


下面已有一个测试nn.functional.glu 的单测TestGLUV2,这个单测可直接移除

zoooo0820 · 2023-03-16T03:00:48Z

python/paddle/fluid/tests/unittests/test_layers.py

@@ -23,7 +23,7 @@
 import paddle
 import paddle.fluid as fluid
 import paddle.fluid.layers as layers
-import paddle.fluid.nets as nets
+import paddle.fluid.tests.unittests.nets as nets


这里能否直接用.nets,这样使用会有类似API的感觉，下同。

longranger2 · 2023-03-16T07:57:30Z

修改好了～

zoooo0820 · 2023-03-16T08:04:25Z

python/paddle/fluid/tests/unittests/test_async_ssa_graph_executor_mnist.py

-                use_double_buffer=False,
-            )
-
-        conv_pool_1 = fluid.nets.simple_img_conv_pool(


这个单测，从文件名看是测试执行器的，不应当在这个PR里移除

我刚提交PR的时候发生冲突，发现这个文件test_async_ssa_graph_executor_mnist.py已经整个被删除了，所以才把这个文件删了来解决冲突的

zoooo0820 · 2023-03-16T08:06:02Z

python/paddle/fluid/tests/unittests/test_multihead_attention.py

@@ -44,7 +46,7 @@ def set_program(self):
        )
        keys.stop_gradient = False

-        contexts = fluid.nets.scaled_dot_product_attention(
+        contexts = nets.scaled_dot_product_attention(


这个函数已经在上面移除了，会报错。另外这个单测中，本质是测试这一个api的网络，看起来这个单测可以整体移除掉。

…o fluid_net

zoooo0820

LGTM

XieYunshen

LGTM
单测删除

zhwesky2010

LGTM for rm UT

zhwesky2010

lgtm for rm UT

longranger2 · 2023-06-08T09:45:46Z

book目录下的cmake和contrib目录下的cmake 定义的函数py_test对Linux/win效果不一样。

分布式文件因为在win下不跑所以没这个问题

jeff41404

LGTM

sunzhongkai588

no doc's changes. LGTM

XiaoguangHu01

LGTM

longranger2 added 6 commits March 15, 2023 17:11

remove function sequence_conv_pool

37076c6

fix test_glu.py

c188174

remove function scaled_dot_product_attention

f4a399b

remove function img_conv_group

09950a7

remove function simple_img_conv_pool

050f926

delete the nets.py

d461807

paddle-bot bot added contributor External developers status: proposed labels Mar 15, 2023

longranger2 added 2 commits March 15, 2023 20:46

fix bug

22a7f00

Merge branch 'PaddlePaddle:develop' into fluid_net

c3ab29a

zoooo0820 reviewed Mar 16, 2023

View reviewed changes

longranger2 added 2 commits March 16, 2023 07:42

fix bug

69fa7cc

fix bug

091a1de

zoooo0820 reviewed Mar 16, 2023

View reviewed changes

longranger2 added 14 commits March 17, 2023 13:03

fix bug

a70792a

fix bug

b2dc097

Merge branch 'PaddlePaddle:develop' into fluid_net

26ab5a9

fix bug

30f8f0d

Merge branch 'fluid_net' of https://github.com/longranger2/Paddle int…

1845822

…o fluid_net

Merge branch 'PaddlePaddle:develop' into fluid_net

f6df32a

Update test_image_classification.py

e6242f6

Update test_recognize_digits.py

64d1490

Update test_recommender_system.py

a845abb

Update test_image_classification_fp16.py

01c85b4

Merge branch 'PaddlePaddle:develop' into fluid_net

783000f

fix bug

3c26078

fix bug

847c19e

fix bug

3b90121

longranger2 added 3 commits June 5, 2023 16:33

Merge branch 'PaddlePaddle:develop' into fluid_net

f784428

fix bug

ce723f5

fix the codestyle

eceae44

longranger2 requested a review from zoooo0820 June 6, 2023 00:35

zoooo0820 previously approved these changes Jun 6, 2023

View reviewed changes

XieYunshen previously approved these changes Jun 6, 2023

View reviewed changes

longranger2 dismissed stale reviews from XieYunshen and zoooo0820 via 193cc19 June 6, 2023 13:35

longranger2 requested a review from XieYunshen June 7, 2023 02:02

zhwesky2010 previously approved these changes Jun 7, 2023

View reviewed changes

longranger2 requested a review from zoooo0820 June 7, 2023 08:23

longranger2 dismissed zhwesky2010’s stale review via be52d05 June 8, 2023 03:29

longranger2 force-pushed the fluid_net branch from 193cc19 to be52d05 Compare June 8, 2023 03:29

zhwesky2010 reviewed Jun 8, 2023

View reviewed changes

longranger2 force-pushed the fluid_net branch from da9c8c2 to eceae44 Compare June 20, 2023 12:57

Merge branch 'PaddlePaddle:develop' into fluid_net

316f736

longranger2 requested a review from zhwesky2010 June 21, 2023 06:34

longranger2 added 2 commits June 25, 2023 10:59

fix conflict

03f3a31

fix conflict

54be8ec

XieYunshen previously approved these changes Jun 26, 2023

View reviewed changes

fix bug

37c8cd4

longranger2 dismissed XieYunshen’s stale review via 37c8cd4 June 27, 2023 08:19

Fix TODO

11daecf

XieYunshen approved these changes Jun 28, 2023

View reviewed changes

jeff41404 approved these changes Jun 28, 2023

View reviewed changes

sunzhongkai588 approved these changes Jun 28, 2023

View reviewed changes

luotao1 approved these changes Jun 28, 2023

View reviewed changes

XiaoguangHu01 approved these changes Jun 28, 2023

View reviewed changes

jeff41404 merged commit 87f7210 into PaddlePaddle:develop Jun 28, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

remove nets.py in fluid #51717

remove nets.py in fluid #51717

longranger2 commented Mar 15, 2023 •

edited

Loading

paddle-bot bot commented Mar 15, 2023

zoooo0820 Mar 16, 2023

zoooo0820 Mar 16, 2023

zoooo0820 Mar 16, 2023

zoooo0820 Mar 16, 2023

longranger2 commented Mar 16, 2023

zoooo0820 Mar 16, 2023

longranger2 Mar 16, 2023

zoooo0820 Mar 16, 2023

zoooo0820 left a comment

XieYunshen left a comment

zhwesky2010 left a comment

zhwesky2010 left a comment

longranger2 commented Jun 8, 2023 •

edited

Loading

jeff41404 left a comment

sunzhongkai588 left a comment

XiaoguangHu01 left a comment

remove nets.py in fluid #51717

remove nets.py in fluid #51717

Conversation

longranger2 commented Mar 15, 2023 • edited Loading

PR types

PR changes

Description

paddle-bot bot commented Mar 15, 2023

zoooo0820 Mar 16, 2023

Choose a reason for hiding this comment

zoooo0820 Mar 16, 2023

Choose a reason for hiding this comment

zoooo0820 Mar 16, 2023

Choose a reason for hiding this comment

zoooo0820 Mar 16, 2023

Choose a reason for hiding this comment

longranger2 commented Mar 16, 2023

zoooo0820 Mar 16, 2023

Choose a reason for hiding this comment

longranger2 Mar 16, 2023

Choose a reason for hiding this comment

zoooo0820 Mar 16, 2023

Choose a reason for hiding this comment

zoooo0820 left a comment

Choose a reason for hiding this comment

XieYunshen left a comment

Choose a reason for hiding this comment

zhwesky2010 left a comment

Choose a reason for hiding this comment

zhwesky2010 left a comment

Choose a reason for hiding this comment

longranger2 commented Jun 8, 2023 • edited Loading

jeff41404 left a comment

Choose a reason for hiding this comment

sunzhongkai588 left a comment

Choose a reason for hiding this comment

XiaoguangHu01 left a comment

Choose a reason for hiding this comment

longranger2 commented Mar 15, 2023 •

edited

Loading

longranger2 commented Jun 8, 2023 •

edited

Loading