Merge pull request #52864 from tensorflow/fix-build-1-on-r2.6

mihaimaruseac · web-flow · commit c42e4475566a · 2021-10-29T11:58:24.000-07:00
Fix build broken by merge conflict in `tensorflow/core/kernels/sequen…
diff --git a/tensorflow/core/kernels/sequence_ops.cc b/tensorflow/core/kernels/sequence_ops.cc
@@ -78,6 +78,8 @@ class RangeOp : public OpKernel {
     } else {
       size = static_cast<int64>(std::ceil(std::abs((limit - start) / delta)));
     }
+    TensorShape shape;
+    OP_REQUIRES_OK(context, shape.AddDimWithStatus(size));
     Tensor* out = nullptr;
     OP_REQUIRES_OK(context, context->allocate_output(0, shape, &out));
     auto flat = out->flat<T>();

Original file line number	Diff line number	Diff line change
`@@ -78,6 +78,8 @@ class RangeOp : public OpKernel {`
`78`	`78`	`} else {`
`79`	`79`	`size = static_cast<int64>(std::ceil(std::abs((limit - start) / delta)));`
`80`	`80`	`}`
	`81`	`+ TensorShape shape;`
	`82`	`+ OP_REQUIRES_OK(context, shape.AddDimWithStatus(size));`
`81`	`83`	`Tensor* out = nullptr;`
`82`	`84`	`OP_REQUIRES_OK(context, context->allocate_output(0, shape, &out));`
`83`	`85`	`auto flat = out->flat<T>();`