address comments

PaddlePaddle · Jun 15, 2018 · 6b11525 · 6b11525
1 parent 1695cd9
commit 6b11525
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 17 deletions.
diff --git a/paddle/fluid/framework/lod_tensor.cc b/paddle/fluid/framework/lod_tensor.cc
@@ -415,7 +415,9 @@ LoD ConvertToLengthBasedLoD(const LoD &offset_lod) {
   length_lod.reserve(offset_lod.size());
   for (size_t lvl = 0; lvl < offset_lod.size(); ++lvl) {
     std::vector<size_t> level;
-    level.reserve(offset_lod[lvl].size() - 1);
+    if (offset_lod[lvl].size() > 0) {
+      level.reserve(offset_lod[lvl].size() - 1);
+    }
     for (size_t idx = 0; idx < offset_lod[lvl].size() - 1; ++idx) {
       level.push_back(offset_lod[lvl][idx + 1] - offset_lod[lvl][idx]);
     }

diff --git a/paddle/fluid/pybind/pybind.cc b/paddle/fluid/pybind/pybind.cc
@@ -144,33 +144,48 @@ PYBIND11_PLUGIN(core) {
   py::class_<LoDTensor, Tensor>(m, "LoDTensor")
       .def_buffer(
           [](Tensor &self) -> py::buffer_info { return CastToPyBuffer(self); })
-      .def(
-          "__init__",
-          [](LoDTensor &instance, const std::vector<std::vector<size_t>> &lod) {
-            LoD new_lod;
-            new_lod.reserve(lod.size());
-            std::copy(lod.begin(), lod.end(), std::back_inserter(new_lod));
-            new (&instance) LoDTensor(ConvertToOffsetBasedLoD(new_lod));
-          })
+      .def("__init__",
+           [](LoDTensor &instance, const std::vector<std::vector<size_t>>
+                                       &recursive_sequence_lengths) {
+             LoD new_lod;
+             new_lod.reserve(recursive_sequence_lengths.size());
+             std::copy(recursive_sequence_lengths.begin(),
+                       recursive_sequence_lengths.end(),
+                       std::back_inserter(new_lod));
+             LoD new_offset_lod = ConvertToOffsetBasedLoD(new_lod);
+             PADDLE_ENFORCE(CheckLoD(new_offset_lod, -1),
+                            "the provided lod info is invalid");
+             new (&instance) LoDTensor(new_offset_lod);
+           })
       .def("__init__", [](LoDTensor &instance) { new (&instance) LoDTensor(); })
       .def("set_lod",
            [](LoDTensor &self, const std::vector<std::vector<size_t>> &lod) {
-             // the input lod info is offset-based
+             // the input lod is offset-based level-of-detail info
              LOG(WARNING)
                  << "set_lod is deprecated and will be removed by 9.2018, "
                     "please switch to set_recursive_sequence_lengths.";
              LoD new_lod;
              new_lod.reserve(lod.size());
              std::copy(lod.begin(), lod.end(), std::back_inserter(new_lod));
+             PADDLE_ENFORCE(CheckLoD(new_lod, vectorize(self.dims()).front()),
+                            "the provided lod info is invalid");
              self.set_lod(new_lod);
            })
       .def("set_recursive_sequence_lengths",
-           [](LoDTensor &self, const std::vector<std::vector<size_t>> &lod) {
-             // the input lod info is length-based
+           [](LoDTensor &self, const std::vector<std::vector<size_t>>
+                                   &recursive_sequence_lengths) {
+             // the input recursive_sequence_lengths is length-based
+             // level-of-detail info
              LoD new_lod;
-             new_lod.reserve(lod.size());
-             std::copy(lod.begin(), lod.end(), std::back_inserter(new_lod));
-             self.set_lod(ConvertToOffsetBasedLoD(new_lod));
+             new_lod.reserve(recursive_sequence_lengths.size());
+             std::copy(recursive_sequence_lengths.begin(),
+                       recursive_sequence_lengths.end(),
+                       std::back_inserter(new_lod));
+             LoD new_offset_lod = ConvertToOffsetBasedLoD(new_lod);
+             PADDLE_ENFORCE(
+                 CheckLoD(new_offset_lod, vectorize(self.dims()).front()),
+                 "the provided lod info is invalid");
+             self.set_lod(new_offset_lod);
            })
       .def("lod",
            [](LoDTensor &self) -> std::vector<std::vector<size_t>> {

diff --git a/python/paddle/fluid/data_feeder.py b/python/paddle/fluid/data_feeder.py
@@ -66,8 +66,6 @@ def done(self):
         t.set(arr, self.place)
         if self.lod_level > 0:
             t.set_recursive_sequence_lengths(self.lod)
-            assert t.has_valid_recursive_sequence_lengths(
-            ), "the provided lod info is invalid"
         return t