Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -83,5 +83,10 @@ def is_grad_api_node(node):
assert isinstance(node, gast.Call)
api_name = utils.ast_to_source_code(node.func).strip()
if utils.is_paddle_api(node):
if 'no_grad' in api_name:
warnings.warn(
"paddle.no_grad is only supported for inference model, and not supported for training under @to_static."
)
return False
return api_name.endswith("grad")
return False
38 changes: 32 additions & 6 deletions python/paddle/fluid/tests/unittests/dygraph_to_static/test_grad.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,22 @@ def forward(self, x):
return dx


class NoGradLinearLayer(paddle.nn.Layer):
def __init__(self):
super(NoGradLinearLayer, self).__init__()
self.linear = paddle.nn.Linear(5, 5, bias_attr=False)

@paddle.jit.to_static
def forward(self, x):
x.stop_gradient = False

with paddle.no_grad():
y = self.linear(x)

out = y + x
return out


class TestGrad(unittest.TestCase):
def setUp(self):
self.func = GradLayer()
Expand All @@ -72,15 +88,16 @@ def setUp(self):
self.func = GradLinearLayer()
self.x = paddle.ones(shape=[10, 2, 5], dtype='float32')
self.x.stop_gradient = False
self.infer_model_path = "double_grad_infer_model"
self.train_model_path = "double_grad_train_model"

def test_save_infer_program(self):
path = "double_grad_infer_model"
input_spec = [
paddle.static.InputSpec(
shape=[10, 2, 5], dtype='float32')
]
paddle.jit.save(self.func, path, input_spec=input_spec)
load_func = paddle.jit.load(path)
paddle.jit.save(self.func, self.infer_model_path, input_spec=input_spec)
load_func = paddle.jit.load(self.infer_model_path)

origin_res = self.func(self.x).numpy()
load_res = load_func(self.x).numpy()
Expand All @@ -96,16 +113,25 @@ def test_save_train_program(self):
avg_loss = paddle.mean(paddle.abs(out - 1))
avg_loss.backward()
optimizer.minimize(avg_loss)
print(self.x.grad.mean())
self.func.clear_gradients()

path = "double_grad_train_model"
paddle.jit.save(self.func, path)
load_func = paddle.jit.load(path)
paddle.jit.save(self.func, self.train_model_path)
load_func = paddle.jit.load(self.train_model_path)

origin_res = self.func(self.x).numpy()
load_res = load_func(self.x).numpy()
self.assertTrue(np.allclose(origin_res, load_res))


class TestNoGradLinear(TestGradLinear):
def setUp(self):
self.func = NoGradLinearLayer()
self.x = paddle.ones(shape=[10, 2, 5], dtype='float32')
self.x.stop_gradient = False
self.infer_model_path = "no_grad_infer_model"
self.train_model_path = "no_grad_train_model"


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