aboutsummaryrefslogtreecommitdiffhomepage
path: root/tensorflow/contrib/fused_conv/ops/fused_conv2d_bias_activation_op.cc
diff options
context:
space:
mode:
Diffstat (limited to 'tensorflow/contrib/fused_conv/ops/fused_conv2d_bias_activation_op.cc')
-rw-r--r--tensorflow/contrib/fused_conv/ops/fused_conv2d_bias_activation_op.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/tensorflow/contrib/fused_conv/ops/fused_conv2d_bias_activation_op.cc b/tensorflow/contrib/fused_conv/ops/fused_conv2d_bias_activation_op.cc
index bafd1d5941..410571f378 100644
--- a/tensorflow/contrib/fused_conv/ops/fused_conv2d_bias_activation_op.cc
+++ b/tensorflow/contrib/fused_conv/ops/fused_conv2d_bias_activation_op.cc
@@ -44,7 +44,7 @@ REGISTER_OP("FusedConv2DBiasActivation")
.Attr(GetPaddingAttrString())
.Attr("data_format: {'NHWC', 'NCHW', 'NCHW_VECT_C'} = 'NHWC'")
.Attr("filter_format: {'HWIO', 'OIHW', 'OIHW_VECT_I'} = 'HWIO'")
- .Attr("activation_mode: {'Relu'} = 'Relu'")
+ .Attr("activation_mode: {'Relu', 'None'} = 'Relu'")
.Attr("dilations: list(int) = [1, 1, 1, 1]")
.SetShapeFn([](shape_inference::InferenceContext* c) {
using shape_inference::ShapeHandle;
@@ -144,7 +144,7 @@ REGISTER_OP("FusedConv2DBiasActivation")
`qint8 [ output_channels, input_channels / 4,
kernel_height, kernel_width, input_channels % 4 ]`
activation_mode: The activation applied to the output.
- Currently must be "Relu".
+ Must be "Relu" or "None".
dilations: 1-D tensor of length 4. The dilation factor for each dimension
of `input`. If set to k > 1, there will be k-1 skipped cells between
each filter element on that dimension. The dimension order is determined