changeset 851:ab7d598f5579

merge.
author Pascal Lamblin <lamblinp@iro.umontreal.ca>
date Mon, 26 Oct 2009 16:33:16 -0400
parents 1bdfef116a61 (diff) cfdaa56c66e8 (current diff)
children d15683416ebf f11881a265ee 22e3a422653d
files
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/pylearn/dataset_ops/cifar10.py	Mon Oct 26 15:35:38 2009 -0400
+++ b/pylearn/dataset_ops/cifar10.py	Mon Oct 26 16:33:16 2009 -0400
@@ -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	Mon Oct 26 15:35:38 2009 -0400
+++ b/pylearn/datasets/config.py	Mon Oct 26 16:33:16 2009 -0400
@@ -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():