diff options
| author |  A. Unique TensorFlower <gardener@tensorflow.org> | 2018-04-18 15:02:26 -0700 |
|---|---|---|
| committer | TensorFlower Gardener <gardener@tensorflow.org> | 2018-04-18 15:05:23 -0700 |
| commit | d964834a922e77198fd387aac6c6cc5970a31e7d (patch) | |
| tree | e6e5e914abf941b161d46ad4c2e940422643eccf /tensorflow/core/kernels/dynamic_stitch_op.cc | |
| parent | 325ba9ece698d04082b173ba300a10623d27de96 (diff) | |
Merged commit includes the following changes:
193422827 by yifeif:
Fix buildifier error.
--
193421691 by skyewm:
Make GraphModeFunctions work with _USE_C_SHAPES=True.
Tensor._handle_data is going away. This change adds special hooks for
propagating the resource handle shape information through
EagerTensors.
--
193421473 by A. Unique TensorFlower:
Register dynamic_stitch for DT_VARIANT type.
--
193421175 by nolivia:
disabling flaky tsan test
--
193420117 by nolivia:
disabling flaky test in tensorflow that has no apparent culprit
--
PiperOrigin-RevId: 193422827
Diffstat (limited to 'tensorflow/core/kernels/dynamic_stitch_op.cc')
| -rw-r--r-- | tensorflow/core/kernels/dynamic_stitch_op.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tensorflow/core/kernels/dynamic_stitch_op.cc b/tensorflow/core/kernels/dynamic_stitch_op.cc index f018499f6c..b01db91720 100644 --- a/tensorflow/core/kernels/dynamic_stitch_op.cc +++ b/tensorflow/core/kernels/dynamic_stitch_op.cc @@ -326,6 +326,7 @@ struct ParallelDynamicStitchOpCPU : DynamicStitchOpImplCPU<T, true> { ParallelDynamicStitchOpCPU<type>) TF_CALL_POD_STRING_TYPES(REGISTER_DYNAMIC_STITCH); +TF_CALL_variant(REGISTER_DYNAMIC_STITCH); #undef REGISTER_DYNAMIC_STITCH #if GOOGLE_CUDA |