diff options
| author |  Yifei Feng <yifeif@google.com> | 2018-02-22 14:24:57 -0800 |
|---|---|---|
| committer |  TensorFlower Gardener <gardener@tensorflow.org> | 2018-02-22 14:29:27 -0800 |
| commit | dce9a49c19f406ba45919e8c94474e55dc5ccd54 (patch) | |
| tree | 928db8a52603e00aef76985cda16b8bceb9debb2 /tensorflow/contrib/image | |
| parent | cb7e1963c625fd9713e7475d85621f95be6762f1 (diff) | |
Merge changes from github.
PiperOrigin-RevId: 186674197
Diffstat (limited to 'tensorflow/contrib/image')
| -rw-r--r-- | tensorflow/contrib/image/kernels/bipartite_match_op.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tensorflow/contrib/image/kernels/bipartite_match_op.cc b/tensorflow/contrib/image/kernels/bipartite_match_op.cc index 7d207c388b..726adb0777 100644 --- a/tensorflow/contrib/image/kernels/bipartite_match_op.cc +++ b/tensorflow/contrib/image/kernels/bipartite_match_op.cc @@ -85,7 +85,7 @@ class BipartiteMatchOp : public OpKernel { context->allocate_output(1, TensorShape({num_input_columns}), &column_to_row_match_indices)); - typename TTypes<float, 2>::ConstTensor distance_mat = + TTypes<float, 2>::ConstTensor distance_mat = input_distance_mat.shaped<float, 2>( {num_input_rows, num_input_columns}); |