elementwise inplace api give error message before run the op

Author: pangyoki

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

@@ -449,24 +449,47 @@ def _executed_api(self):
         self.add = paddle.add_
 
 
-class TestAddInplaceBroadcast(unittest.TestCase):
+class TestAddInplaceBroadcastSuccess(unittest.TestCase):
+    def init_data(self):
+        self.x_numpy = np.random.rand(2, 3, 4).astype('float')
+        self.y_numpy = np.random.rand(3, 4).astype('float')
+
     def test_broadcast_success(self):
         paddle.disable_static()
-        x_numpy = np.random.rand(2, 3, 4).astype('float')
-        y_numpy = np.random.rand(3, 4).astype('float')
+        self.init_data()
 
-        x = paddle.to_tensor(x_numpy)
-        y = paddle.to_tensor(y_numpy)
+        x = paddle.to_tensor(self.x_numpy)
+        y = paddle.to_tensor(self.y_numpy)
 
         inplace_result = paddle.add_(x, y)
-        numpy_result = x_numpy + y_numpy
+        numpy_result = self.x_numpy + self.y_numpy
         self.assertEqual((inplace_result.numpy() == numpy_result).all(), True)
         paddle.enable_static()
 
+
+class TestAddInplaceBroadcastSuccess2(TestAddInplaceBroadcastSuccess):
+    def init_data(self):
+        self.x_numpy = np.random.rand(1, 2, 3, 1).astype('float')
+        self.y_numpy = np.random.rand(3, 1).astype('float')
+
+
+class TestAddInplaceBroadcastSuccess3(TestAddInplaceBroadcastSuccess):
+    def init_data(self):
+        self.x_numpy = np.random.rand(2, 3, 1, 5).astype('float')
+        self.y_numpy = np.random.rand(1, 3, 1, 5).astype('float')
+
+
+class TestAddInplaceBroadcastError(unittest.TestCase):
+    def init_data(self):
+        self.x_numpy = np.random.rand(3, 4).astype('float')
+        self.y_numpy = np.random.rand(2, 3, 4).astype('float')
+
     def test_broadcast_errors(self):
         paddle.disable_static()
-        x = paddle.rand([3, 4])
-        y = paddle.rand([2, 3, 4])
+        self.init_data()
+
+        x = paddle.to_tensor(self.x_numpy)
+        y = paddle.to_tensor(self.y_numpy)
 
         def broadcast_shape_error():
             paddle.add_(x, y)
@@ -475,6 +498,18 @@ def broadcast_shape_error():
         paddle.enable_static()
 
 
+class TestAddInplaceBroadcastError2(TestAddInplaceBroadcastError):
+    def init_data(self):
+        self.x_numpy = np.random.rand(2, 1, 4).astype('float')
+        self.y_numpy = np.random.rand(2, 3, 4).astype('float')
+
+
+class TestAddInplaceBroadcastError3(TestAddInplaceBroadcastError):
+    def init_data(self):
+        self.x_numpy = np.random.rand(5, 2, 1, 4).astype('float')
+        self.y_numpy = np.random.rand(2, 3, 4).astype('float')
+
+
 class TestComplexElementwiseAddOp(OpTest):
     def setUp(self):
         self.op_type = "elementwise_add"

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

@@ -289,24 +289,47 @@ def _executed_api(self):
         self.subtract = paddle.subtract_
 
 
-class TestSubtractInplaceBroadcast(unittest.TestCase):
+class TestSubtractInplaceBroadcastSuccess(unittest.TestCase):
+    def init_data(self):
+        self.x_numpy = np.random.rand(2, 3, 4).astype('float')
+        self.y_numpy = np.random.rand(3, 4).astype('float')
+
     def test_broadcast_success(self):
         paddle.disable_static()
-        x_numpy = np.random.rand(2, 3, 4).astype('float')
-        y_numpy = np.random.rand(3, 4).astype('float')
+        self.init_data()
 
-        x = paddle.to_tensor(x_numpy)
-        y = paddle.to_tensor(y_numpy)
+        x = paddle.to_tensor(self.x_numpy)
+        y = paddle.to_tensor(self.y_numpy)
 
         inplace_result = paddle.subtract_(x, y)
-        numpy_result = x_numpy - y_numpy
+        numpy_result = self.x_numpy - self.y_numpy
         self.assertEqual((inplace_result.numpy() == numpy_result).all(), True)
         paddle.enable_static()
 
