Skip to content

P
Paddle

PaddlePaddle / Paddle
大约 1 年 前同步成功

通知 2298
Star 20931
Fork 5422
P
Paddle
未验证 提交 55c4eb8a 编写于 作者: M mhy-666 提交者： GitHub
浏览文件
操作

【prim】scatter_nd_add_grad (#52469) 

* add scatter_nd_add comp

* add scatter_nd_add prim

* fix

* fix

* add public_python_api in TestScatterNdAddSimpleOp setup function

* fix composite_backward_api.h

* fix composite_backward

* add test cases

* fix composite_backward_api.h, unittest
上级 1164626c
隐藏空白更改
内联 并排
Showing with 153 addition and 111 deletion
paddle/fluid/prim/api/composite_backward/composite_backward_api.h
浏览文件 @ 55c4eb8a
...@@ -1805,5 +1805,21 @@ void roll_grad(const Tensor& x, ...@@ -1805,5 +1805,21 @@ void roll_grad(const Tensor& x,
set_output<T>(x_grad_output, x_grad); set_output<T>(x_grad_output, x_grad);
} }
} }
template <typename T>
void scatter_nd_add_grad(const Tensor& index,
const Tensor& updates,
const Tensor& out_grad,
Tensor* x_grad,
Tensor* updates_grad) {
if (x_grad) {
by_pass<T>(out_grad, x_grad);
}
if (updates_grad) {
// Gradient by Gather: dUpdates = dO[Ids]
auto tmp_updates_grad = gather_nd<T>(out_grad, index);
set_output<T>(tmp_updates_grad, updates_grad);
}
}
} // namespace prim } // namespace prim
} // namespace paddle } // namespace paddle
paddle/phi/api/yaml/backward.yaml
浏览文件 @ 55c4eb8a
...@@ -1454,6 +1454,7 @@ ...@@ -1454,6 +1454,7 @@
kernel : kernel :
func : scatter_nd_add_grad func : scatter_nd_add_grad
no_need_buffer : updates no_need_buffer : updates
composite: scatter_nd_add_grad(index, updates, out_grad, x_grad, updates_grad)
- backward_op : segment_pool_grad - backward_op : segment_pool_grad
forward : segment_pool (Tensor x, Tensor segment_ids, str pooltype="SUM") -> Tensor(out), Tensor(summed_ids) forward : segment_pool (Tensor x, Tensor segment_ids, str pooltype="SUM") -> Tensor(out), Tensor(summed_ids)
......
python/paddle/fluid/tests/unittests/test_scatter_nd_op.py
浏览文件 @ 55c4eb8a
...@@ -69,6 +69,8 @@ class TestScatterNdAddSimpleOp(OpTest): ...@@ -69,6 +69,8 @@ class TestScatterNdAddSimpleOp(OpTest):
def setUp(self): def setUp(self):
self.op_type = "scatter_nd_add" self.op_type = "scatter_nd_add"
self.python_api = paddle.scatter_nd_add self.python_api = paddle.scatter_nd_add
self.public_python_api = paddle.scatter_nd_add
self.prim_op_type = "prim"
self._set_dtype() self._set_dtype()
if self.dtype == np.float64: if self.dtype == np.float64:
target_dtype = "float64" target_dtype = "float64"
...@@ -94,7 +96,7 @@ class TestScatterNdAddSimpleOp(OpTest): ...@@ -94,7 +96,7 @@ class TestScatterNdAddSimpleOp(OpTest):
self.check_output() self.check_output()
def test_check_grad(self): def test_check_grad(self):
self.check_grad(['X', 'Updates'], 'Out') self.check_grad(['X', 'Updates'], 'Out', check_prim=True)
class TestScatterNdAddSimpleFP16Op(TestScatterNdAddSimpleOp): class TestScatterNdAddSimpleFP16Op(TestScatterNdAddSimpleOp):
...@@ -127,7 +129,9 @@ class TestScatterNdAddSimpleBF16Op(TestScatterNdAddSimpleOp): ...@@ -127,7 +129,9 @@ class TestScatterNdAddSimpleBF16Op(TestScatterNdAddSimpleOp):
def test_check_grad(self): def test_check_grad(self):
if core.is_compiled_with_cuda(): if core.is_compiled_with_cuda():
place = core.CUDAPlace(0) place = core.CUDAPlace(0)
self.check_grad_with_place(place, ['X', 'Updates'], 'Out') self.check_grad_with_place(
place, ['X', 'Updates'], 'Out', check_prim=True
)
class TestScatterNdAddWithEmptyIndex(OpTest): class TestScatterNdAddWithEmptyIndex(OpTest):
...@@ -138,6 +142,8 @@ class TestScatterNdAddWithEmptyIndex(OpTest): ...@@ -138,6 +142,8 @@ class TestScatterNdAddWithEmptyIndex(OpTest):
def setUp(self): def setUp(self):
self.op_type = "scatter_nd_add" self.op_type = "scatter_nd_add"
self.python_api = paddle.scatter_nd_add self.python_api = paddle.scatter_nd_add
self.public_python_api = paddle.scatter_nd_add
self.prim_op_type = "prim"
self._set_dtype() self._set_dtype()
if self.dtype == np.float64: if self.dtype == np.float64:
target_dtype = "float64" target_dtype = "float64"
...@@ -166,7 +172,7 @@ class TestScatterNdAddWithEmptyIndex(OpTest): ...@@ -166,7 +172,7 @@ class TestScatterNdAddWithEmptyIndex(OpTest):
self.check_output() self.check_output()
def test_check_grad(self): def test_check_grad(self):
self.check_grad(['X', 'Updates'], 'Out') self.check_grad(['X', 'Updates'], 'Out', check_prim=True)
class TestScatterNdAddWithEmptyIndexFP16(TestScatterNdAddWithEmptyIndex): class TestScatterNdAddWithEmptyIndexFP16(TestScatterNdAddWithEmptyIndex):
...@@ -199,7 +205,9 @@ class TestScatterNdAddWithEmptyIndexBF16(TestScatterNdAddWithEmptyIndex): ...@@ -199,7 +205,9 @@ class TestScatterNdAddWithEmptyIndexBF16(TestScatterNdAddWithEmptyIndex):
def test_check_grad(self): def test_check_grad(self):
if core.is_compiled_with_cuda(): if core.is_compiled_with_cuda():
place = core.CUDAPlace(0) place = core.CUDAPlace(0)
self.check_grad_with_place(place, ['X', 'Updates'], 'Out') self.check_grad_with_place(
place, ['X', 'Updates'], 'Out', check_prim=True
)
class TestScatterNdAddWithHighRankSame(OpTest): class TestScatterNdAddWithHighRankSame(OpTest):
...@@ -210,6 +218,8 @@ class TestScatterNdAddWithHighRankSame(OpTest): ...@@ -210,6 +218,8 @@ class TestScatterNdAddWithHighRankSame(OpTest):
def setUp(self): def setUp(self):
self.op_type = "scatter_nd_add" self.op_type = "scatter_nd_add"
self.python_api = paddle.scatter_nd_add self.python_api = paddle.scatter_nd_add
self.public_python_api = paddle.scatter_nd_add
self.prim_op_type = "prim"
self._set_dtype() self._set_dtype()
if self.dtype == np.float64: if self.dtype == np.float64:
target_dtype = "float64" target_dtype = "float64"
...@@ -241,7 +251,7 @@ class TestScatterNdAddWithHighRankSame(OpTest): ...@@ -241,7 +251,7 @@ class TestScatterNdAddWithHighRankSame(OpTest):
self.check_output() self.check_output()
def test_check_grad(self): def test_check_grad(self):
self.check_grad(['X', 'Updates'], 'Out') self.check_grad(['X', 'Updates'], 'Out', check_prim=True)
class TestScatterNdAddWithHighRankSameFP16(TestScatterNdAddWithHighRankSame): class TestScatterNdAddWithHighRankSameFP16(TestScatterNdAddWithHighRankSame):
...@@ -274,7 +284,9 @@ class TestScatterNdAddWithHighRankSameBF16(TestScatterNdAddWithHighRankSame): ...@@ -274,7 +284,9 @@ class TestScatterNdAddWithHighRankSameBF16(TestScatterNdAddWithHighRankSame):
def test_check_grad(self): def test_check_grad(self):
if core.is_compiled_with_cuda(): if core.is_compiled_with_cuda():
place = core.CUDAPlace(0) place = core.CUDAPlace(0)
self.check_grad_with_place(place, ['X', 'Updates'], 'Out') self.check_grad_with_place(
place, ['X', 'Updates'], 'Out', check_prim=True
)
class TestScatterNdAddWithHighRankDiff(OpTest): class TestScatterNdAddWithHighRankDiff(OpTest):
...@@ -285,6 +297,8 @@ class TestScatterNdAddWithHighRankDiff(OpTest): ...@@ -285,6 +297,8 @@ class TestScatterNdAddWithHighRankDiff(OpTest):
def setUp(self): def setUp(self):
self.op_type = "scatter_nd_add" self.op_type = "scatter_nd_add"
self.python_api = paddle.scatter_nd_add self.python_api = paddle.scatter_nd_add
self.public_python_api = paddle.scatter_nd_add
self.prim_op_type = "prim"
shape = (8, 2, 2, 1, 10) shape = (8, 2, 2, 1, 10)
ref_np = np.random.rand(*shape).astype("double") ref_np = np.random.rand(*shape).astype("double")
index = np.vstack([np.random.randint(0, s, size=500) for s in shape]).T index = np.vstack([np.random.randint(0, s, size=500) for s in shape]).T
...@@ -300,7 +314,7 @@ class TestScatterNdAddWithHighRankDiff(OpTest): ...@@ -300,7 +314,7 @@ class TestScatterNdAddWithHighRankDiff(OpTest):
self.check_output() self.check_output()
def test_check_grad(self): def test_check_grad(self):
self.check_grad(['X', 'Updates'], 'Out') self.check_grad(['X', 'Updates'], 'Out', check_prim=True)
# Test Python API # Test Python API
...@@ -310,70 +324,76 @@ class TestScatterNdOpAPI(unittest.TestCase): ...@@ -310,70 +324,76 @@ class TestScatterNdOpAPI(unittest.TestCase):
""" """
def testcase1(self): def testcase1(self):
ref1 = paddle.static.data( with paddle.fluid.framework._static_guard():
name='ref1', ref1 = paddle.static.data(
shape=[10, 9, 8, 1, 3], name='ref1',
dtype='float32', shape=[10, 9, 8, 1, 3],
) dtype='float32',
index1 = paddle.static.data( )
name='index1', index1 = paddle.static.data(
shape=[5, 5, 8, 5], name='index1',
dtype='int32', shape=[5, 5, 8, 5],
) dtype='int32',
updates1 = paddle.static.data( )
name='update1', updates1 = paddle.static.data(
shape=[5, 5, 8], name='update1',
dtype='float32', shape=[5, 5, 8],
) dtype='float32',
output1 = paddle.scatter_nd_add(ref1, index1, updates1) )
output1 = paddle.scatter_nd_add(ref1, index1, updates1)
def testcase2(self): def testcase2(self):
ref2 = paddle.static.data( with paddle.fluid.framework._static_guard():
name='ref2', ref2 = paddle.static.data(
shape=[10, 9, 8, 1, 3], name='ref2',
dtype='double', shape=[10, 9, 8, 1, 3],
) dtype='double',
index2 = paddle.static.data( )
name='index2', index2 = paddle.static.data(
shape=[5, 8, 5], name='index2',
dtype='int32', shape=[5, 8, 5],
) dtype='int32',
updates2 = paddle.static.data( )
name='update2', updates2 = paddle.static.data(
shape=[5, 8], name='update2',
dtype='double', shape=[5, 8],
) dtype='double',
output2 = paddle.scatter_nd_add( )
ref2, index2, updates2, name="scatter_nd_add" output2 = paddle.scatter_nd_add(
) ref2, index2, updates2, name="scatter_nd_add"
)
def testcase3(self): def testcase3(self):
shape3 = [10, 9, 8, 1, 3] with paddle.fluid.framework._static_guard():
index3 = paddle.static.data( shape3 = [10, 9, 8, 1, 3]
name='index3', index3 = paddle.static.data(
shape=[5, 5, 8, 5], name='index3',
dtype='int32', shape=[5, 5, 8, 5],
) dtype='int32',
updates3 = paddle.static.data( )
name='update3', updates3 = paddle.static.data(
shape=[5, 5, 8], name='update3',
dtype='float32', shape=[5, 5, 8],
) dtype='float32',
output3 = paddle.scatter_nd(index3, updates3, shape3) )
output3 = paddle.scatter_nd(index3, updates3, shape3)
def testcase4(self): def testcase4(self):
shape4 = [10, 9, 8, 1, 3] with paddle.fluid.framework._static_guard():
index4 = paddle.static.data( shape4 = [10, 9, 8, 1, 3]
name='index4', index4 = paddle.static.data(
shape=[5, 5, 8, 5], name='index4',
dtype='int32', shape=[5, 5, 8, 5],
) dtype='int32',
updates4 = paddle.static.data( )
name='update4', updates4 = paddle.static.data(
shape=[5, 5, 8], name='update4',
dtype='double', shape=[5, 5, 8],
) dtype='double',
output4 = paddle.scatter_nd(index4, updates4, shape4, name='scatter_nd') )
output4 = paddle.scatter_nd(
index4, updates4, shape4, name='scatter_nd'
)
def testcase5(self): def testcase5(self):
if not fluid.core.is_compiled_with_cuda(): if not fluid.core.is_compiled_with_cuda():
...@@ -430,60 +450,65 @@ class TestScatterNdOpAPI(unittest.TestCase): ...@@ -430,60 +450,65 @@ class TestScatterNdOpAPI(unittest.TestCase):
class TestScatterNdOpRaise(unittest.TestCase): class TestScatterNdOpRaise(unittest.TestCase):
def test_check_raise(self): def test_check_raise(self):
def check_raise_is_test(): def check_raise_is_test():
try: with paddle.fluid.framework._static_guard():
ref5 = paddle.static.data( try:
name='ref5', shape=[-1, 3, 4, 5], dtype='float32' ref5 = paddle.static.data(
) name='ref5', shape=[-1, 3, 4, 5], dtype='float32'
index5 = paddle.static.data( )
name='index5', shape=[-1, 2, 10], dtype='int32' index5 = paddle.static.data(
) name='index5', shape=[-1, 2, 10], dtype='int32'
updates5 = paddle.static.data( )
name='updates5', shape=[-1, 2, 10], dtype='float32' updates5 = paddle.static.data(
) name='updates5', shape=[-1, 2, 10], dtype='float32'
output5 = paddle.scatter_nd_add(ref5, index5, updates5) )
except Exception as e: output5 = paddle.scatter_nd_add(ref5, index5, updates5)
t = "The last dimension of Input(Index)'s shape should be no greater " except Exception as e:
if t in str(e): t = "The last dimension of Input(Index)'s shape should be no greater "
raise IndexError if t in str(e):
raise IndexError
self.assertRaises(IndexError, check_raise_is_test) self.assertRaises(IndexError, check_raise_is_test)
def test_check_raise2(self): def test_check_raise2(self):
with self.assertRaises(ValueError): with self.assertRaises(ValueError):
ref6 = paddle.static.data( with paddle.fluid.framework._static_guard():
name='ref6', ref6 = paddle.static.data(
shape=[10, 9, 8, 1, 3], name='ref6',
dtype='double', shape=[10, 9, 8, 1, 3],
) dtype='double',
index6 = paddle.static.data( )
name='index6', index6 = paddle.static.data(
shape=[5, 8, 5], name='index6',
dtype='int32', shape=[5, 8, 5],
) dtype='int32',
updates6 = paddle.static.data(
name='update6',
shape=[5, 8],
dtype='float32',
)
output6 = paddle.scatter_nd_add(ref6, index6, updates6)
def test_check_raise3(self):
def check_raise_is_test():
try:
shape = [3, 4, 5]
index7 = paddle.static.data(
name='index7', shape=[-1, 2, 1], dtype='int32'
) )
updates7 = paddle.static.data( updates6 = paddle.static.data(
name='updates7', shape=[-1, 2, 4, 5, 20], dtype='float32' name='update6',
shape=[5, 8],
dtype='float32',
) )
output7 = paddle.scatter_nd(index7, updates7, shape) output6 = paddle.scatter_nd_add(ref6, index6, updates6)
except Exception as e:
t = "Updates has wrong shape"
if t in str(e):
raise ValueError
self.assertRaises(ValueError, check_raise_is_test) def test_check_raise3(self):
def check_raise_is_test():
with paddle.fluid.framework._static_guard():
try:
shape = [3, 4, 5]
index7 = paddle.static.data(
name='index7', shape=[-1, 2, 1], dtype='int32'
)
updates7 = paddle.static.data(
name='updates7',
shape=[-1, 2, 4, 5, 20],
dtype='float32',
)
output7 = paddle.scatter_nd(index7, updates7, shape)
except Exception as e:
t = "Updates has wrong shape"
if t in str(e):
raise ValueError
self.assertRaises(ValueError, check_raise_is_test)
class TestDygraph(unittest.TestCase): class TestDygraph(unittest.TestCase):
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或