Merge pull request #109 from bartvm/move_examples

Move examples to separate folder
mila-iqia · Jan 17, 2015 · 856c5de · 856c5de
2 parents 32e9554 + f4901e7
commit 856c5de
Show file tree

Hide file tree

Showing 20 changed files with 38 additions and 28 deletions.
diff --git a/.coveragerc b/.coveragerc
diff --git a/blocks/bricks/__init__.py b/blocks/bricks/__init__.py
@@ -387,7 +387,6 @@ def lazy(func):
 
     Examples
     --------
-    >>> from __future__ import print_function
     >>> class SomeBrick(Brick):
     ...     @lazy
     ...     def __init__(self, a, b, c='c', d=None):

diff --git a/blocks/extensions.py b/blocks/extensions.py
@@ -1,4 +1,3 @@
-from __future__ import print_function
 from abc import ABCMeta, abstractmethod
 
 from six import add_metaclass

diff --git a/blocks/groundhog/__init__.py → blocks/groundhog.py b/blocks/groundhog/__init__.py → blocks/groundhog.py
diff --git a/blocks/pylearn2/__init__.py → blocks/pylearn2.py b/blocks/pylearn2/__init__.py → blocks/pylearn2.py
@@ -4,6 +4,8 @@
 training and monitoring to Pylearn2.
 
 """
+from __future__ import absolute_import
+
 import logging
 from collections import OrderedDict
 

diff --git a/blocks/pylearn2/examples/__init__.py b/blocks/pylearn2/examples/__init__.py
diff --git a/blocks/examples/__init__.py → examples/__init__.py b/blocks/examples/__init__.py → examples/__init__.py
diff --git a/blocks/examples/mnist/__init__.py → examples/groundhog/__init__.py b/blocks/examples/mnist/__init__.py → examples/groundhog/__init__.py
diff --git a/blocks/groundhog/examples/language.py → examples/groundhog/language.py b/blocks/groundhog/examples/language.py → examples/groundhog/language.py
diff --git a/blocks/groundhog/examples/markov_chain.py → examples/groundhog/markov_chain.py b/blocks/groundhog/examples/markov_chain.py → examples/groundhog/markov_chain.py
diff --git a/blocks/groundhog/examples/sine.py → examples/groundhog/sine.py b/blocks/groundhog/examples/sine.py → examples/groundhog/sine.py
diff --git a/blocks/examples/mnist/train.py → examples/mnist.py b/blocks/examples/mnist/train.py → examples/mnist.py
@@ -2,14 +2,14 @@
 
 from theano import tensor
 
-from blocks.datasets import DataStream
-from blocks.datasets.mnist import MNIST
-from blocks.datasets.schemes import SequentialScheme
 from blocks.algorithms import GradientDescent, SteepestDescent
 from blocks.bricks import MLP, Tanh, Identity
 from blocks.bricks.cost import CategoricalCrossEntropy
-from blocks.main_loop import MainLoop
+from blocks.datasets import DataStream
+from blocks.datasets.mnist import MNIST
+from blocks.datasets.schemes import SequentialScheme
 from blocks.extensions import FinishAfter, Printing
+from blocks.main_loop import MainLoop
 
 
 def main():

diff --git a/blocks/groundhog/examples/__init__.py → examples/pylearn2/__init__.py b/blocks/groundhog/examples/__init__.py → examples/pylearn2/__init__.py
diff --git a/blocks/pylearn2/examples/markov_chain.py → examples/pylearn2/markov_chain.py b/blocks/pylearn2/examples/markov_chain.py → examples/pylearn2/markov_chain.py
diff --git a/tests/examples/__init__.py b/tests/examples/__init__.py
diff --git a/tests/examples/mnist/__init__.py b/tests/examples/mnist/__init__.py
diff --git a/tests/examples/mnist/test_train.py b/tests/examples/mnist/test_train.py
diff --git a/tests/pylearn2/__init__.py b/tests/pylearn2/__init__.py
diff --git a/tests/test_examples.py b/tests/test_examples.py
@@ -0,0 +1,32 @@
+import logging
+import os
+
+import pylearn2
+
+import blocks
+from examples.mnist import main as mnist_test
+from examples.pylearn2.markov_chain import main as pylearn2_test
+
+
+def setup():
+    # Silence Pylearn2's logger
+    logger = logging.getLogger(pylearn2.__name__)
+    logger.setLevel(logging.ERROR)
+
+    # Silence Block's logger
+    logger = logging.getLogger(blocks.__name__)
+    logger.setLevel(logging.ERROR)
+
+
+def test_mnist():
+    mnist_test()
+
+test_mnist.setup = setup
+
+
+def test_pylearn2():
+    filename = 'unittest_markov_chain'
+    pylearn2_test('train', filename, 0, 3, False)
+    os.remove(filename)
+
+test_pylearn2.setup = setup
diff --git a/tests/pylearn2/test_pylearn2.py → tests/test_pylearn2.py b/tests/pylearn2/test_pylearn2.py → tests/test_pylearn2.py
@@ -1,5 +1,4 @@
 import logging
-import os
 
 import numpy
 import pylearn2
@@ -11,7 +10,6 @@
 from blocks.bricks.cost import SquaredError
 from blocks.initialization import IsotropicGaussian, Constant
 from blocks.pylearn2 import Pylearn2Model, Pylearn2Cost, Pylearn2Train
-from blocks.pylearn2.examples.markov_chain import main
 
 
 def test_pylearn2_training():
@@ -39,13 +37,3 @@ def test_pylearn2_training():
               monitoring_dataset=valid_dataset)
     train = Pylearn2Train(train_dataset, block_model, algorithm=sgd)
     train.main_loop(time_budget=3)
-
-
-def test_markov_chain():
-    # Silence Pylearn2's logger
-    logger = logging.getLogger(pylearn2.__name__)
-    logger.setLevel(logging.ERROR)
-
-    filename = 'unittest_markov_chain'
-    main('train', filename, 0, 3, False)
-    os.remove(filename)