aboutsummaryrefslogtreecommitdiffhomepage
path: root/tensorflow/core/kernels/pooling_ops_common_gpu.h
diff options
context:
space:
mode:
authorGravatar Yifei Feng <yifeif@google.com>2017-11-21 23:32:43 -0800
committerGravatar TensorFlower Gardener <gardener@tensorflow.org>2017-11-21 23:36:22 -0800
commitc6d603f02e1a98f871912cda6716cdcbed6b439e (patch)
tree4658788770c03d8a5bfd48eee59c247559344f08 /tensorflow/core/kernels/pooling_ops_common_gpu.h
parentf93c48dc061d23495a4425fcad17d55159cb02b1 (diff)
Merge changes from github.
PiperOrigin-RevId: 176615107
Diffstat (limited to 'tensorflow/core/kernels/pooling_ops_common_gpu.h')
-rw-r--r--tensorflow/core/kernels/pooling_ops_common_gpu.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/tensorflow/core/kernels/pooling_ops_common_gpu.h b/tensorflow/core/kernels/pooling_ops_common_gpu.h
index b594f39fad..1458456585 100644
--- a/tensorflow/core/kernels/pooling_ops_common_gpu.h
+++ b/tensorflow/core/kernels/pooling_ops_common_gpu.h
@@ -44,7 +44,7 @@ class DnnPoolingOp {
const std::vector<int32>& size,
const std::vector<int32>& stride, Padding padding,
TensorFormat data_format, const Tensor& tensor_in,
- const TensorShape& tensor_out_shape);
+ const TensorShape& tensor_out_shape, bool propagate_nans);
};
// A helper class that launch the cudnn pooling backward operations.
@@ -60,7 +60,7 @@ class DnnPoolingGradOp {
const std::vector<int32>& stride, Padding padding,
TensorFormat data_format, const Tensor* tensor_in,
const Tensor* tensor_out, const Tensor& out_backprop,
- const TensorShape& tensor_in_shape);
+ const TensorShape& tensor_in_shape, bool propagate_nans);
};
} // namespace tensorflow