Fix use_bias in some convolutional layers (keras-team#10444)

* Fix use_bias in some convolutional layers * Fix Conv2DTranspose test
davidtvs · Jun 15, 2018 · ffa99d6 · ffa99d6
1 parent 6aace30
commit ffa99d6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/keras/layers/convolutional.py b/keras/layers/convolutional.py
@@ -807,7 +807,7 @@ def call(self, inputs):
             padding=self.padding,
             data_format=self.data_format)
 
-        if self.bias:
+        if self.use_bias:
             outputs = K.bias_add(
                 outputs,
                 self.bias,
@@ -1034,7 +1034,7 @@ def call(self, inputs):
                                      padding=self.padding,
                                      data_format=self.data_format)
 
-        if self.bias:
+        if self.use_bias:
             outputs = K.bias_add(
                 outputs,
                 self.bias,
@@ -1278,7 +1278,7 @@ def call(self, inputs):
                 padding=self.padding,
                 dilation_rate=self.dilation_rate)
 
-        if self.bias:
+        if self.use_bias:
             outputs = K.bias_add(
                 outputs,
                 self.bias,
@@ -1737,7 +1737,7 @@ def call(self, inputs, training=None):
             dilation_rate=self.dilation_rate,
             data_format=self.data_format)
 
-        if self.bias:
+        if self.use_bias:
             outputs = K.bias_add(
                 outputs,
                 self.bias,

diff --git a/tests/keras/layers/convolutional_test.py b/tests/keras/layers/convolutional_test.py
@@ -226,6 +226,7 @@ def test_conv2d_transpose():
         model = Sequential([convolutional.Conv2DTranspose(filters=filters,
                                                           kernel_size=3,
                                                           padding=padding,
+                                                          use_bias=True,
                                                           batch_input_shape=(None, None, 5, None))])
 
 
@@ -269,6 +270,7 @@ def test_separable_conv_1d():
                        'pointwise_constraint': 'unit_norm',
                        'depthwise_constraint': 'unit_norm',
                        'strides': 1,
+                       'use_bias': True,
                        'depth_multiplier': multiplier},
                input_shape=(num_samples, stack_size, num_step))
 
@@ -364,6 +366,7 @@ def test_depthwise_conv_2d():
                        'bias_regularizer': 'l2',
                        'activity_regularizer': 'l2',
                        'depthwise_constraint': 'unit_norm',
+                       'use_bias': True,
                        'strides': strides,
                        'depth_multiplier': multiplier},
                input_shape=(num_samples, stack_size, num_row, num_col))
@@ -521,6 +524,7 @@ def test_conv3d_transpose():
                        'activity_regularizer': 'l2',
                        'kernel_constraint': 'max_norm',
                        'bias_constraint': 'max_norm',
+                       'use_bias': True,
                        'strides': strides},
                input_shape=(None, stack_size, num_depth, num_row, num_col),
                fixed_batch_size=True)