projects
/
platform
/
upstream
/
caffe.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0c9cc62
)
Explicit std::string to bp::object conversion
author
Guillaume Dumont
<dumont.guillaume@gmail.com>
Fri, 14 Apr 2017 02:37:13 +0000
(22:37 -0400)
committer
Guillaume Dumont
<dumont.guillaume@gmail.com>
Fri, 14 Apr 2017 02:37:36 +0000
(22:37 -0400)
python/caffe/_caffe.cpp
patch
|
blob
|
history
diff --git
a/python/caffe/_caffe.cpp
b/python/caffe/_caffe.cpp
index
7fc06c0
..
d7f43ff
100644
(file)
--- 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