summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCyprien Noel <cyprien.noel@gmail.com>2017-04-15 16:17:48 (GMT)
committerGitHub <noreply@github.com>2017-04-15 16:17:48 (GMT)
commiteeebdab16155d34ff8f5f42137da7df4d1c7eab0 (patch)
tree21bda1668a023ed9ea330b9d8736d7c1ded19cf5
parent69cf20adfd4264f474ed91d2be02dda323d8bb21 (diff)
parentaa29eba26b781349174cb856b6ea96360ebbb3f2 (diff)
downloadcaffe-upstream/1.0.zip
caffe-upstream/1.0.tar.gz
caffe-upstream/1.0.tar.bz2
Merge pull request #5530 from willyd/nccl-py3upstream/1.0
Explicit std::string to bp::object conversion
-rw-r--r--python/caffe/_caffe.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/python/caffe/_caffe.cpp b/python/caffe/_caffe.cpp
index 7fc06c0..d7f43ff 100644
--- a/python/caffe/_caffe.cpp
+++ b/python/caffe/_caffe.cpp
@@ -371,7 +371,7 @@ bp::object NCCL_New_Uid() {
return bp::object(bp::handle<>(py_uid));
#else
// automatic conversion is correct for python 2.
- return uid;
+ return bp::object(uid);
#endif
}
#endif