Merge pull request #1105 from dmitriy-serdyuk/refactor-recurrent

Refactor bricks.recurrent module
mila-iqia · Jun 2, 2016 · de0dbfc · de0dbfc
2 parents 82886a5 + cd113fb
commit de0dbfc
Show file tree

Hide file tree

Showing 8 changed files with 1,070 additions and 1,027 deletions.
diff --git a/blocks/bricks/__init__.py b/blocks/bricks/__init__.py
@@ -1,9 +1,14 @@
 """Bricks are parameterized Theano operations."""
+from __future__ import absolute_import
+
 from .base import application, Brick, lazy
 from .bn import (BatchNormalization, SpatialBatchNormalization,
                  BatchNormalizedMLP)
 from .interfaces import (Activation, Feedforward, Initializable, LinearLike,
                          Random)
+from .recurrent import (BaseRecurrent, SimpleRecurrent, LSTM, GatedRecurrent,
+                        Bidirectional, RecurrentStack, RECURRENTSTACK_SEPARATOR,
+                        recurrent)
 from .simple import (Linear, Bias, Maxout, LinearMaxout, Identity, Tanh,
                      Logistic, Softplus, Rectifier, LeakyRectifier,
                      Softmax, NDimensionalSoftmax)
@@ -16,4 +21,7 @@
            'Random', 'Linear', 'Bias', 'Maxout', 'LinearMaxout', 'Identity',
            'Tanh', 'Logistic', 'Softplus', 'Rectifier', 'LeakyRectifier',
            'Softmax', 'NDimensionalSoftmax', 'Sequence',
-           'FeedforwardSequence', 'MLP', 'WithExtraDims')
+           'FeedforwardSequence', 'MLP', 'WithExtraDims',
+           'BaseRecurrent', 'SimpleRecurrent', 'LSTM', 'GatedRecurrent',
+           'Bidirectional', 'RecurrentStack', 'RECURRENTSTACK_SEPARATOR',
+           'recurrent')
diff --git a/blocks/bricks/parallel.py b/blocks/bricks/parallel.py
@@ -3,8 +3,8 @@
 
 from picklable_itertools.extras import equizip
 
-from blocks.bricks import Initializable, Linear
 from blocks.bricks.base import lazy, application
+from blocks.bricks.simple import Initializable, Linear
 from blocks.utils import pack, extract_args