supplet several interface of static Variable to consistent with dygraph Tensor #33330

CtfGo · 2021-06-03T12:13:55Z

PR types

New features

PR changes

APIs

Describe

supplet several interface of static Variable to consistent with dygraph Tensor，including 1 property(ndim) and 4 methods( ndimension,dim,size,matmul,detach)， the preview of api document listed below：

paddle-bot-old · 2021-06-03T12:13:59Z

Thanks for your contribution!
Please wait for the result of CI firstly. See Paddle CI Manual for details.

…ph Tensor

… variable-keeping-with-ensor

…o/Paddle into variable-keeping-with-ensor

… variable-keeping-with-ensor

…_op_patch to fix ci converage

… variable-keeping-with-ensor

Aurelius84

LGTM

… variable-keeping-with-ensor

…o/Paddle into variable-keeping-with-ensor

zhhsplendid

I gave some comments, but you can change in next PR since you already passed some CIs.

I will approve this PR.

zhhsplendid · 2021-06-21T11:24:25Z

paddle/fluid/operators/share_data_op.cu

@@ -0,0 +1,25 @@
+/* Copyright (c) 2019 PaddlePaddle Authors. All Rights Reserved.


You can change in next PR:

2019 -> 2021

zhhsplendid · 2021-06-21T11:27:23Z

python/paddle/fluid/framework.py

        Returns a new Variable, detached from the current graph.
+        It will share data with origin Variable and always doesn't have a Tensor copy.


"and always doesn't have a Tensor copy" -> "without tensor copy"

zhhsplendid · 2021-06-21T11:30:01Z

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

+
+    @prog_scope()
+    def test_matmul(self):
+        a = fluid.layers.data(name='a', shape=[2, 3], dtype='float32')


You can change in next PR:

use 2.0 api instead of fluid API for the new code.

zhhsplendid · 2021-06-21T11:30:58Z

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

@@ -345,6 +344,52 @@ def _test():

        self.assertRaises(Exception, _test)

+    def test_size(self):
+        prog = paddle.static.Program()
+        with fluid.program_guard(prog):


You can change in next PR:

use 2.0 api instead of fluid API for the new code.

zhhsplendid · 2021-06-21T12:05:39Z

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

+                x = fluid.data(name='x', shape=[3, 2, 1], dtype='float32')
+                x.persistable = True
+                feed_data = np.ones(shape=[3, 2, 1], dtype=np.float32)
+                detach_x = x.detach()


Could we also test:

Change to detach_x would also change x

Change to x would also change detach_x

I have updated code with these tips, thank you.

… ut case

… variable-keeping-with-ensor

zhhsplendid

LGTM

chenwhql · 2021-06-23T06:38:49Z

python/paddle/fluid/framework.py

+
+        Examples:
+            .. code-block:: python
+            :name: code-example1


有文档预览的结果吗？麻烦将结果截图放到PR里

chenwhql · 2021-06-23T06:43:06Z

paddle/fluid/operators/share_data_op.cc

+class ShareDataOpMaker : public framework::OpProtoAndCheckerMaker {
+ public:
+  void Make() override {
+    AddInput("Input", "The input tensor.");


The input tensor of ShareData operator？

yes, used on static.Variable.detach

… variable-keeping-with-ensor

chenwhql

LGTM

zhangting2020

LGTM

zhhsplendid

LGTM

…ph Tensor (PaddlePaddle#33330) As the title

…o consistent with dygraph Tensor (#33330) #34401 As the title [cherry-pick][Dy2Stat]supplet several interface of static Variable to consistent with dygraph Tensor (#33330)

supplet several interface of static Variable to consistent with dygra…

e684e65

…ph Tensor

CtfGo force-pushed the variable-keeping-with-ensor branch from a3a6cf6 to e684e65 Compare June 3, 2021 12:50

CtfGo added 17 commits June 4, 2021 08:56

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

28e4836

… variable-keeping-with-ensor

implement Variable detach with adding share_data op

fcf1296

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

7456c18

… variable-keeping-with-ensor

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

32b24d9

… variable-keeping-with-ensor

Merge branch 'variable-keeping-with-ensor' of https://github.com/CtfG…

6711e56

…o/Paddle into variable-keeping-with-ensor

add framework.py

9b16add

fix ut

e73f754

fix ut

e4adeed

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

2764be8

… variable-keeping-with-ensor

fix ut gramma and add annotation

b2a7a1b

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

16fdb9a

… variable-keeping-with-ensor

move the unittests of added interface from test_variable to test_math…

7227cff

…_op_patch to fix ci converage

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

f2314ee

… variable-keeping-with-ensor

skip pre-commit of framework.py for clean diff

ec409db

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

48af9a7

… variable-keeping-with-ensor

skip pre-commit of framework.py for clean diff

6b0f8b3

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

cc37d2d

… variable-keeping-with-ensor

Aurelius84 previously approved these changes Jun 15, 2021

View reviewed changes

CtfGo added 2 commits June 16, 2021 06:41

fix ci ut converage

67837ee

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

1850dfc

… variable-keeping-with-ensor

CtfGo dismissed Aurelius84’s stale review via 1850dfc June 16, 2021 06:41

Merge branch 'develop' into variable-keeping-with-ensor

13aacdb

Aurelius84 previously approved these changes Jun 17, 2021

View reviewed changes

CtfGo added 3 commits June 18, 2021 11:46

remove ShareInplaceVersionCounterWith

9f3475d

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

dd05daa

… variable-keeping-with-ensor

Merge branch 'variable-keeping-with-ensor' of https://github.com/CtfG…

064cb42

…o/Paddle into variable-keeping-with-ensor

CtfGo dismissed Aurelius84’s stale review via 064cb42 June 18, 2021 11:50

zhhsplendid previously approved these changes Jun 21, 2021

View reviewed changes

CtfGo added 2 commits June 21, 2021 13:40

update some comments and api usage to 2.0, also add a Variable.detach…

3b1d04c

… ut case

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

58a9374

… variable-keeping-with-ensor

CtfGo dismissed zhhsplendid’s stale review via 58a9374 June 21, 2021 13:40

CtfGo added 5 commits June 22, 2021 02:13

fix ut

45c0ac4

revert format of vim auto-change

217459f

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

9e75f25

… variable-keeping-with-ensor

fix code format

58e7fcd

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

60c63bf

… variable-keeping-with-ensor

zhhsplendid previously approved these changes Jun 23, 2021

View reviewed changes

chenwhql reviewed Jun 23, 2021

View reviewed changes

CtfGo added 2 commits June 23, 2021 07:36

fix api docstring

d88cec9

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

85d4e88

… variable-keeping-with-ensor

CtfGo dismissed zhhsplendid’s stale review via 85d4e88 June 23, 2021 07:36

CtfGo added 3 commits June 23, 2021 11:47

fix docstring format

bdbeb60

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

2493b05

… variable-keeping-with-ensor

fix test_share_data_op

7c1d012

chenwhql approved these changes Jun 24, 2021

View reviewed changes

zhangting2020 approved these changes Jun 24, 2021

View reviewed changes

zhhsplendid approved these changes Jun 24, 2021

View reviewed changes

zhhsplendid merged commit af9dcb2 into PaddlePaddle:develop Jun 24, 2021

Aurelius84 pushed a commit to Aurelius84/Paddle that referenced this pull request Jul 26, 2021

supplet several interface of static Variable to consistent with dygra…

ecec416

…ph Tensor (PaddlePaddle#33330) As the title

Aurelius84 mentioned this pull request Jul 26, 2021

[cherry-pick][Dy2Stat]supplet several interface of static Variable to consistent with dygraph Tensor (#33330) #34401

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

supplet several interface of static Variable to consistent with dygraph Tensor #33330

supplet several interface of static Variable to consistent with dygraph Tensor #33330

CtfGo commented Jun 3, 2021 •

edited

Loading

paddle-bot-old bot commented Jun 3, 2021

Aurelius84 left a comment

zhhsplendid left a comment

zhhsplendid Jun 21, 2021

zhhsplendid Jun 21, 2021

zhhsplendid Jun 21, 2021

zhhsplendid Jun 21, 2021

zhhsplendid Jun 21, 2021

CtfGo Jun 23, 2021

zhhsplendid left a comment

chenwhql Jun 23, 2021

CtfGo Jun 23, 2021

chenwhql Jun 23, 2021

CtfGo Jun 23, 2021

chenwhql left a comment

zhangting2020 left a comment

zhhsplendid left a comment

		@@ -0,0 +1,25 @@
		/* Copyright (c) 2019 PaddlePaddle Authors. All Rights Reserved.

		Returns a new Variable, detached from the current graph.
		It will share data with origin Variable and always doesn't have a Tensor copy.

supplet several interface of static Variable to consistent with dygraph Tensor #33330

supplet several interface of static Variable to consistent with dygraph Tensor #33330

Conversation

CtfGo commented Jun 3, 2021 • edited Loading

PR types

PR changes

Describe

paddle-bot-old bot commented Jun 3, 2021

Aurelius84 left a comment

Choose a reason for hiding this comment

zhhsplendid 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

Choose a reason for hiding this comment

zhhsplendid 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

chenwhql left a comment

Choose a reason for hiding this comment

zhangting2020 left a comment

Choose a reason for hiding this comment

zhhsplendid left a comment

Choose a reason for hiding this comment

CtfGo commented Jun 3, 2021 •

edited

Loading