From 04eeb6d145e0413768c080bd33611263142b1a7b Mon Sep 17 00:00:00 2001 From: Russell Power Date: Sat, 29 Aug 2020 13:22:44 -0700 Subject: [PATCH] Add op definition and bridge implementation for TensorStridedSliceUpdate. PiperOrigin-RevId: 329118405 Change-Id: Ib8ca243f37d2728efb327d4ef52c7b2a53790c3e --- .../compiler/jit/mark_for_compilation_pass.cc | 1 + .../mlir/tensorflow/ir/tf_generated_ops.td | 34 +++++++++++++++++++ .../tf2xla/kernels/strided_slice_op.cc | 19 +++++++++-- 3 files changed, 52 insertions(+), 2 deletions(-) diff --git a/tensorflow/compiler/jit/mark_for_compilation_pass.cc b/tensorflow/compiler/jit/mark_for_compilation_pass.cc index 03ac7b0a59a..849019a76c4 100644 --- a/tensorflow/compiler/jit/mark_for_compilation_pass.cc +++ b/tensorflow/compiler/jit/mark_for_compilation_pass.cc @@ -2048,6 +2048,7 @@ absl::flat_hash_set GetKnownXLAAllowlistOp() { "TensorScatterAdd", "TensorScatterSub", "TensorScatterUpdate", + "TensorStridedSliceUpdate", "TridiagonalSolve", "TruncatedNormal", "UpperBound", diff --git a/tensorflow/compiler/mlir/tensorflow/ir/tf_generated_ops.td b/tensorflow/compiler/mlir/tensorflow/ir/tf_generated_ops.td index faf7d428aea..9b201ba878e 100644 --- a/tensorflow/compiler/mlir/tensorflow/ir/tf_generated_ops.td +++ b/tensorflow/compiler/mlir/tensorflow/ir/tf_generated_ops.td @@ -11651,6 +11651,40 @@ On GPU, if an out of bound index is found, the index is ignored. ]; } +def TF_TensorStridedSliceUpdateOp : TF_Op<"TensorStridedSliceUpdate", [NoSideEffect]> { + let summary = "Assign `value` to the sliced l-value reference of `input`."; + + let description = [{ +The values of `value` are assigned to the positions in the tensor `input` that +are selected by the slice parameters. The slice parameters `begin` `end` +`strides` etc. work exactly as in `StridedSlice`. + +NOTE this op currently does not support broadcasting and so `value`'s shape +must be exactly the shape produced by the slice of `input`. + }]; + + let arguments = (ins + TF_Tensor:$input, + TF_I32OrI64Tensor:$begin, + TF_I32OrI64Tensor:$end, + TF_I32OrI64Tensor:$strides, + TF_Tensor:$value, + + DefaultValuedAttr:$begin_mask, + DefaultValuedAttr:$end_mask, + DefaultValuedAttr:$ellipsis_mask, + DefaultValuedAttr:$new_axis_mask, + DefaultValuedAttr:$shrink_axis_mask + ); + + let results = (outs + TF_Tensor:$output + ); + + TF_DerivedOperandTypeAttr T = TF_DerivedOperandTypeAttr<0>; + TF_DerivedOperandTypeAttr Index = TF_DerivedOperandTypeAttr<1>; +} + def TF_TileOp : TF_Op<"Tile", [NoSideEffect]> { let summary = "Constructs a tensor by tiling a given tensor."; diff --git a/tensorflow/compiler/tf2xla/kernels/strided_slice_op.cc b/tensorflow/compiler/tf2xla/kernels/strided_slice_op.cc index 268317d84fc..6e5afd98e9d 100644 --- a/tensorflow/compiler/tf2xla/kernels/strided_slice_op.cc +++ b/tensorflow/compiler/tf2xla/kernels/strided_slice_op.cc @@ -446,7 +446,12 @@ class StridedSliceAssignOp : public XlaOpKernel { TensorShape lhs_shape; xla::XlaOp lhs; - OP_REQUIRES_OK(ctx, ctx->ReadVariableInput(0, dtype_, &lhs_shape, &lhs)); + if (ctx->input_type(0) == DT_RESOURCE) { + OP_REQUIRES_OK(ctx, ctx->ReadVariableInput(0, dtype_, &lhs_shape, &lhs)); + } else { + lhs_shape = ctx->InputShape(0); + lhs = ctx->Input(0); + } const TensorShape rhs_shape = ctx->InputShape(4); @@ -504,7 +509,11 @@ class StridedSliceAssignOp : public XlaOpKernel { lhs = xla::DynamicUpdateSlice(lhs, rhs, slice_begin); - OP_REQUIRES_OK(ctx, ctx->AssignVariable(0, dtype_, lhs)); + if (ctx->input_type(0) == DT_RESOURCE) { + OP_REQUIRES_OK(ctx, ctx->AssignVariable(0, dtype_, lhs)); + } else { + ctx->SetOutput(0, lhs); + } } private: @@ -520,5 +529,11 @@ REGISTER_XLA_OP(Name("ResourceStridedSliceAssign") .CompileTimeConstantInput("strides"), StridedSliceAssignOp); +REGISTER_XLA_OP(Name("TensorStridedSliceUpdate") + .CompileTimeConstantInput("begin") + .CompileTimeConstantInput("end") + .CompileTimeConstantInput("strides"), + StridedSliceAssignOp); + } // namespace } // namespace tensorflow