Upgrading Lasagne, removing workaround for warning. Colorama on windo…

…ws. Closes #41.
leaflet757 · Apr 15, 2016 · 9ade9e1 · 9ade9e1
1 parent a383ce9
commit 9ade9e1
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/README.rst b/README.rst
@@ -89,9 +89,9 @@ Installation & Setup
 
 This project requires Python 3.4+ and you'll also need ``numpy`` and ``scipy`` (numerical computing libraries) as well as ``python3-dev`` installed system-wide.  If you want more detailed instructions, follow these:
 
-1. `Linux Installation of Lasagne <https://github.com/Lasagne/Lasagne/wiki/From-Zero-to-Lasagne-on-Ubuntu-14.04>`_ **(recommended)**
-2. `OSX Installation of Lasagne <http://deeplearning.net/software/theano/install.html#mac-os>`_ **(intermediate)**
-3. `Windows Installation of Lasagne <https://github.com/Lasagne/Lasagne/wiki/From-Zero-to-Lasagne-on-Windows-7-%2864-bit%29>`_ **(expert)**
+1. **`Linux Installation of Lasagne <https://github.com/Lasagne/Lasagne/wiki/From-Zero-to-Lasagne-on-Ubuntu-14.04>`_ (recommended)**
+2. **`Mac OSX Installation of Lasagne <http://deeplearning.net/software/theano/install.html#mac-os>`_ (intermediate)**
+3. **`Windows Installation of Lasagne <https://github.com/Lasagne/Lasagne/wiki/From-Zero-to-Lasagne-on-Windows-7-%2864-bit%29>`_ (expert)**
 
 Afterward fetching the repository, you can run the following commands from your terminal to setup a local environment:
 

diff --git a/doodle.py b/doodle.py
@@ -11,7 +11,6 @@
 import bz2
 import pickle
 import argparse
-import warnings
 
 
 # Configure all options first so we can custom load other libraries (Theano) based on device specified by user.
@@ -73,12 +72,12 @@ class ansi:
 import theano.tensor as T
 import theano.tensor.nnet.neighbours
 
-# Deep Learning Framework
-with warnings.catch_warnings():
-    # suppress: "downsample module has been moved to the pool module." (Temporary workaround.)
-    warnings.simplefilter("ignore")
-    import lasagne
+# Support ansi colors in Windows too.
+if sys.platform == 'win32':
+    import colorama
 
+# Deep Learning Framework
+import lasagne
 from lasagne.layers import Conv2DLayer as ConvLayer, Pool2DLayer as PoolLayer
 from lasagne.layers import InputLayer, ConcatLayer
 

diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,5 @@
+colorama
 matplotlib>=1.5
 scikit-image>=0.12
 Theano>=0.8.1
-git+https://github.com/Lasagne/Lasagne.git@664b8a4#egg=Lasagne==0.2-dev
+git+https://github.com/Lasagne/Lasagne.git@0440814#egg=Lasagne==0.2-dev