unify inplace_version checking log in new and old dygraph framework (#…

…41209) * change inplace_version checking log * fix
PaddlePaddle · Apr 1, 2022 · 93cb235 · 93cb235
1 parent c86e3a1
commit 93cb235
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 47 deletions.
diff --git a/paddle/fluid/eager/tensor_wrapper.h b/paddle/fluid/eager/tensor_wrapper.h
@@ -121,25 +121,25 @@ class TensorWrapper {
           static_cast<phi::DenseTensor*>(intermidiate_tensor_.impl().get());
       auto& inplace_version_counter = dense_tensor->InplaceVersionCounter();
 
-      uint32_t current_inplace_version =
-          inplace_version_counter.CurrentVersion();
+      uint32_t wrapper_version_snapshot = inplace_version_snapshot_;
+      uint32_t tensor_version = inplace_version_counter.CurrentVersion();
       PADDLE_ENFORCE_EQ(
-          current_inplace_version, inplace_version_snapshot_,
+          tensor_version, wrapper_version_snapshot,
           paddle::platform::errors::PermissionDenied(
               "Tensor '%s' used in gradient computation has been "
               "modified by an inplace operation. "
               "Its version is %d but the expected version is %d. "
               "Please fix your code to void calling an inplace operator "
               "after using the Tensor which will used in gradient "
               "computation.",
-              intermidiate_tensor_.name(), current_inplace_version,
-              inplace_version_snapshot_));
-      VLOG(6) << " The inplace_version_snapshot_ of Tensor '"
+              intermidiate_tensor_.name(), tensor_version,
+              wrapper_version_snapshot));
+      VLOG(6) << " The wrapper_version_snapshot of Tensor '"
               << intermidiate_tensor_.name() << "' is [ "
-              << inplace_version_snapshot_ << " ]";
-      VLOG(6) << " The current_inplace_version of Tensor '"
-              << intermidiate_tensor_.name() << "' is [ "
-              << current_inplace_version << " ]";
+              << wrapper_version_snapshot << " ]";
+      VLOG(6) << " The tensor_version of Tensor '"
+              << intermidiate_tensor_.name() << "' is [ " << tensor_version
+              << " ]";
     }
   }
 

diff --git a/python/paddle/fluid/tests/unittests/test_inplace.py b/python/paddle/fluid/tests/unittests/test_inplace.py
@@ -61,18 +61,11 @@ def func_test_backward_error(self):
             var_d = var_b**2
 
             loss = paddle.nn.functional.relu(var_c + var_d)
-            if in_dygraph_mode():
-                with self.assertRaisesRegexp(
-                        RuntimeError,
-                        "received current_inplace_version:{} != inplace_version_snapshot_:{}".
-                        format(1, 0)):
-                    loss.backward()
-            else:
-                with self.assertRaisesRegexp(
-                        RuntimeError,
-                        "received tensor_version:{} != wrapper_version_snapshot:{}".
-                        format(1, 0)):
-                    loss.backward()
+            with self.assertRaisesRegexp(
+                    RuntimeError,
+                    "received tensor_version:{} != wrapper_version_snapshot:{}".
+                    format(1, 0)):
+                loss.backward()
 
     def test_backward_error(self):
         with _test_eager_guard():
@@ -203,18 +196,11 @@ def func_test_backward_error(self):
             self.inplace_api_processing(var_b)
 
             loss = paddle.nn.functional.relu(var_c)
-            if in_dygraph_mode():
-                with self.assertRaisesRegexp(
-                        RuntimeError,
-                        "received current_inplace_version:{} != inplace_version_snapshot_:{}".
-                        format(1, 0)):
-                    loss.backward()
-            else:
-                with self.assertRaisesRegexp(
-                        RuntimeError,
-                        "received tensor_version:{} != wrapper_version_snapshot:{}".
-                        format(1, 0)):
-                    loss.backward()
+            with self.assertRaisesRegexp(
+                    RuntimeError,
+                    "received tensor_version:{} != wrapper_version_snapshot:{}".
+                    format(1, 0)):
+                loss.backward()
 
     def test_backward_error(self):
         with _test_eager_guard():

diff --git a/python/paddle/fluid/tests/unittests/test_pylayer_op.py b/python/paddle/fluid/tests/unittests/test_pylayer_op.py
@@ -487,7 +487,7 @@ def forward(self, data):
             z = layer(data)
             with self.assertRaisesRegexp(
                     RuntimeError,
-                    "received current_inplace_version:{} != inplace_version_snapshot_:{}".
+                    "received tensor_version:{} != wrapper_version_snapshot:{}".
                     format(1, 0)):
                 z.backward()
 

diff --git a/python/paddle/fluid/tests/unittests/test_view_op_reuse_allocation.py b/python/paddle/fluid/tests/unittests/test_view_op_reuse_allocation.py
@@ -91,18 +91,11 @@ def func_test_backward_error(self):
             view_var_b[0] = 2.  # var_b is modified inplace
 
             loss = paddle.nn.functional.relu(var_c)
-            if in_dygraph_mode():
-                with self.assertRaisesRegexp(
-                        RuntimeError,
-                        "received current_inplace_version:{} != inplace_version_snapshot_:{}".
-                        format(1, 0)):
-                    loss.backward()
-            else:
-                with self.assertRaisesRegexp(
-                        RuntimeError,
-                        "received tensor_version:{} != wrapper_version_snapshot:{}".
-                        format(1, 0)):
-                    loss.backward()
+            with self.assertRaisesRegexp(
+                    RuntimeError,
+                    "received tensor_version:{} != wrapper_version_snapshot:{}".
+                    format(1, 0)):
+                loss.backward()
 
     def test_backward_error(self):
         with _test_eager_guard():