Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into my_maxout_op

7 years ago · 99544961d9
parent bb1be5d6d2 b6c262e12f
commit 99544961d9
1 changed files with 3 additions and 0 deletions
--- a/paddle/pybind/pybind.cc
+++ b/paddle/pybind/pybind.cc
@ -42,6 +42,9 @@ limitations under the License. */
 #include "paddle/platform/gpu_info.h"
 #endif

+// disable auto conversion to list in Python
+PYBIND11_MAKE_OPAQUE(paddle::framework::LoDTensorArray);
+
 namespace paddle {
 namespace pybind {
 static size_t UniqueIntegerGenerator(const std::string &prefix) {