aboutsummaryrefslogtreecommitdiffhomepage
path: root/tensorflow/core/kernels/batch_norm_op.cc
diff options
context:
space:
mode:
authorGravatar Geoffrey Irving <geoffreyi@google.com>2016-01-22 09:55:02 -0800
committerGravatar Vijay Vasudevan <vrv@google.com>2016-01-22 10:21:30 -0800
commitd552be23658b3bdd1b7dedd34f25631773e81dff (patch)
treee5776923671da165ced3fa649dbbbcfb4ac07777 /tensorflow/core/kernels/batch_norm_op.cc
parent22ebf0a94fd42af2d78b7964e836c92673ddfa31 (diff)
Change uses of TensorShape::ShortDebugString to DebugString
The two functions already have the same behavior, and ShortDebugString will disappear soon. Change: 112793490
Diffstat (limited to 'tensorflow/core/kernels/batch_norm_op.cc')
-rw-r--r--tensorflow/core/kernels/batch_norm_op.cc25
1 files changed, 12 insertions, 13 deletions
diff --git a/tensorflow/core/kernels/batch_norm_op.cc b/tensorflow/core/kernels/batch_norm_op.cc
index 38afe2eb07..dd75097064 100644
--- a/tensorflow/core/kernels/batch_norm_op.cc
+++ b/tensorflow/core/kernels/batch_norm_op.cc
@@ -48,19 +48,19 @@ class BatchNormOp : public OpKernel {
OP_REQUIRES(context, input.dims() == 4,
errors::InvalidArgument("input must be 4-dimensional",
- input.shape().ShortDebugString()));
+ input.shape().DebugString()));
OP_REQUIRES(context, mean.dims() == 1,
errors::InvalidArgument("mean must be 1-dimensional",
- mean.shape().ShortDebugString()));
+ mean.shape().DebugString()));
OP_REQUIRES(context, var.dims() == 1,
errors::InvalidArgument("var must be 1-dimensional",
- var.shape().ShortDebugString()));
+ var.shape().DebugString()));
OP_REQUIRES(context, beta.dims() == 1,
errors::InvalidArgument("beta must be 1-dimensional",
- beta.shape().ShortDebugString()));
+ beta.shape().DebugString()));
OP_REQUIRES(context, gamma.dims() == 1,
errors::InvalidArgument("gamma must be 1-dimensional",
- gamma.shape().ShortDebugString()));
+ gamma.shape().DebugString()));
Tensor* output = nullptr;
OP_REQUIRES_OK(context,
@@ -96,20 +96,19 @@ class BatchNormGradOp : public OpKernel {
OP_REQUIRES(context, input.dims() == 4,
errors::InvalidArgument("input must be 4-dimensional",
- input.shape().ShortDebugString()));
+ input.shape().DebugString()));
OP_REQUIRES(context, mean.dims() == 1,
errors::InvalidArgument("mean must be 1-dimensional",
- mean.shape().ShortDebugString()));
+ mean.shape().DebugString()));
OP_REQUIRES(context, var.dims() == 1,
errors::InvalidArgument("var must be 1-dimensional",
- var.shape().ShortDebugString()));
+ var.shape().DebugString()));
OP_REQUIRES(context, gamma.dims() == 1,
errors::InvalidArgument("gamma must be 1-dimensional",
- gamma.shape().ShortDebugString()));
- OP_REQUIRES(
- context, out_backprop.dims() == 4,
- errors::InvalidArgument("out_backprop must be 4-dimensional",
- out_backprop.shape().ShortDebugString()));
+ gamma.shape().DebugString()));
+ OP_REQUIRES(context, out_backprop.dims() == 4,
+ errors::InvalidArgument("out_backprop must be 4-dimensional",
+ out_backprop.shape().DebugString()));
Tensor* dx = nullptr;
OP_REQUIRES_OK(context, context->allocate_output(0, input.shape(), &dx));