Put it back maxout

bob/learn/tensorflow/layers/__init__.py

 from .Layer import Layer
 from .Conv1D import Conv1D
-#from .Maxout import maxout
+from .Maxout import maxout
 
 
 # gets sphinx autodoc done right - don't remove it
@@ -19,7 +19,8 @@ def __appropriate__(*args):
 
 __appropriate__(
     Layer,
-    Conv1D
+    Conv1D,
+    Maxout
     )
 __all__ = [_ for _ in dir() if not _.startswith('_')]
 

bob/learn/tensorflow/test/test_layers.py

@@ -9,7 +9,7 @@ from bob.learn.tensorflow.layers import maxout
 from nose.tools import assert_raises_regexp
 
 slim = tf.contrib.slim
-"""
+
 def test_simple():
     x = np.zeros([64, 10, 36])
     graph = maxout(x, num_units=3)
@@ -32,4 +32,4 @@ def test_invalid_shape():
     graph = slim.conv2d(x, 3, [3, 3])
     with assert_raises_regexp(ValueError, 'number of features'):
         graph = maxout(graph, num_units=2)
-"""
+