path is now treated as a theano variable

theano/tensor/basic.py

@@ -2029,30 +2029,34 @@ class LoadFromDisk(Op):
     """
     @note: Non-differentiable.
     """
-    def __init__(self, path, dtype):
-        self.path = path
+    def __init__(self, dtype, broadcastable):
         self.dtype = dtype
+        self.broadcastable = broadcastable
 
     def __eq__(self, other):
         return (type(self) == type(other) and
-                self.path == other.path and
+                self.broadcastable == other.broadcastable and
                 self.dtype == other.dtype)
 
     def __hash__(self):
-        return hash((type(self), self.path, self.dtype))
+        return hash((type(self), self.dtype, self.broadcastable))
 
-    def make_node(self):
-        return gof.Apply(self, [], [tensor(self.dtype, broadcastable=(False,))])
+    def make_node(self, path):
+        if isinstance(path, str):
+            path = Constant(Generic(), path)
+        return gof.Apply(self, [path], [tensor(self.dtype,
+                                        broadcastable=self.broadcastable)])
 
     def perform(self, node, inp, out):
-        d = numpy.load(self.path)
+        path = inp[0]
+        d = numpy.load(path)
         out[0][0] = d[d.keys()[0]].astype(self.dtype)
 
     def __str__(self):
-        return "Load: %s"%self.path
+        return "Load: %s, %s"%(self.dtype, self.broadcastable)
 
-def load(path, dtype='float64'):
-    return LoadFromDisk(path, dtype)()
+def load(path, dtype, broadcastable):
+    return LoadFromDisk(dtype, broadcastable)(path)
 
 ##########################
 # Unary Operations

theano/tensor/tests/test_basic.py

@@ -3969,10 +3969,11 @@ class T_load_tensor(unittest.TestCase):
         data = numpy.arange(5)
         filename = "_load_tensor_test_1.npz"
         numpy.savez(filename, data)
-        x = tensor.load(filename, 'int64')
+        path = Variable(Generic())
+        x = tensor.load(path, 'int64', (False,))
         y = x*2
-        fn = function([], [y])
-        assert (fn() == data*2).all()
+        fn = function([path], [y])
+        assert (fn(filename) == data*2).all()
 
 class test_grad(unittest.TestCase):
     class O(gof.op.Op):