Mercurial > pylearn

changeset 864:22e3a422653d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author James Bergstra <bergstrj@iro.umontreal.ca>
date Tue, 03 Nov 2009 15:26:25 -0500
parents e6d2cb493754 (current diff) ab7d598f5579 (diff)
children 49c1035fe582 6298876b2b01
files
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/pylearn/dataset_ops/cifar10.py	Tue Nov 03 15:26:07 2009 -0500
+++ b/pylearn/dataset_ops/cifar10.py	Tue Nov 03 15:26:25 2009 -0500
@@ -88,7 +88,7 @@
     x_fn, y_fn = split_options[split]
 
     x_op = TensorFnDataset(dtype, (False,), (x_fn, (dtype,)), (3072,))
-    y_op = TensorFnDataset(dtype, (), y_fn)
+    y_op = TensorFnDataset('int32', (), y_fn)
 
     x = x_op(s_idx)
     y = y_op(s_idx)
--- a/pylearn/datasets/config.py	Tue Nov 03 15:26:07 2009 -0500
+++ b/pylearn/datasets/config.py	Tue Nov 03 15:26:25 2009 -0500
@@ -22,7 +22,7 @@
             env_get.first_warning = False
         return default
     else:
-        os.getenv(key)
+        return os.getenv(key)
 env_get.first_warning = True
 
 def data_root():