nnet_ops -> nnet

examples/logistic_regression.py

@@ -2,7 +2,7 @@ import sys
 sys.path.insert(0, '..')
 import theano
 from theano import tensor as T
-from theano.tensor import nnet_ops
+from theano.tensor import nnet
 from theano.compile import module
 from theano import printing, pprint
 from theano import compile

theano/tensor/opt.py

@@ -485,7 +485,7 @@ class Canonizer(gof.LocalOptimizer):
                 dcc += 1
                 denum.remove(v)
                 denumct.append(ct)
-        if self.use_reciprocal:
+        if self.use_reciprocal or num:
             ct = self.calculate(numct, denumct, aslist = True)
         else:
             ct = [self.calculate(numct, denumct, aslist = False)]
@@ -540,7 +540,7 @@ def mul_calculate(num, denum, aslist = False):
             return [v]
     return v
 
-local_mul_canonizer = Canonizer(T.mul, T.div, T.inv, mul_calculate)
+local_mul_canonizer = Canonizer(T.mul, T.div, T.inv, mul_calculate, False)
 
 @gof.local_optimizer([T.neg])
 def local_neg_to_mul(node):

theano/tensor/tests/test_nnet_ops.py → theano/tensor/tests/test_nnet.py

@@ -6,7 +6,7 @@ from theano import gof
 import test_basic as TT
 import numpy
 
-from theano.tensor.nnet_ops import *
+from theano.tensor.nnet import *
 
 
 class T_sigmoid(unittest.TestCase):