changeset 665:070a7d68d3a1

Changed RModule to deprecated.RModule .... temporarily until they are fixed with the new RandomStreams
author desjagui@atchoum.iro.umontreal.ca
date Wed, 11 Mar 2009 11:13:29 -0400
parents 576eb7f77c35
children 719194960d18
files pylearn/algorithms/daa.py pylearn/algorithms/rbm.py pylearn/algorithms/stacker.py
diffstat 3 files changed, 8 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/pylearn/algorithms/daa.py	Wed Mar 11 00:09:22 2009 -0400
+++ b/pylearn/algorithms/daa.py	Wed Mar 11 11:13:29 2009 -0400
@@ -2,11 +2,13 @@
 import theano
 from theano import tensor as T
 from theano.tensor import nnet as NN
+from theano.tensor.deprecated import rmodule
+
 import numpy as N
 
-from pylearn import cost as cost
+from pylearn.algorithms import cost
 
-class DenoisingAA(T.RModule):
+class DenoisingAA(rmodule.RModule):
     """De-noising Auto-encoder
 
     WRITEME
--- a/pylearn/algorithms/rbm.py	Wed Mar 11 00:09:22 2009 -0400
+++ b/pylearn/algorithms/rbm.py	Wed Mar 11 11:13:29 2009 -0400
@@ -1,6 +1,7 @@
 import sys, copy
 import theano
 from theano import tensor as T
+from theano.tensor.deprecated import rmodule
 from theano.tensor.nnet import sigmoid
 from theano.compile import module
 from theano import printing, pprint
@@ -12,7 +13,7 @@
 from .minimizer import make_minimizer
 from .stopper import make_stopper
 
-class RBM(T.RModule):
+class RBM(rmodule.RModule):
 
     # is it really necessary to pass ALL of these ? - GD
     def __init__(self,
--- a/pylearn/algorithms/stacker.py	Wed Mar 11 00:09:22 2009 -0400
+++ b/pylearn/algorithms/stacker.py	Wed Mar 11 11:13:29 2009 -0400
@@ -7,10 +7,11 @@
 
 import theano
 from theano import tensor as T
+from theano.tensor.deprecated import rmodule
 import sys
 import numpy as N
 
-class Stacker(T.RModule):
+class Stacker(rmodule.RModule):
     """
     @note: Assumes some names in the layers: input, cost, lr, and update
     @todo: Maybe compile functions on demand, rather than immediately.