changeset 601:fd95ff96dd47

updated flickr to row-major files
author James Bergstra <bergstrj@iro.umontreal.ca>
date Wed, 14 Jan 2009 17:00:57 -0500
parents e56303df3c77
children 28f7dc848efc
files pylearn/datasets/flickr.py
diffstat 1 files changed, 3 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/pylearn/datasets/flickr.py	Wed Jan 14 15:54:39 2009 -0500
+++ b/pylearn/datasets/flickr.py	Wed Jan 14 17:00:57 2009 -0500
@@ -15,22 +15,19 @@
     #TODO: make path an option,
     #TODO: make default path relative to data_root()
     f = open('flickr_10classes_test.ft')
-    data = filetensor.read(f)
-    return data.T.copy() #put in to one example per row, row major
+    return filetensor.read(f)
 
 def train_10class():
     #TODO: make path an option,
     #TODO: make default path relative to data_root()
     f = open('flickr_10classes_train.ft')
-    data = filetensor.read(f)
-    return data.T.copy() #put in to one example per row, row major
+    return filetensor.read(f)
 
 def valid_10class():
     #TODO: make path an option,
     #TODO: make default path relative to data_root()
     f = open('flickr_10classes_valid.ft')
-    data = filetensor.read(f)
-    return data.T.copy() #put in to one example per row, row major
+    return filetensor.read(f)
 
 def basic_10class():
     """Return the basic flickr image classification problem.