+
+class TestSubtractInplaceBroadcastSuccess2(TestSubtractInplaceBroadcastSuccess):
+    def init_data(self):
+        self.x_numpy = np.random.rand(1, 2, 3, 1).astype('float')
+        self.y_numpy = np.random.rand(3, 1).astype('float')
+
+
+class TestSubtractInplaceBroadcastSuccess3(TestSubtractInplaceBroadcastSuccess):
+    def init_data(self):
+        self.x_numpy = np.random.rand(2, 3, 1, 5).astype('float')
+        self.y_numpy = np.random.rand(1, 3, 1, 5).astype('float')
+
+
+class TestSubtractInplaceBroadcastError(unittest.TestCase):
+    def init_data(self):
+        self.x_numpy = np.random.rand(3, 4).astype('float')
+        self.y_numpy = np.random.rand(2, 3, 4).astype('float')
+
     def test_broadcast_errors(self):
         paddle.disable_static()
-        x = paddle.rand([3, 4])
-        y = paddle.rand([2, 3, 4])
+        self.init_data()
+
+        x = paddle.to_tensor(self.x_numpy)
+        y = paddle.to_tensor(self.y_numpy)
 
         def broadcast_shape_error():
             paddle.subtract_(x, y)
@@ -315,6 +338,18 @@ def broadcast_shape_error():
         paddle.enable_static()
 
 
+class TestSubtractInplaceBroadcastError2(TestSubtractInplaceBroadcastError):
+    def init_data(self):
+        self.x_numpy = np.random.rand(2, 1, 4).astype('float')
+        self.y_numpy = np.random.rand(2, 3, 4).astype('float')
+
+
+class TestSubtractInplaceBroadcastError3(TestSubtractInplaceBroadcastError):
+    def init_data(self):
+        self.x_numpy = np.random.rand(5, 2, 1, 4).astype('float')
+        self.y_numpy = np.random.rand(2, 3, 4).astype('float')
+
+
 if __name__ == '__main__':
     paddle.enable_static()
     unittest.main()

python/paddle/tensor/math.py

@@ -321,11 +321,24 @@ def add_(x, y, name=None):
     if in_dygraph_mode():
         op_type = 'elementwise_add_'
         axis = -1
-        inplace_shape = x.shape
+        x_shape = x.shape
+        y_shape = y.shape
+        len_diff = len(x_shape) - len(y_shape)
+        shape_valid = True
+        if len_diff < 0:
+            shape_valid = False
+        for i in range(len(y_shape)):
+            if x_shape[i+len_diff] == 1 and y_shape[i] != 1:
+                shape_valid = False
+                break
+
+        if not shape_valid:
+            raise ValueError("The shape of inplace tensor {} should not be changed in the Inplace operation.".format(x.shape))
+
         out = _elementwise_op_in_dygraph(
             x, y, axis=axis, op_name=op_type)
-        if inplace_shape != out.shape:
-            raise ValueError("The shape of broadcast output {} is different from that of inplace tensor {} in the Inplace operation.".format(out.shape, inplace_shape))
+        # if inplace_shape != out.shape:
+        #     raise ValueError("The shape of broadcast output {} is different from that of inplace tensor {} in the Inplace operation.".format(out.shape, inplace_shape))
         return out
     _print_warning_in_static_mode("elementwise_add")
     return _elementwise_op(LayerHelper('elementwise_add', **locals()))
@@ -400,11 +413,24 @@ def subtract_(x, y, name=None):
     if in_dygraph_mode():
         axis = -1
         act = None
-        inplace_shape = x.shape
+        x_shape = x.shape
+        y_shape = y.shape
+        len_diff = len(x_shape) - len(y_shape)
+        shape_valid = True
+        if len_diff < 0:
+            shape_valid = False
+        for i in range(len(y_shape)):
+            if x_shape[i+len_diff] == 1 and y_shape[i] != 1:
+                shape_valid = False
+                break
+
+        if not shape_valid:
+            raise ValueError("The shape of inplace tensor {} should not be changed in the Inplace operation.".format(x.shape))
+
         out = _elementwise_op_in_dygraph(
             x, y, axis=axis, act=act, op_name='elementwise_sub_')
-        if inplace_shape != out.shape:
-            raise ValueError("The shape of broadcast output {} is different from that of inplace tensor {} in the Inplace operation.".format(out.shape, inplace_shape))
+        # if inplace_shape != out.shape:
+        #     raise ValueError("The shape of broadcast output {} is different from that of inplace tensor {} in the Inplace operation.".format(out.shape, inplace_shape))
         return out
     _print_warning_in_static_mode("elementwise_sub")
     return _elementwise_op(LayerHelper('elementwise_sub', **locals()))