Mercurial > pylearn
changeset 831:0ba62c55d59f
merge
author | Xavier Glorot <glorotxa@iro.umontreal.ca> |
---|---|
date | Wed, 14 Oct 2009 10:19:37 -0400 |
parents | 0f66973e4f95 (current diff) 3f44379177b2 (diff) |
children | 28ceb345ab78 |
files | |
diffstat | 2 files changed, 8 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/pylearn/datasets/MNIST.py Wed Oct 14 10:19:14 2009 -0400 +++ b/pylearn/datasets/MNIST.py Wed Oct 14 10:19:37 2009 -0400 @@ -53,11 +53,11 @@ def full(): return train_valid_test() -#usefull for test, keep it +#useful for test, keep it def first_10(): return train_valid_test(ntrain=10, nvalid=10, ntest=10) -#usefull for test, keep it +#useful for test, keep it def first_100(): return train_valid_test(ntrain=100, nvalid=100, ntest=100)
--- a/pylearn/io/pmat.py Wed Oct 14 10:19:14 2009 -0400 +++ b/pylearn/io/pmat.py Wed Oct 14 10:19:37 2009 -0400 @@ -36,7 +36,12 @@ #import numarray, sys, os, os.path import numpy.numarray, sys, os, os.path -import fpconst +try: + import fpconst +except ImportError: + print 'Python library fpconst is needed but not installed,' + print 'please install it using your favorite package manager.' + raise def array_columns( a, cols ): indices = None