merge

xutianbing · xutianbing · commit 02c5ecc334d2 · 2017-02-07T11:08:42.000-08:00
diff --git a/paddle/function/BufferArg.h b/paddle/function/BufferArg.h
@@ -190,7 +190,7 @@ class SequenceIdArg : public BufferArg {
       : BufferArg(VALUE_TYPE_INT32, shape, argType) {
     bufferType_ = TENSOR_SEQUENCE_ID;
     CHECK_EQ(shape_.ndims(), 1UL);
-    CHECK_GT(shape_[0], 1UL);
+    CHECK_GE(shape_[0], 1UL);
     numSeqs_ = shape_[0] - 1;
   }
 
diff --git a/paddle/function/FunctionTest.h b/paddle/function/FunctionTest.h
@@ -134,7 +134,6 @@ class FunctionCompare {
                                     output.valueType(),
                                     output.shape(),
                                     argType));
-<<<<<<< HEAD
   }
 
   /// add and init output sparse matrix

Original file line number	Diff line number	Diff line change
`@@ -190,7 +190,7 @@ class SequenceIdArg : public BufferArg {`
`190`	`190`	`: BufferArg(VALUE_TYPE_INT32, shape, argType) {`
`191`	`191`	`bufferType_ = TENSOR_SEQUENCE_ID;`
`192`	`192`	`CHECK_EQ(shape_.ndims(), 1UL);`
`193`		`- CHECK_GT(shape_[0], 1UL);`
	`193`	`+ CHECK_GE(shape_[0], 1UL);`
`194`	`194`	`numSeqs_ = shape_[0] - 1;`
`195`	`195`	`}`
`196`	`196`
Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,6 @@ class FunctionCompare {`
`134`	`134`	`output.valueType(),`
`135`	`135`	`output.shape(),`
`136`	`136`	`argType));`
`137`		`-<<<<<<< HEAD`
`138`	`137`	`}`
`139`	`138`
`140`	`139`	`/// add and init output sparse matrix`