Merge pull request BVLC#5530 from willyd/nccl-py3

Explicit std::string to bp::object conversion
shaoyandea · Apr 15, 2017 · eeebdab · eeebdab
2 parents 69cf20a + aa29eba
commit eeebdab
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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