Skip to content

Commit

Permalink
Merge pull request #889 from mila-udem/master
Browse files Browse the repository at this point in the history
Release 0.1.1
  • Loading branch information
rizar committed Oct 28, 2015
2 parents 137c891 + 3ec837a commit de526fe
Show file tree
Hide file tree
Showing 7 changed files with 456 additions and 4 deletions.
2 changes: 1 addition & 1 deletion blocks/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
# Scary warning: Adding code to this file can break namespace packages
# See https://pythonhosted.org/setuptools/setuptools.html#namespace-packages
__import__("pkg_resources").declare_namespace(__name__)
__version__ = '0.0.1'
__version__ = '0.1.1'
5 changes: 5 additions & 0 deletions blocks/bricks/recurrent.py
Original file line number Diff line number Diff line change
Expand Up @@ -648,6 +648,11 @@ def apply(self, *args, **kwargs):
def apply_delegate(self):
return self.children[0].apply

def get_dim(self, name):
if name in self.apply.outputs:
return self.prototype.get_dim(name) * 2
return self.prototype.get_dim(name)

RECURRENTSTACK_SEPARATOR = '#'


Expand Down
13 changes: 13 additions & 0 deletions blocks/bricks/sequence_generators.py
Original file line number Diff line number Diff line change
Expand Up @@ -582,6 +582,19 @@ class AbstractEmitter(Brick):
:class:`SoftmaxEmitter` : for integer outputs
Notes
-----
An important detail about the emitter cost is that it will be
evaluated with inputs of different dimensions so it has to be
flexible enough to handle this. The two ways in which it can be
applied are:
1. In :meth:BaseSequenceGenerator.cost_matrix where it will
be applied to the whole sequence at once.
2. In :meth:BaseSequenceGenerator.generate where it will be
applied to only one step of the sequence.
"""
@abstractmethod
def emit(self, readouts):
Expand Down
2 changes: 1 addition & 1 deletion blocks/main_loop.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

epoch_interrupt_message = """
Blocks will complete this epoch iteration of training and run extensions \
Blocks will complete this epoch of training and run extensions \
before exiting. If you do not want to complete this epoch, press CTRL + C \
again to stop training after the current batch."""

Expand Down
4 changes: 2 additions & 2 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,9 @@ def __getattr__(cls, name):
# built documents.
#
# The short X.Y version.
version = '0.0'
version = '0.1'
# The full version, including alpha/beta/rc tags.
release = '0.0.1'
release = '0.1.1'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
Loading

0 comments on commit de526fe

Please sign in to comment.