Adapt tests for the ops GpuSoftmax and GpuSoftmaxWithBias and register them in opt.py.

theano/sandbox/gpuarray/opt.py

@@ -20,7 +20,9 @@ from theano.sandbox.gpuarray.basic_ops import (host_from_gpu,
 from theano.sandbox.gpuarray.blas import gpu_dot22, GpuGemv, GpuGemm
 from theano.sandbox.gpuarray.conv import GpuConv
 from theano.sandbox.gpuarray.nnet import (GpuCrossentropySoftmaxArgmax1HotWithBias,
-                                          GpuCrossentropySoftmax1HotWithBiasDx)
+                                          GpuCrossentropySoftmax1HotWithBiasDx,
+                                          GpuSoftmaxWithBias,
+                                          GpuSoftmax)
 from theano.sandbox.gpuarray.elemwise import (GpuElemwise, _is_scalar,
                                               GpuDimShuffle, GpuCAReduceCuda)
 from theano.sandbox.gpuarray.subtensor import GpuIncSubtensor, GpuSubtensor
@@ -341,6 +343,15 @@ def local_gpua_crossentropysoftmaxargmax1hotwithbias(node):
 def local_gpua_crossentropysoftmax1hotwithbiasdx(node):
     return GpuCrossentropySoftmax1HotWithBiasDx()
     
+@register_opt()
+@op_lifter([tensor.nnet.GpuSoftmax])
+def local_gpua_softmax(node):
+    return GpuSoftmax()
+
+@register_opt()
+@op_lifter([tensor.nnet.GpuSoftmaxWithBias])
+def local_gpua_softmaxwithbias(node):
+    return GpuSoftmaxWithBias()
 
 @register_opt()
 @op_lifter([gpu_from_host, ConvOp])

theano/sandbox/gpuarray/tests/test_nnet.py

@@ -178,7 +178,7 @@ def test_softmax_with_bias():
     f_gpu = theano.function([x], z, mode=mode_with_gpu)
     assert f.maker.fgraph.toposort()[-1].op == T.nnet.softmax_with_bias
     assert isinstance(f_gpu.maker.fgraph.toposort()[-2].op,
-                      cuda.nnet.GpuSoftmaxWithBias)
+                      theano.sandbox.gpuarray.nnet.GpuSoftmaxWithBias)
 
     def cmp(n, m):
         #print "test_softmax",n,m
@@ -219,7 +219,7 @@ def test_softmax():
     f_gpu = theano.function([x], z, mode=mode_with_gpu)
     assert f.maker.fgraph.toposort()[-1].op == T.nnet.softmax
     assert isinstance(f_gpu.maker.fgraph.toposort()[-2].op,
-                      cuda.nnet.GpuSoftmax)
+                      theano.sandbox.gpuarray.nnet.GpuSoftmax)
 
     def cmp(n, m):
         #print "test_softmax",n,m