Mercurial > pylearn

changeset 616:d0f7a6f87adc

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 Sat, 17 Jan 2009 17:38:17 -0500
parents a88ead1a1537 (current diff) f6c74f34cd35 (diff)
children 5120bf7c4694
files
diffstat 1 files changed, 2 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/pylearn/datasets/flickr.py	Sat Jan 17 17:37:55 2009 -0500
+++ b/pylearn/datasets/flickr.py	Sat Jan 17 17:38:17 2009 -0500
@@ -7,11 +7,7 @@
 import numpy
 
 from ..io import filetensor
-if 0:
-    from .config import data_root
-else:
-    def data_root():
-        return '/u/lisa/db/flickr/filetensor'
+from .config import data_root
 from .dataset import Dataset
 
 
@@ -25,7 +21,7 @@
     """Return the basic flickr image classification problem.
     The images are 75x75, and there are 7500 training examples.
     """
-    root = data_root() if folder is None else folder
+    root = os.path.join(data_root(), 'flickr') if folder is None else folder
     train = filetensor.read(open(os.path.join(root, path_train_10class)))
     valid = filetensor.read(open(os.path.join(root, path_valid_10class)))
     test = filetensor.read(open(os.path.join(root, path_test_10class)))