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.

Sign up for GitHub

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

[Dy2stat]Fix error in tensor_shape_transformer. #37999

Merged
merged 3 commits into from
Dec 15, 2021
Merged

[Dy2stat]Fix error in tensor_shape_transformer. #37999

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
66822d6
fix error when tensor_shape_transformer. Before in stmt like `if len(…
Dec 9, 2021
c1a8668
handle other call like `fluid.layers.mean` and `fluid.layers.shape`
Dec 9, 2021
31b8941
add unit test
Dec 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions python/paddle/fluid/dygraph/dygraph_to_static/tensor_shape_transformer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,10 @@ def _is_var_shape(self, node):
return False

if isinstance(node, gast.Attribute):
# If node is `paddle.shape`, return False
if (node.attr == 'shape' and isinstance(node.value, gast.Name) and
node.value.id == 'paddle'):
return False
if node.attr != 'shape':
return False
return True
Expand Down
12 changes: 12 additions & 0 deletions python/paddle/fluid/tests/unittests/dygraph_to_static/test_tensor_shape.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,12 @@ def dyfunc_change_shape_after_assign(x):
return res


def dyfunc_len_paddle_shape():
x = paddle.to_tensor([1, 2, 3])
if len(paddle.shape(x)) > 0:
print(x)


# 1. Basic tests without control flow
class TestTensorShapeBasic(unittest.TestCase):
def setUp(self):
Expand Down Expand Up @@ -582,5 +588,11 @@ def test(self):
func.concrete_program


class TestPaddleShape(unittest.TestCase):
def test_paddle_shape(self):
func = paddle.jit.to_static(dyfunc_len_paddle_shape)
self.assertEqual('paddle.shape(x)' in func.code, True)


if __name__ == '__main__':
unittest.main()