Enable to output LoD in fetch_op and check output LoD in the op unit test.

Author: qingqing01

paddle/operators/fetch_op.cc

@@ -52,6 +52,7 @@ class FetchOp : public framework::OperatorBase {
  // FIXME(yuyang18): Should we assume the fetch operator always generate
  // CPU outputs?
  dst_item.CopyFrom(src_item, platform::CPUPlace(), dev_ctx);
+ dst_item.set_lod(src_item.lod());
 
  VLOG(3) << "Fetch variable " << fetch_var_name << " to " << out_name;
  }

python/paddle/v2/framework/tests/op_test.py

@@ -333,20 +333,31 @@ def find_actual(target_name, fetch_list):
  type(sub_out))
  for sub_out_name, expect in sub_out:
  idx = find_actual(sub_out_name, fetch_list)
- actual = outs[idx]
+ actual_t = np.array(outs[idx])
+ expect_t = expect[0] \
+ if isinstance(expect, tuple) else expect
  self.assertTrue(
  np.allclose(
- actual, expect, atol=atol),
+ actual_t, expect_t, atol=atol),
  "Output (" + sub_out_name + ") has diff at " +
  str(place))
+ if isinstance(expect, tuple):
+ self.assertListEqual(
+ actual_t.lod(), expect[1], "Output (" + sub_out_name
+ + ") has different lod at " + str(place))
  else:
  idx = find_actual(out_name, fetch_list)
- actual = outs[idx]
+ actual_t = outs[idx]
  expect = self.outputs[out_name]
+ expect_t = expect[0] if isinstance(expect, tuple) else expect
  self.assertTrue(
  np.allclose(
- actual, expect, atol=atol),
+ actual_t, expect_t, atol=atol),
  "Output (" + out_name + ") has diff at " + str(place))
+ if isinstance(expect, tuple):
+ self.assertListEqual(actual_t.lod(), expect[1],
+ "Output (" + out_name +
+ ") has different lod at " + str(place))
 
  def check_output(self, atol=1e-5):
  places = [core.CPUPlace()]

python/paddle/v2/framework/tests/test_lstm_op.py

@@ -155,7 +155,11 @@ def setUp(self):
  'Weight': w,
  'Bias': b
  }
- self.outputs = {'Hidden': h, 'Cell': c, 'BatchGate': g_sort}
+ self.outputs = {
+ 'Hidden': (h, self.lod),
+ 'Cell': (c, self.lod),
+ 'BatchGate': g_sort
+ }
  self.attrs = {
  'usePeepholes': True,
  'isReverse': self.is_reverse,