# HG changeset patch
# User Pascal Lamblin <lamblinp@iro.umontreal.ca>
# Date 1232170454 18000
# Node ID f6c74f34cd3539394d963a21eb3f9e301b2fbed3
# Parent  7261e7d6368d70b774c9ea63df945ed35571c573
Use usual data_root

diff -r 7261e7d6368d -r f6c74f34cd35 pylearn/datasets/flickr.py
--- a/pylearn/datasets/flickr.py	Fri Jan 16 19:10:50 2009 -0500
+++ b/pylearn/datasets/flickr.py	Sat Jan 17 00:34:14 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)))