diff --git a/tensorflow/core/kernels/deserialize_sparse_string_op.cc b/tensorflow/core/kernels/deserialize_sparse_string_op.cc index 8b8819b3cd0..2e1510785b3 100644 --- a/tensorflow/core/kernels/deserialize_sparse_string_op.cc +++ b/tensorflow/core/kernels/deserialize_sparse_string_op.cc @@ -204,8 +204,9 @@ class DeserializeSparseOp : public OpKernel { target_shape.vec<int64>()(i + ndims - 1) = output.shape().data()[i + 1]; } - Reshape(context, output.indices(), input_shape, target_shape, - 0 /* output indices index */, 2 /* output shape index */); + ReshapeSparseTensor(context, output.indices(), input_shape, target_shape, + 0 /* output indices index */, + 2 /* output shape index */); context->set_output(1, output.values()); } diff --git a/tensorflow/core/kernels/reshape_util.cc b/tensorflow/core/kernels/reshape_util.cc index 3b49181f77c..1fce80f7970 100644 --- a/tensorflow/core/kernels/reshape_util.cc +++ b/tensorflow/core/kernels/reshape_util.cc @@ -31,9 +31,11 @@ limitations under the License. namespace tensorflow { -void Reshape(OpKernelContext *context, const Tensor &input_indices_in, - const Tensor &input_shape_in, const Tensor &target_shape_in, - int output_indices_idx, int output_shape_idx) { +void ReshapeSparseTensor(OpKernelContext *context, + const Tensor &input_indices_in, + const Tensor &input_shape_in, + const Tensor &target_shape_in, int output_indices_idx, + int output_shape_idx) { OP_REQUIRES(context, TensorShapeUtils::IsMatrix(input_indices_in.shape()), errors::InvalidArgument( "Input indices should be a matrix but received shape ", diff --git a/tensorflow/core/kernels/reshape_util.h b/tensorflow/core/kernels/reshape_util.h index 90cd30869c8..7e1809e8ca8 100644 --- a/tensorflow/core/kernels/reshape_util.h +++ b/tensorflow/core/kernels/reshape_util.h @@ -16,17 +16,17 @@ limitations under the License. #ifndef TENSORFLOW_CORE_KERNELS_RESHAPE_UTIL_H_ #define TENSORFLOW_CORE_KERNELS_RESHAPE_UTIL_H_ -#include "tensorflow/core/framework/tensor.h" -#include "tensorflow/core/lib/core/status.h" - namespace tensorflow { class OpKernelContext; +class Tensor; // Reshapes the input indices and input shape to the target shape. -void Reshape(OpKernelContext *context, const Tensor &input_indices_in, - const Tensor &input_shape_in, const Tensor &target_shape_in, - int output_indices_idx, int output_shape_idx); +void ReshapeSparseTensor(OpKernelContext *context, + const Tensor &input_indices_in, + const Tensor &input_shape_in, + const Tensor &target_shape_in, int output_indices_idx, + int output_shape_idx); } // namespace tensorflow diff --git a/tensorflow/core/kernels/sparse_reshape_op.cc b/tensorflow/core/kernels/sparse_reshape_op.cc index 059519a913b..6eb5f0af635 100644 --- a/tensorflow/core/kernels/sparse_reshape_op.cc +++ b/tensorflow/core/kernels/sparse_reshape_op.cc @@ -34,8 +34,9 @@ class SparseReshapeOp : public OpKernel { explicit SparseReshapeOp(OpKernelConstruction* context) : OpKernel(context) {} void Compute(OpKernelContext* context) override { - Reshape(context, context->input(0), context->input(1), context->input(2), - 0 /* output indices index */, 1 /* output shape index */); + ReshapeSparseTensor(context, context->input(0), context->input(1), + context->input(2), 0 /* output indices index */, + 1 /* output shape index */); } };