# HG changeset patch
# User James Bergstra <bergstrj@iro.umontreal.ca>
# Date 1305730221 14400
# Node ID 94268a161925a755603c0b59feaa2e4ee6fa2ac3
# Parent  86bf03990aade33a2524168a5c9c6d727066efe3
memmap support in Dataset op

diff -r 86bf03990aad -r 94268a161925 pylearn/dataset_ops/protocol.py
--- a/pylearn/dataset_ops/protocol.py	Wed Apr 06 13:53:00 2011 -0400
+++ b/pylearn/dataset_ops/protocol.py	Wed May 18 10:50:21 2011 -0400
@@ -3,6 +3,7 @@
 """
 
 __docformat__  = "restructuredtext_en"
+import numpy
 import theano
 
 class Dataset(theano.Op):
@@ -119,6 +120,6 @@
         except:
             x = self.x_ = self.fn(*self.fn_args)
         if idx.ndim == 0:
-            z[0] = x[int(idx)]
+            z[0] = numpy.asarray(x[int(idx)]) # asarray is important for memmaps
         else:
-            z[0] = x[idx]
+            z[0] = numpy.asarray(x[idx]) # asarray is important for memmaps