Merge pull request #5530 from willyd/nccl-py3

cypof · web-flow · commit eeebdab16155 · 2017-04-15T09:17:48.000-07:00
Explicit std::string to bp::object conversion
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

Original file line number	Diff line number	Diff line change
`@@ -371,7 +371,7 @@ bp::object NCCL_New_Uid() {`
`371`	`371`	`return bp::object(bp::handle<>(py_uid));`
`372`	`372`	`#else`
`373`	`373`	`// automatic conversion is correct for python 2.`
`374`		`- return uid;`
	`374`	`+ return bp::object(uid);`
`375`	`375`	`#endif`
`376`	`376`	`}`
`377`	`377`	`#endif`