diff options
author | 2017-11-21 23:55:59 -0800 | |
---|---|---|
committer | 2017-11-22 00:01:14 -0800 | |
commit | d0a3b2d3983b970b750329088013dc5cb67d96f9 (patch) | |
tree | 17cc584c4568e4e64a4bdd6bbee0be0b9d96f62c /tensorflow/core/kernels/maxpooling_op_gpu.cu.cc | |
parent | c6d603f02e1a98f871912cda6716cdcbed6b439e (diff) |
Merged commit includes the following changes:
176617057 by yifeif:
Internal change.
--
176615737 by yifeif:
Fix internal tests.
--
PiperOrigin-RevId: 176617057
Diffstat (limited to 'tensorflow/core/kernels/maxpooling_op_gpu.cu.cc')
-rw-r--r-- | tensorflow/core/kernels/maxpooling_op_gpu.cu.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tensorflow/core/kernels/maxpooling_op_gpu.cu.cc b/tensorflow/core/kernels/maxpooling_op_gpu.cu.cc index d96b844383..f8daaca4c9 100644 --- a/tensorflow/core/kernels/maxpooling_op_gpu.cu.cc +++ b/tensorflow/core/kernels/maxpooling_op_gpu.cu.cc @@ -405,17 +405,17 @@ bool MaxPoolForwardWithOptionalArgmax<T>::operator()( if (propagate_nans) { MaxPoolForwardNHWC<true> <<<(output_size + kThreadsPerBlock - 1) / kThreadsPerBlock, - kThreadsPerBlock, 0, d.stream()>>> - (output_size, bottom_data, height, width, channels, pooled_height, - pooled_width, kernel_h, kernel_w, stride_h, stride_w, pad_t, pad_l, - top_data, mask); + kThreadsPerBlock, 0, d.stream()>>>( + output_size, bottom_data, height, width, channels, pooled_height, + pooled_width, kernel_h, kernel_w, stride_h, stride_w, pad_t, pad_l, + top_data, mask); } else { MaxPoolForwardNHWC<false> <<<(output_size + kThreadsPerBlock - 1) / kThreadsPerBlock, - kThreadsPerBlock, 0, d.stream()>>> - (output_size, bottom_data, height, width, channels, pooled_height, - pooled_width, kernel_h, kernel_w, stride_h, stride_w, pad_t, pad_l, - top_data, mask); + kThreadsPerBlock, 0, d.stream()>>>( + output_size, bottom_data, height, width, channels, pooled_height, + pooled_width, kernel_h, kernel_w, stride_h, stride_w, pad_t, pad_l, + top_data, mask); } return d.ok(); } |