This is an automated email from the ASF dual-hosted git repository. haoj pushed a commit to branch numpy in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git
commit 7a8793ac5b6ff2ab4c5dad7e63be11a57652ce26 Author: Hao Jin <hjjn.a...@gmail.com> AuthorDate: Fri Jun 14 14:26:36 2019 -0700 fix for ch11 (#15244) --- python/mxnet/gluon/parameter.py | 2 +- python/mxnet/numpy_extension/__init__.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/python/mxnet/gluon/parameter.py b/python/mxnet/gluon/parameter.py index 86ee9ad..0797b4c 100644 --- a/python/mxnet/gluon/parameter.py +++ b/python/mxnet/gluon/parameter.py @@ -369,7 +369,7 @@ class Parameter(object): ctx = context.cpu() if self._stype == 'default': block = self.list_data() - data = ndarray.add_n(*(w.copyto(ctx) for w in block)) / len(block) + data = ndarray.add_n(*(w.copyto(ctx).as_nd_ndarray() for w in block)) / len(block) else: # fetch all rows for 'row_sparse' param all_row_ids = ndarray.arange(0, self.shape[0], dtype='int64', ctx=ctx) diff --git a/python/mxnet/numpy_extension/__init__.py b/python/mxnet/numpy_extension/__init__.py index e2ccaa1..0e2d005 100644 --- a/python/mxnet/numpy_extension/__init__.py +++ b/python/mxnet/numpy_extension/__init__.py @@ -28,5 +28,6 @@ from ..context import * # pylint: disable=wildcard-import from ..util import use_np_shape, np_shape, is_np_shape from ..util import use_np_array, np_array, is_np_array from ..util import set_np, use_np, reset_np +from ..ndarray import waitall __all__ = []