# HG changeset patch # User Olivier Delalleau # Date 1313590739 14400 # Node ID 625fe86e3d5ece472e5f40321b06faf009948418 # Parent 0e6ca7eecc72b713e5a1b045212fd8db9dab2aad# Parent b1af99fd7bf667878b496a8e2f22545bf16868dd Merged diff -r b1af99fd7bf6 -r 625fe86e3d5e pylearn/gd/sgd.py --- a/pylearn/gd/sgd.py Tue Aug 16 15:44:15 2011 -0400 +++ b/pylearn/gd/sgd.py Wed Aug 17 10:18:59 2011 -0400 @@ -79,7 +79,10 @@ raise TypeError('stepsize must be a scalar', stepsize) self.params = params - self.gparams = [theano.tensor.grad(cost, self.params)] if gradients is None else gradients + if gradients is None: + self.gparams = [theano.tensor.grad(cost, self.params)] + else: + self.gparams = gradients assert len(self.params) == len(self.gparams) self._updates = (dict((p, p - self.stepsize * g) for p, g in zip(self.params, self.gparams)))