[incubator-mxnet] branch master updated: fix compile error in debug mode (#13873)

[ha...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

haibin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git


The following commit(s) were added to refs/heads/master by this push:
     new dbbd252  fix compile error in debug mode (#13873)
dbbd252 is described below

commit dbbd252b14a3cd45524d3b1218297e73b266b6ba
Author: NEWPLAN <en...@163.com>
AuthorDate: Tue Jan 29 05:42:40 2019 +0800

    fix compile error in debug mode (#13873)
    
    the latest BufferEntry do not contain ctx function and results in compile errors.
    inside of BufferEntry is an object of NDArray, that is the expected data.
---
 src/kvstore/kvstore_nccl.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/kvstore/kvstore_nccl.h b/src/kvstore/kvstore_nccl.h
index d0f397c..a4ba533 100644
--- a/src/kvstore/kvstore_nccl.h
+++ b/src/kvstore/kvstore_nccl.h
@@ -342,7 +342,7 @@ class KVStoreNCCL : public KVStoreLocal {
       } else {
         auto& buf = merge_buf_[key];
         int root = src.ctx().dev_id;
-        assert(root == buf.ctx().dev_id);
+        assert(root == buf.merged.ctx().dev_id);
         root_id = FindRootId(dst, root);
 
         // Check whether we got the same set of devices