fix error by drop_kids in python

Author: 0x45f

paddle/fluid/pybind/pybind.cc

@@ -1241,6 +1241,17 @@ All parameter, weight, gradient are variables in Paddle.
              return self.GetMutable<framework::ReaderHolder>();
            },
            py::return_value_policy::reference)
+      .def("get_scope",
+           [](Variable &self) -> Scope * {
+             auto scope_vec =
+                 self.GetMutable<std::vector<framework::Scope *>>();
+             PADDLE_ENFORCE_GT(
+                 scope_vec->size(), 0,
+                 platform::errors::InvalidArgument(
+                     "The size of scope_vec should greater than 0"));
+             return scope_vec->front();
+           },
+           py::return_value_policy::reference)
       .def("set_scope", [](Variable &self, Scope &scope) {
         auto scope_vec = self.GetMutable<std::vector<framework::Scope *>>();
         scope_vec->emplace_back(&scope);

python/paddle/fluid/dygraph/dygraph_to_static/partial_program.py

@@ -290,23 +290,26 @@ def __call__(self, inputs):
             self._valid_vars(self._params),
             self._valid_vars(out_vars), self._tmp_scope_vec, self._double_grads,
             *attrs)
-
+        self.drop_kids_in_nograd()
         restored_nest_out = self._restore_out(out_vars)
         return self._remove_no_value(restored_nest_out)
 
+    def drop_kids_in_nograd(self):
+        tracer = framework._dygraph_tracer()
+        if self.training and not tracer._has_grad:
+            self._tmp_scope_vec.value().get_scope().drop_kids()
+
     @property
     def program(self):
-        tracer = framework._dygraph_tracer()
-        if self.training and tracer._has_grad:
+        if self.training:
             return self._train_amp_program if _in_amp_guard(
             ) else self._train_program
         else:
             return self._infer_program
 
     @property
     def program_id(self):
-        tracer = framework._dygraph_tracer()
-        if self.training and tracer._has_grad:
+        if self.training:
             return self._train_amp_program_id if _in_amp_guard(
             ) else self._train_program_id
         else:

python/paddle/fluid/tests/unittests/dygraph_to_static/test_partial_program.py

@@ -152,26 +152,6 @@ def test_switch_eval_and_train(self):
                              partial_layer._train_program)
 
 
-class TestWithNoGrad(unittest.TestCase):
-    def test_with_no_grad(self):
-        with fluid.dygraph.guard():
-            linear_net = Linear()
-            x_data = np.random.random((5, 10)).astype('float32')
-            x = fluid.dygraph.to_variable(x_data)
-
-            linear_net.train()
-            linear_net(x)
-
-            _, partial_layer = linear_net.forward.program_cache.last()[-1]
-            self.assertEqual(partial_layer.program,
-                             partial_layer._train_program)
-
-            with paddle.no_grad():
-                linear_net(x)
-                self.assertEqual(partial_layer.program,
-                                 partial_layer._infer_program)
-
-
 class GPT2LMHeadModel(fluid.dygraph.Layer):
     def __init__(self):
         super(GPT2LMHeadModel, self).__init__()