szha closed pull request #10030: Fix bug for Dropout with axes, also adding
unit test
URL: https://github.com/apache/incubator-mxnet/pull/10030
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/src/operator/nn/dropout-inl.h b/src/operator/nn/dropout-inl.h
index b57ab45891e..1af4798d1ce 100644
--- a/src/operator/nn/dropout-inl.h
+++ b/src/operator/nn/dropout-inl.h
@@ -259,7 +259,7 @@ class DropoutOp {
return;
}
// initialize the mask
- LaunchRNG<BernoulliKernel, xpu>(s, pgen, out.Size(),
+ LaunchRNG<BernoulliKernel, xpu>(s, pgen, mask.Size(),
mask.dptr<DType>(),
this->pkeep_);
// broadcast mul
diff --git a/tests/python/unittest/test_operator.py
b/tests/python/unittest/test_operator.py
index 1ee14b6e5a4..91b8faa49c1 100644
--- a/tests/python/unittest/test_operator.py
+++ b/tests/python/unittest/test_operator.py
@@ -4645,6 +4645,27 @@ def check_dropout_ratio(ratio, shape):
exe.backward([mx.nd.ones(shape)], is_train=False)
assert (exe.grad_arrays[0].asnumpy() ==
exe.outputs[0].asnumpy()).all()
+ def get_slice(x, axis, idx):
+ ix = ()
+ for i in range(x.ndim):
+ if i == axis:
+ ix += (idx,)
+ else:
+ ix += (slice(None, None, None),)
+ return x[ix]
+
+ def check_dropout_axes(ratio, shape, axes):
+ compactshape = list(shape)
+ for axis in axes:
+ compactshape[axis] = 1
+ compactx = mx.random.uniform(shape=tuple(compactshape))
+ broadcastx = compactx.broadcast_to(shape)
+ dropouty = mx.nd.Dropout(broadcastx, p=ratio, axes=axes)
+ for axis in axes:
+ target = get_slice(dropouty, axis, 0).asnumpy()
+ for i in range(1, shape[axis]):
+ assert(get_slice(dropouty, axis, i).asnumpy() == target).all()
+
shape = (100, 100)
check_dropout_ratio(0.5, shape)
check_dropout_ratio(0.0, shape)
@@ -4652,6 +4673,21 @@ def check_dropout_ratio(ratio, shape):
check_dropout_ratio(0.75, shape)
check_dropout_ratio(0.25, shape)
+ nshape = (10, 10, 10, 10)
+ check_dropout_axes(0.25, nshape, axes = (0,))
+ check_dropout_axes(0.25, nshape, axes = (1,))
+ check_dropout_axes(0.25, nshape, axes = (2,))
+ check_dropout_axes(0.25, nshape, axes = (3,))
+ check_dropout_axes(0.25, nshape, axes = (0, 1))
+ check_dropout_axes(0.25, nshape, axes = (0, 2))
+ check_dropout_axes(0.25, nshape, axes = (0, 3))
+ check_dropout_axes(0.25, nshape, axes = (1, 2))
+ check_dropout_axes(0.25, nshape, axes = (1, 3))
+ check_dropout_axes(0.25, nshape, axes = (2, 3))
+ check_dropout_axes(0.25, nshape, axes = (0, 1, 2))
+ check_dropout_axes(0.25, nshape, axes = (0, 2, 3))
+ check_dropout_axes(0.25, nshape, axes = (1, 2, 3))
+
@with_seed()
def test_scatter_gather_nd():
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
