Mercurial > pylearn

annotate nnet_ops.py @ 442:b3315b252824

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Finished derivative of softmax gradient.
author Pascal Lamblin <lamblinp@iro.umontreal.ca>
date Fri, 22 Aug 2008 15:53:34 -0400
parents 18dbc1c11647
children 060c12314734
rev   line source
419
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
1 ## This file contain ops that are not currently integrated in the core of threano.
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
2 ## Not all of those ops have been thoroughly tested.
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
3
24
2e8be9f5412b added nnet_ops
bergstrj@iro.umontreal.ca
parents:
diff changeset
4 import theano
117
3ef569b92fba ported nnet_ops to new theano
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 70
diff changeset
5 from theano import tensor, scalar
24
2e8be9f5412b added nnet_ops
bergstrj@iro.umontreal.ca
parents:
diff changeset
6 import numpy
2e8be9f5412b added nnet_ops
bergstrj@iro.umontreal.ca
parents:
diff changeset
7
69
8c2607f387e6 added softplus, elaborated sigmoid
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 68
diff changeset
8 ############
8c2607f387e6 added softplus, elaborated sigmoid
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 68
diff changeset
9 #
8c2607f387e6 added softplus, elaborated sigmoid
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 68
diff changeset
10 # SCALAR OPS
8c2607f387e6 added softplus, elaborated sigmoid
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 68
diff changeset
11 #
8c2607f387e6 added softplus, elaborated sigmoid
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 68
diff changeset
12
117
3ef569b92fba ported nnet_ops to new theano
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 70
diff changeset
13 class ScalarSigmoid(scalar.UnaryScalarOp):
69
8c2607f387e6 added softplus, elaborated sigmoid
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 68
diff changeset
14 @staticmethod
8c2607f387e6 added softplus, elaborated sigmoid
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 68
diff changeset
15 def st_impl(x):
8c2607f387e6 added softplus, elaborated sigmoid
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 68
diff changeset
16 if x < -30.0:
8c2607f387e6 added softplus, elaborated sigmoid
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 68
diff changeset
17 return 0.0
8c2607f387e6 added softplus, elaborated sigmoid
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 68
diff changeset
18 if x > 30.0:
8c2607f387e6 added softplus, elaborated sigmoid
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 68
diff changeset
19 return 1.0
8c2607f387e6 added softplus, elaborated sigmoid
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 68
diff changeset
20 return 1.0 / (1.0 + numpy.exp(-x))
24
2e8be9f5412b added nnet_ops
bergstrj@iro.umontreal.ca
parents:
diff changeset
21 def impl(self, x):
69
8c2607f387e6 added softplus, elaborated sigmoid
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 68
diff changeset
22 return ScalarSigmoid.st_impl(x)
24
2e8be9f5412b added nnet_ops
bergstrj@iro.umontreal.ca
parents:
diff changeset
23 def grad(self, (x,), (gz,)):
69
8c2607f387e6 added softplus, elaborated sigmoid
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 68
diff changeset
24 y = scalar_sigmoid(x)
8c2607f387e6 added softplus, elaborated sigmoid
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 68
diff changeset
25 return [gz * y * (1.0 - y)]
181
1b06bc2c3ca9 fixed c_code for the ops in nnet_ops.py
Olivier Breuleux <breuleuo@iro.umontreal.ca>
parents: 121
diff changeset
26 def c_code(self, node, name, (x,), (z,), sub):
1b06bc2c3ca9 fixed c_code for the ops in nnet_ops.py
Olivier Breuleux <breuleuo@iro.umontreal.ca>
parents: 121
diff changeset
27 if node.inputs[0].type in [scalar.float32, scalar.float64]:
69
8c2607f387e6 added softplus, elaborated sigmoid
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 68
diff changeset
28 return """%(z)s =
8c2607f387e6 added softplus, elaborated sigmoid
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 68
diff changeset
29 %(x)s < -30.0
8c2607f387e6 added softplus, elaborated sigmoid
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 68
diff changeset
30 ? 0.0
8c2607f387e6 added softplus, elaborated sigmoid
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 68
diff changeset
31 : %(x)s > 30.0
8c2607f387e6 added softplus, elaborated sigmoid
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 68
diff changeset
32 ? 1.0
8c2607f387e6 added softplus, elaborated sigmoid
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 68
diff changeset
33 : 1.0 /(1.0+exp(-%(x)s));""" % locals()
181
1b06bc2c3ca9 fixed c_code for the ops in nnet_ops.py
Olivier Breuleux <breuleuo@iro.umontreal.ca>
parents: 121
diff changeset
34 raise NotImplementedError('only floatingpoint is implemented')
117
3ef569b92fba ported nnet_ops to new theano
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 70
diff changeset
35 scalar_sigmoid = ScalarSigmoid(scalar.upgrade_to_float, name='scalar_sigmoid')
3ef569b92fba ported nnet_ops to new theano
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 70
diff changeset
36 sigmoid = tensor.Elemwise(scalar_sigmoid, name='sigmoid')
24
2e8be9f5412b added nnet_ops
bergstrj@iro.umontreal.ca
parents:
diff changeset
37
117
3ef569b92fba ported nnet_ops to new theano
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 70
diff changeset
38 class ScalarSoftplus(scalar.UnaryScalarOp):
69
8c2607f387e6 added softplus, elaborated sigmoid
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 68
diff changeset
39 @staticmethod
8c2607f387e6 added softplus, elaborated sigmoid
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 68
diff changeset
40 def static_impl(x):
8c2607f387e6 added softplus, elaborated sigmoid
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 68
diff changeset
41 if x < -30.0:
8c2607f387e6 added softplus, elaborated sigmoid
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 68
diff changeset
42 return 0.0
8c2607f387e6 added softplus, elaborated sigmoid
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 68
diff changeset
43 if x > 30.0:
8c2607f387e6 added softplus, elaborated sigmoid
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 68
diff changeset
44 return x
8c2607f387e6 added softplus, elaborated sigmoid
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 68
diff changeset
45 return numpy.log1p(numpy.exp(x))
8c2607f387e6 added softplus, elaborated sigmoid
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 68
diff changeset
46 def impl(self, x):
8c2607f387e6 added softplus, elaborated sigmoid
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 68
diff changeset
47 return ScalarSoftplus.static_impl(x)
8c2607f387e6 added softplus, elaborated sigmoid
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 68
diff changeset
48 def grad(self, (x,), (gz,)):
8c2607f387e6 added softplus, elaborated sigmoid
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 68
diff changeset
49 return [gz * scalar_sigmoid(x)]
222
f6a7eb1b7970 redo what James had done, so invert node and name
Thierry Bertin-Mahieux <bertinmt@iro.umontreal.ca>
parents: 218
diff changeset
50 def c_code(self, node, name, (x,), (z,), sub):
181
1b06bc2c3ca9 fixed c_code for the ops in nnet_ops.py
Olivier Breuleux <breuleuo@iro.umontreal.ca>
parents: 121
diff changeset
51 if node.inputs[0].type in [scalar.float32, scalar.float64]:
69
8c2607f387e6 added softplus, elaborated sigmoid
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 68
diff changeset
52 return """%(z)s =
8c2607f387e6 added softplus, elaborated sigmoid
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 68
diff changeset
53 %(x)s < -30.0
8c2607f387e6 added softplus, elaborated sigmoid
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 68
diff changeset
54 ? 0.0
8c2607f387e6 added softplus, elaborated sigmoid
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 68
diff changeset
55 : %(x)s > 30.0
8c2607f387e6 added softplus, elaborated sigmoid
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 68
diff changeset
56 ? %(x)s
8c2607f387e6 added softplus, elaborated sigmoid
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 68
diff changeset
57 : log1p(exp(%(x)s));""" % locals()
181
1b06bc2c3ca9 fixed c_code for the ops in nnet_ops.py
Olivier Breuleux <breuleuo@iro.umontreal.ca>
parents: 121
diff changeset
58 raise NotImplementedError('only floating point x is implemented')
117
3ef569b92fba ported nnet_ops to new theano
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 70
diff changeset
59 scalar_softplus = ScalarSoftplus(scalar.upgrade_to_float, name='scalar_softplus')
3ef569b92fba ported nnet_ops to new theano
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 70
diff changeset
60 softplus = tensor.Elemwise(scalar_softplus, name='softplus')
69
8c2607f387e6 added softplus, elaborated sigmoid
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 68
diff changeset
61
8c2607f387e6 added softplus, elaborated sigmoid
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 68
diff changeset
62
8c2607f387e6 added softplus, elaborated sigmoid
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 68
diff changeset
63 ############
8c2607f387e6 added softplus, elaborated sigmoid
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 68
diff changeset
64 #
8c2607f387e6 added softplus, elaborated sigmoid
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 68
diff changeset
65 # TENSOR OPS
8c2607f387e6 added softplus, elaborated sigmoid
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 68
diff changeset
66 #
24
2e8be9f5412b added nnet_ops
bergstrj@iro.umontreal.ca
parents:
diff changeset
67
440
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
68
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
69 class SoftmaxWithBias(theano.Op):
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
70 """
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
71 An L{Op} for the output of neural-net multiclass classifiers.
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
72
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
73 @type x: is a matrix of floats (32 or 64)
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
74 @type b: is a [row] vector of floats (32 or 64), length is number of cols in x
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
75
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
76 This L{Op}'s output is softmax(x+b).
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
77 softmax(x[i]) is the i'th distribution over len(x[i]) options.
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
78 """
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
79
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
80 nin = 2
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
81 nout = 1
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
82 def __init__(self, **kwargs):
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
83 theano.Op.__init__(self, **kwargs)
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
84
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
85 def make_node(self, x, b):
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
86 x = tensor.as_tensor(x)
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
87 b = tensor.as_tensor(b)
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
88 if x.type.ndim != 2 \
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
89 or x.type.dtype not in ['float32', 'float64']:
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
90 raise ValueError('x must be 2-d tensor of floats')
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
91 if b.type.ndim != 1 \
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
92 or x.type.dtype not in ['float32', 'float64']:
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
93 raise ValueError('b must be 1-d tensor of floats')
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
94
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
95 sm = x.type.make_result()
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
96 return theano.Apply(self, [x, b], [sm])
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
97
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
98 def perform(self, node, input_storage, output_storage):
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
99 x, b = input_storage
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
100 if b.shape[0] != x.shape[1]:
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
101 raise ValueError('b must have same number of columns as x')
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
102
442
b3315b252824 Finished derivative of softmax gradient.
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 440
diff changeset
103 sm = numpy.zeros_like(x)
440
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
104 for i in xrange(sm.shape[0]):
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
105 row = x[i] + b
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
106 sm[i] = numpy.exp(row - numpy.max(row))
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
107 sm[i] *= 1.0 / numpy.sum(sm[i])
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
108 output_storage[0][0] = nll
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
109
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
110 def grad(self, (x, b), (g_sm,)):
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
111 sm = softmax_with_bias(x, b)
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
112 dx = SoftmaxWithBiasDx()(g_sm, sm)
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
113 db = tensor.sum(dx, axis = 0)
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
114 return dx, db
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
115
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
116 def c_headers(self):
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
117 return ['<iostream>']
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
118
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
119 @staticmethod
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
120 def c_code_template():
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
121 # this implementation was lifted from
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
122 # /u/bergstrj/cvs/bergstrj/src/feb07/nn.cxx
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
123
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
124 #TODO: put this into a templated function, in the support code
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
125 #TODO: declare the max of each row as an Op output
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
126
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
127 #TODO: set error messages for failures in this code
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
128
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
129 #TODO: use this to accept float32 and int32: node.inputs[0].type.dtype_specs()[1]
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
130 init_decl = """
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
131 npy_intp* Nx = %(x)s->dimensions;
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
132
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
133 if (%(x)s->nd != 2)
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
134 {
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
135 PyErr_SetString(PyExc_ValueError, "a not 2d tensor");
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
136 %(fail)s;
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
137 }
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
138 if (%(b)s->nd != 1)
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
139 {
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
140 PyErr_SetString(PyExc_ValueError, "b not 1d tensor");
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
141 %(fail)s;
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
142 }
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
143 if (%(x)s->descr->type_num != PyArray_DOUBLE)
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
144 {
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
145 PyErr_SetString(PyExc_TypeError, "a not float64");
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
146 %(fail)s;
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
147 }
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
148 if (%(b)s->descr->type_num != PyArray_DOUBLE)
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
149 {
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
150 PyErr_SetString(PyExc_TypeError, "b not float64");
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
151 %(fail)s;
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
152 }
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
153 if ((%(x)s->dimensions[1] != %(b)s->dimensions[0]))
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
154 {
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
155 PyErr_SetString(PyExc_ValueError, "dimension mismatch in arguments");
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
156 %(fail)s;
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
157 }
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
158
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
159 if ((NULL == %(sm)s)
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
160 || (%(sm)s->dimensions[0] != %(x)s->dimensions[0])
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
161 || (%(sm)s->dimensions[1] != %(x)s->dimensions[1]))
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
162 {
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
163 if (NULL != %(sm)s) Py_XDECREF(%(sm)s);
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
164 %(sm)s = (PyArrayObject*)PyArray_SimpleNew(2, PyArray_DIMS(%(x)s), type_num_%(x)s);
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
165 if(!%(sm)s) {
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
166 // The normal cleanup code will take care of %(nll)s
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
167 // Py_XDECREF(%(nll)s); %(nll)s=NULL;
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
168 PyErr_SetString(PyExc_MemoryError, "failed to alloc sm output");
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
169 %(fail)s
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
170 }
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
171 }
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
172 """
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
173
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
174 begin_row_loop = """
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
175 for (size_t i = 0; i < Nx[0]; ++i)
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
176 {
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
177 size_t j;
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
178 double sum = 0.0;
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
179 bool discount_max = false;
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
180
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
181 const double* __restrict__ x_i = (double*)(%(x)s->data + %(x)s->strides[0] * i);
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
182 const double* __restrict__ b_i = (double*)(%(b)s->data);
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
183 double* __restrict__ sm_i = (double*)(%(sm)s->data + %(sm)s->strides[0] * i);
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
184 """
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
185
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
186 inside_row_loop = """
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
187 npy_intp Sx = %(x)s->strides[1]/sizeof(double);
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
188 npy_intp Sb = %(b)s->strides[0]/sizeof(double);
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
189 npy_intp Ssm = %(sm)s->strides[1]/sizeof(double);
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
190
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
191 size_t row_max_j=0;
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
192 double row_max = x_i[0] + b_i[0];
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
193 // Get the maximum value of the row
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
194 for (j = 0; j < Nx[1]; ++j)
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
195 {
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
196 double row_ij = x_i[j * Sx] + b_i[j * Sb];
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
197 row_max_j = (row_ij > row_max) ? j : row_max_j;
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
198 row_max = (row_ij > row_max) ? row_ij : row_max;
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
199 }
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
200
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
201 for (j = 0; j < Nx[1]; ++j)
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
202 {
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
203 double row_ij = x_i[j * Sx] + b_i[j * Sb];
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
204 double sm_ij = exp(row_ij - row_max);
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
205 sum += sm_ij;
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
206 sm_i[j * Ssm] = sm_ij;
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
207 }
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
208 if ( (0.0 == sum) || (isinf(sum)))
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
209 {
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
210 //that was our best...
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
211 %(fail)s;
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
212 }
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
213
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
214 //cblas_dscal(x.N, 1.0 / sum, &mat_at(s,i,0), s.n);
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
215 double sum_inv = 1.0 / sum;
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
216 for (j = 0; j < Nx[1]; ++j)
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
217 {
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
218 sm_i[j * Ssm] *= sum_inv;
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
219 }
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
220
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
221 if (y_i >= Nx[1])
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
222 {
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
223 %(fail)s;
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
224 }
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
225 """
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
226
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
227 end_row_loop = """
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
228 }
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
229 """
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
230
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
231 return (init_decl, begin_row_loop, inside_row_loop, end_row_loop)
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
232
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
233
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
234 def c_code(self, node, name, (x, b), (sm,), sub):
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
235 code_template = ''.join(self.c_code_template())
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
236 return code_template % dict(locals(), **sub)
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
237
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
238 softmax_with_bias = SoftmaxWithBias()
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
239
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
240
442
b3315b252824 Finished derivative of softmax gradient.
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 440
diff changeset
241 class SoftmaxWithBiasDx(theano.Op):
b3315b252824 Finished derivative of softmax gradient.
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 440
diff changeset
242 nin = 2
b3315b252824 Finished derivative of softmax gradient.
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 440
diff changeset
243 nout = 1
b3315b252824 Finished derivative of softmax gradient.
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 440
diff changeset
244 """Gradient wrt x of the SoftmaxWithBias Op"""
b3315b252824 Finished derivative of softmax gradient.
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 440
diff changeset
245
b3315b252824 Finished derivative of softmax gradient.
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 440
diff changeset
246 def __init__(self, **kwargs):
b3315b252824 Finished derivative of softmax gradient.
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 440
diff changeset
247 theano.Op.__init__(self, **kwargs)
b3315b252824 Finished derivative of softmax gradient.
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 440
diff changeset
248
b3315b252824 Finished derivative of softmax gradient.
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 440
diff changeset
249 def make_node(self, dy, sm, **kwargs):
b3315b252824 Finished derivative of softmax gradient.
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 440
diff changeset
250 dy = tensor.as_tensor(dy)
b3315b252824 Finished derivative of softmax gradient.
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 440
diff changeset
251 sm = tensor.as_tensor(sm)
b3315b252824 Finished derivative of softmax gradient.
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 440
diff changeset
252 return theano.Apply(self, [dy, sm], [sm.type.make_result()])
b3315b252824 Finished derivative of softmax gradient.
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 440
diff changeset
253
b3315b252824 Finished derivative of softmax gradient.
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 440
diff changeset
254 def perform(self, node, input_storage, output_storage):
b3315b252824 Finished derivative of softmax gradient.
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 440
diff changeset
255 dy, sm = input_storage
b3315b252824 Finished derivative of softmax gradient.
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 440
diff changeset
256 dx = numpy.zeros_like(sm)
b3315b252824 Finished derivative of softmax gradient.
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 440
diff changeset
257 #dx[i,j] = - (\sum_k dy[i,k] sm[i,k]) sm[i,j] + dy[i,j] sm[i,j]
b3315b252824 Finished derivative of softmax gradient.
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 440
diff changeset
258 for i in xrange(sm.shape[0]):
b3315b252824 Finished derivative of softmax gradient.
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 440
diff changeset
259 dy_times_sm_i = dy[i] * sm[i]
b3315b252824 Finished derivative of softmax gradient.
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 440
diff changeset
260 dx[i] = dy_times_sm - sum(dy_times_sm_i) * y[i]
b3315b252824 Finished derivative of softmax gradient.
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 440
diff changeset
261 output_storage[0][0] = dx
b3315b252824 Finished derivative of softmax gradient.
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 440
diff changeset
262
b3315b252824 Finished derivative of softmax gradient.
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 440
diff changeset
263 def grad(self, *args):
b3315b252824 Finished derivative of softmax gradient.
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 440
diff changeset
264 raise NotImplementedError()
b3315b252824 Finished derivative of softmax gradient.
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 440
diff changeset
265
b3315b252824 Finished derivative of softmax gradient.
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 440
diff changeset
266 def c_code(self, node, name, (dy, sm), (dx,), sub):
b3315b252824 Finished derivative of softmax gradient.
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 440
diff changeset
267 return '''
b3315b252824 Finished derivative of softmax gradient.
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 440
diff changeset
268 if ((%(dy)s->descr->type_num != PyArray_DOUBLE)
b3315b252824 Finished derivative of softmax gradient.
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 440
diff changeset
269 || (%(sm)s->descr->type_num != PyArray_DOUBLE))
b3315b252824 Finished derivative of softmax gradient.
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 440
diff changeset
270 {
b3315b252824 Finished derivative of softmax gradient.
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 440
diff changeset
271 PyErr_SetString(PyExc_TypeError, "types should be float64, float64");
b3315b252824 Finished derivative of softmax gradient.
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 440
diff changeset
272 %(fail)s;
b3315b252824 Finished derivative of softmax gradient.
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 440
diff changeset
273 }
b3315b252824 Finished derivative of softmax gradient.
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 440
diff changeset
274 if ((%(dy)s->nd != 2)
b3315b252824 Finished derivative of softmax gradient.
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 440
diff changeset
275 || (%(sm)s->nd != 2))
b3315b252824 Finished derivative of softmax gradient.
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 440
diff changeset
276 {
b3315b252824 Finished derivative of softmax gradient.
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 440
diff changeset
277 PyErr_SetString(PyExc_ValueError, "rank error");
b3315b252824 Finished derivative of softmax gradient.
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 440
diff changeset
278 %(fail)s;
b3315b252824 Finished derivative of softmax gradient.
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 440
diff changeset
279 }
b3315b252824 Finished derivative of softmax gradient.
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 440
diff changeset
280 if (%(dy)s->dimensions[0] != %(sm)s->dimensions[0])
b3315b252824 Finished derivative of softmax gradient.
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 440
diff changeset
281 {
b3315b252824 Finished derivative of softmax gradient.
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 440
diff changeset
282 PyErr_SetString(PyExc_ValueError, "dimension mismatch");
b3315b252824 Finished derivative of softmax gradient.
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 440
diff changeset
283 %(fail)s;
b3315b252824 Finished derivative of softmax gradient.
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 440
diff changeset
284 }
b3315b252824 Finished derivative of softmax gradient.
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 440
diff changeset
285 if ((NULL == %(dx)s)
b3315b252824 Finished derivative of softmax gradient.
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 440
diff changeset
286 || (%(dx)s->dimensions[0] != %(sm)s->dimensions[0])
b3315b252824 Finished derivative of softmax gradient.
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 440
diff changeset
287 || (%(dx)s->dimensions[1] != %(sm)s->dimensions[1]))
b3315b252824 Finished derivative of softmax gradient.
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 440
diff changeset
288 {
b3315b252824 Finished derivative of softmax gradient.
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 440
diff changeset
289 Py_XDECREF(%(dx)s);
b3315b252824 Finished derivative of softmax gradient.
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 440
diff changeset
290 %(dx)s = (PyArrayObject*) PyArray_SimpleNew(2, PyArray_DIMS(%(sm)s),
b3315b252824 Finished derivative of softmax gradient.
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 440
diff changeset
291 type_num_%(sm)s);
b3315b252824 Finished derivative of softmax gradient.
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 440
diff changeset
292 if (!%(dx)s)
b3315b252824 Finished derivative of softmax gradient.
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 440
diff changeset
293 {
b3315b252824 Finished derivative of softmax gradient.
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 440
diff changeset
294 PyErr_SetString(PyExc_MemoryError, "failed to alloc dx output");
b3315b252824 Finished derivative of softmax gradient.
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 440
diff changeset
295 %(fail)s;
b3315b252824 Finished derivative of softmax gradient.
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 440
diff changeset
296 }
b3315b252824 Finished derivative of softmax gradient.
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 440
diff changeset
297 }
b3315b252824 Finished derivative of softmax gradient.
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 440
diff changeset
298
b3315b252824 Finished derivative of softmax gradient.
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 440
diff changeset
299 for (size_t i = 0; i < %(dx)s->dimenstions[0]; ++i)
b3315b252824 Finished derivative of softmax gradient.
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 440
diff changeset
300 {
b3315b252824 Finished derivative of softmax gradient.
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 440
diff changeset
301 const double* __restrict__ dy_i = (double*) (%(dy)s->data + %(dy)s->strides[0] * i);
b3315b252824 Finished derivative of softmax gradient.
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 440
diff changeset
302 npy_intp Sdy = %(dy)s->strides[1]/sizeof(double);
b3315b252824 Finished derivative of softmax gradient.
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 440
diff changeset
303 const double* __restrict__ sm_i = (double*) (%(sm)s->data + %(sm)s->strides[0] * i);
b3315b252824 Finished derivative of softmax gradient.
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 440
diff changeset
304 npy_intp Ssm = %(sm)s->strides[1]/sizeof(double);
b3315b252824 Finished derivative of softmax gradient.
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 440
diff changeset
305 const double* __restrict__ dx_i = (double*) (%(dx)s->data + %(dx)s->strides[0] * i);
b3315b252824 Finished derivative of softmax gradient.
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 440
diff changeset
306 npy_intp Sdx = %(dx)s->strides[1]/sizeof(double);
b3315b252824 Finished derivative of softmax gradient.
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 440
diff changeset
307
b3315b252824 Finished derivative of softmax gradient.
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 440
diff changeset
308 double sum_dy_times_sm = 0.;
b3315b252824 Finished derivative of softmax gradient.
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 440
diff changeset
309 for (size_t j = 0; j < %(dx)s->dimensions[1]; ++j)
b3315b252824 Finished derivative of softmax gradient.
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 440
diff changeset
310 {
b3315b252824 Finished derivative of softmax gradient.
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 440
diff changeset
311 dx_i[j * Sdx] = dy_i[j * Sdy] * sm_i[j * Ssm];
b3315b252824 Finished derivative of softmax gradient.
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 440
diff changeset
312 sum_dy_times_sm += dx_i[j * Sdx];
b3315b252824 Finished derivative of softmax gradient.
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 440
diff changeset
313 }
b3315b252824 Finished derivative of softmax gradient.
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 440
diff changeset
314 for (size_t j = 0; j < %(dx)s->dimensions[1]; ++j)
b3315b252824 Finished derivative of softmax gradient.
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 440
diff changeset
315 {
b3315b252824 Finished derivative of softmax gradient.
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 440
diff changeset
316 dx_i[j * Sdx] -= sum_dy_times_sm * sm_i[j * Ssm];
b3315b252824 Finished derivative of softmax gradient.
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 440
diff changeset
317 }
b3315b252824 Finished derivative of softmax gradient.
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 440
diff changeset
318 }
b3315b252824 Finished derivative of softmax gradient.
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 440
diff changeset
319 ''' % dict(locals(), **sub)
b3315b252824 Finished derivative of softmax gradient.
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 440
diff changeset
320
440
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
321
117
3ef569b92fba ported nnet_ops to new theano
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 70
diff changeset
322 class CrossentropySoftmax1HotWithBias(theano.Op):
70
76e5c0f37165 better docs & precondition testing for cross_entropy_softmax_1hot & friends
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 69
diff changeset
323 """A special compound L{Op} for the output of neural-net classifiers.
76e5c0f37165 better docs & precondition testing for cross_entropy_softmax_1hot & friends
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 69
diff changeset
324
76e5c0f37165 better docs & precondition testing for cross_entropy_softmax_1hot & friends
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 69
diff changeset
325 @type x: is a matrix of floats (32 or 64)
76e5c0f37165 better docs & precondition testing for cross_entropy_softmax_1hot & friends
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 69
diff changeset
326 @type b: is a [row] vector of floats (32 or 64), length is number of cols in x
76e5c0f37165 better docs & precondition testing for cross_entropy_softmax_1hot & friends
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 69
diff changeset
327 @type y_idx: a [column] vector of int (32 or 64), length is number of rows in x
76e5c0f37165 better docs & precondition testing for cross_entropy_softmax_1hot & friends
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 69
diff changeset
328
76e5c0f37165 better docs & precondition testing for cross_entropy_softmax_1hot & friends
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 69
diff changeset
329 @precondition: every entry in y_idx is a valid (non-negative) column index into x
24
2e8be9f5412b added nnet_ops
bergstrj@iro.umontreal.ca
parents:
diff changeset
330
70
76e5c0f37165 better docs & precondition testing for cross_entropy_softmax_1hot & friends
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 69
diff changeset
331 This L{Op} has two outputs:
76e5c0f37165 better docs & precondition testing for cross_entropy_softmax_1hot & friends
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 69
diff changeset
332 - KL(softmax(x+b), y)
76e5c0f37165 better docs & precondition testing for cross_entropy_softmax_1hot & friends
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 69
diff changeset
333 - softmax(x+b)
24
2e8be9f5412b added nnet_ops
bergstrj@iro.umontreal.ca
parents:
diff changeset
334
440
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
335
24
2e8be9f5412b added nnet_ops
bergstrj@iro.umontreal.ca
parents:
diff changeset
336 softmax(x[i]) is the i'th distribution over len(x[i]) options
70
76e5c0f37165 better docs & precondition testing for cross_entropy_softmax_1hot & friends
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 69
diff changeset
337
76e5c0f37165 better docs & precondition testing for cross_entropy_softmax_1hot & friends
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 69
diff changeset
338 y_idx[i] is an integer index, encoding a 1-hot distribution.
440
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
339
70
76e5c0f37165 better docs & precondition testing for cross_entropy_softmax_1hot & friends
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 69
diff changeset
340 In practice, when we're trying to do classification, we have one row in x
76e5c0f37165 better docs & precondition testing for cross_entropy_softmax_1hot & friends
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 69
diff changeset
341 and y_idx per example, and y[i] is the index of the (correct) class of the
76e5c0f37165 better docs & precondition testing for cross_entropy_softmax_1hot & friends
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 69
diff changeset
342 i'th example.
24
2e8be9f5412b added nnet_ops
bergstrj@iro.umontreal.ca
parents:
diff changeset
343
2e8be9f5412b added nnet_ops
bergstrj@iro.umontreal.ca
parents:
diff changeset
344 """
70
76e5c0f37165 better docs & precondition testing for cross_entropy_softmax_1hot & friends
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 69
diff changeset
345 nin=3
24
2e8be9f5412b added nnet_ops
bergstrj@iro.umontreal.ca
parents:
diff changeset
346 nout=2
117
3ef569b92fba ported nnet_ops to new theano
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 70
diff changeset
347 def __init__(self, **kwargs):
3ef569b92fba ported nnet_ops to new theano
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 70
diff changeset
348 theano.Op.__init__(self, **kwargs)
3ef569b92fba ported nnet_ops to new theano
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 70
diff changeset
349
3ef569b92fba ported nnet_ops to new theano
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 70
diff changeset
350 def make_node(self, x, b, y_idx):
3ef569b92fba ported nnet_ops to new theano
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 70
diff changeset
351 x = tensor.as_tensor(x)
3ef569b92fba ported nnet_ops to new theano
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 70
diff changeset
352 b = tensor.as_tensor(b)
3ef569b92fba ported nnet_ops to new theano
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 70
diff changeset
353 y_idx = tensor.as_tensor(y_idx)
3ef569b92fba ported nnet_ops to new theano
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 70
diff changeset
354 if x.type.ndim != 2 \
3ef569b92fba ported nnet_ops to new theano
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 70
diff changeset
355 or x.type.dtype not in ['float32', 'float64']:
30
bf0145fa73e8 added c implementation for CrossentropySoftmax1Hot
bergstrj@iro.umontreal.ca
parents: 25
diff changeset
356 raise ValueError('x must be 2-d tensor of floats')
117
3ef569b92fba ported nnet_ops to new theano
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 70
diff changeset
357 if b.type.ndim != 1 \
3ef569b92fba ported nnet_ops to new theano
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 70
diff changeset
358 or x.type.dtype not in ['float32', 'float64']:
121
2ca8dccba270 debugging mlp.py
Yoshua Bengio <bengioy@iro.umontreal.ca>
parents: 117
diff changeset
359 raise ValueError('b must be 1-d tensor of floats')
117
3ef569b92fba ported nnet_ops to new theano
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 70
diff changeset
360 if y_idx.type.ndim != 1 \
185
3d953844abd3 support for more int types in crossentropysoftmax1hot
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 184
diff changeset
361 or y_idx.type.dtype not in ['int8', 'int16', 'int32', 'int64']:
121
2ca8dccba270 debugging mlp.py
Yoshua Bengio <bengioy@iro.umontreal.ca>
parents: 117
diff changeset
362 raise ValueError('y_idx must be 1-d tensor of ints')
30
bf0145fa73e8 added c implementation for CrossentropySoftmax1Hot
bergstrj@iro.umontreal.ca
parents: 25
diff changeset
363
24
2e8be9f5412b added nnet_ops
bergstrj@iro.umontreal.ca
parents:
diff changeset
364 # TODO: Is this correct? It used to be y, not y_idx
117
3ef569b92fba ported nnet_ops to new theano
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 70
diff changeset
365 nll = tensor.Tensor(x.type.dtype,
3ef569b92fba ported nnet_ops to new theano
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 70
diff changeset
366 y_idx.type.broadcastable).make_result()
24
2e8be9f5412b added nnet_ops
bergstrj@iro.umontreal.ca
parents:
diff changeset
367 # nll = Tensor(x.dtype, y.broadcastable)
117
3ef569b92fba ported nnet_ops to new theano
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 70
diff changeset
368 sm = x.type.make_result()
185
3d953844abd3 support for more int types in crossentropysoftmax1hot
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 184
diff changeset
369 return theano.Apply(self, [x, b, y_idx], [nll, sm])
117
3ef569b92fba ported nnet_ops to new theano
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 70
diff changeset
370 def perform(self, node, input_storage, output_storage):
3ef569b92fba ported nnet_ops to new theano
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 70
diff changeset
371 x, b, y_idx = input_storage
30
bf0145fa73e8 added c implementation for CrossentropySoftmax1Hot
bergstrj@iro.umontreal.ca
parents: 25
diff changeset
372 if b.shape[0] != x.shape[1]:
70
76e5c0f37165 better docs & precondition testing for cross_entropy_softmax_1hot & friends
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 69
diff changeset
373 raise ValueError('b must have same number of columns as x')
76e5c0f37165 better docs & precondition testing for cross_entropy_softmax_1hot & friends
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 69
diff changeset
374 if y_idx.shape[0] != x.shape[0]:
76e5c0f37165 better docs & precondition testing for cross_entropy_softmax_1hot & friends
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 69
diff changeset
375 raise ValueError('y_idx must have same number of rows as x')
30
bf0145fa73e8 added c implementation for CrossentropySoftmax1Hot
bergstrj@iro.umontreal.ca
parents: 25
diff changeset
376
24
2e8be9f5412b added nnet_ops
bergstrj@iro.umontreal.ca
parents:
diff changeset
377 sm = numpy.zeros_like(x) # softmax
2e8be9f5412b added nnet_ops
bergstrj@iro.umontreal.ca
parents:
diff changeset
378 nll = numpy.zeros(x.shape[0]) #nll(y | softmax(x))
2e8be9f5412b added nnet_ops
bergstrj@iro.umontreal.ca
parents:
diff changeset
379 for i in xrange(sm.shape[0]):
30
bf0145fa73e8 added c implementation for CrossentropySoftmax1Hot
bergstrj@iro.umontreal.ca
parents: 25
diff changeset
380 row = x[i] + b
bf0145fa73e8 added c implementation for CrossentropySoftmax1Hot
bergstrj@iro.umontreal.ca
parents: 25
diff changeset
381 sm[i] = numpy.exp(row - numpy.max(row)) #softmax
24
2e8be9f5412b added nnet_ops
bergstrj@iro.umontreal.ca
parents:
diff changeset
382 sm[i] *= 1.0 / numpy.sum(sm[i]) #vector scale
2e8be9f5412b added nnet_ops
bergstrj@iro.umontreal.ca
parents:
diff changeset
383 nll[i] = -numpy.log( sm[i, y_idx[i]]) #cross-entropy
117
3ef569b92fba ported nnet_ops to new theano
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 70
diff changeset
384 output_storage[0][0] = nll
3ef569b92fba ported nnet_ops to new theano
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 70
diff changeset
385 output_storage[1][0] = sm
30
bf0145fa73e8 added c implementation for CrossentropySoftmax1Hot
bergstrj@iro.umontreal.ca
parents: 25
diff changeset
386 def grad(self, (x, b, y_idx), (g_nll, g_sm)):
24
2e8be9f5412b added nnet_ops
bergstrj@iro.umontreal.ca
parents:
diff changeset
387 if g_sm is not None:
2e8be9f5412b added nnet_ops
bergstrj@iro.umontreal.ca
parents:
diff changeset
388 raise NotImplementedError()
70
76e5c0f37165 better docs & precondition testing for cross_entropy_softmax_1hot & friends
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 69
diff changeset
389 nll, sm = crossentropy_softmax_1hot_with_bias(x, b, y_idx)
117
3ef569b92fba ported nnet_ops to new theano
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 70
diff changeset
390 dx = CrossentropySoftmax1HotWithBiasDx()(g_nll, sm, y_idx)
3ef569b92fba ported nnet_ops to new theano
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 70
diff changeset
391 db = tensor.sum(dx, axis = [0])
30
bf0145fa73e8 added c implementation for CrossentropySoftmax1Hot
bergstrj@iro.umontreal.ca
parents: 25
diff changeset
392 return dx, db, None
bf0145fa73e8 added c implementation for CrossentropySoftmax1Hot
bergstrj@iro.umontreal.ca
parents: 25
diff changeset
393
67
810a8e3c85e1 fixed horrible memory leak from crossentropy...
bergstra@is23.m
parents: 34
diff changeset
394 def c_headers(self): return ['<iostream>']
440
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
395
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
396 @staticmethod
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
397 def c_code_template():
30
bf0145fa73e8 added c implementation for CrossentropySoftmax1Hot
bergstrj@iro.umontreal.ca
parents: 25
diff changeset
398 # this implementation was lifted from
bf0145fa73e8 added c implementation for CrossentropySoftmax1Hot
bergstrj@iro.umontreal.ca
parents: 25
diff changeset
399 # /u/bergstrj/cvs/bergstrj/src/feb07/nn.cxx
bf0145fa73e8 added c implementation for CrossentropySoftmax1Hot
bergstrj@iro.umontreal.ca
parents: 25
diff changeset
400
bf0145fa73e8 added c implementation for CrossentropySoftmax1Hot
bergstrj@iro.umontreal.ca
parents: 25
diff changeset
401 #TODO: put this into a templated function, in the support code
bf0145fa73e8 added c implementation for CrossentropySoftmax1Hot
bergstrj@iro.umontreal.ca
parents: 25
diff changeset
402 #TODO: declare the max of each row as an Op output
bf0145fa73e8 added c implementation for CrossentropySoftmax1Hot
bergstrj@iro.umontreal.ca
parents: 25
diff changeset
403
32
039c0f249859 added C impl for softmax dx
bergstrj@iro.umontreal.ca
parents: 30
diff changeset
404 #TODO: set error messages for failures in this code
039c0f249859 added C impl for softmax dx
bergstrj@iro.umontreal.ca
parents: 30
diff changeset
405
184
9a2aecc57a79 added TODO to nnet_ops
Olivier Breuleux <breuleuo@iro.umontreal.ca>
parents: 181
diff changeset
406 #TODO: use this to accept float32 and int32: node.inputs[0].type.dtype_specs()[1]
440
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
407 (init_decl, begin_row_loop, inside_row_loop, end_row_loop) = \
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
408 SoftmaxWithBias.c_code_template()
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
409 return (init_decl,
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
410 """
67
810a8e3c85e1 fixed horrible memory leak from crossentropy...
bergstra@is23.m
parents: 34
diff changeset
411 if (%(y_idx)s->nd != 1)
810a8e3c85e1 fixed horrible memory leak from crossentropy...
bergstra@is23.m
parents: 34
diff changeset
412 {
810a8e3c85e1 fixed horrible memory leak from crossentropy...
bergstra@is23.m
parents: 34
diff changeset
413 PyErr_SetString(PyExc_ValueError, "y_idx not 1d tensor");
810a8e3c85e1 fixed horrible memory leak from crossentropy...
bergstra@is23.m
parents: 34
diff changeset
414 %(fail)s;
810a8e3c85e1 fixed horrible memory leak from crossentropy...
bergstra@is23.m
parents: 34
diff changeset
415 }
185
3d953844abd3 support for more int types in crossentropysoftmax1hot
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 184
diff changeset
416 if ((%(y_idx)s->descr->type_num != PyArray_INT64)
3d953844abd3 support for more int types in crossentropysoftmax1hot
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 184
diff changeset
417 && (%(y_idx)s->descr->type_num != PyArray_INT32)
3d953844abd3 support for more int types in crossentropysoftmax1hot
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 184
diff changeset
418 && (%(y_idx)s->descr->type_num != PyArray_INT16)
3d953844abd3 support for more int types in crossentropysoftmax1hot
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 184
diff changeset
419 && (%(y_idx)s->descr->type_num != PyArray_INT8))
67
810a8e3c85e1 fixed horrible memory leak from crossentropy...
bergstra@is23.m
parents: 34
diff changeset
420 {
185
3d953844abd3 support for more int types in crossentropysoftmax1hot
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 184
diff changeset
421 PyErr_SetString(PyExc_TypeError, "y_idx not int8, int16, int32, or int64");
67
810a8e3c85e1 fixed horrible memory leak from crossentropy...
bergstra@is23.m
parents: 34
diff changeset
422 %(fail)s;
810a8e3c85e1 fixed horrible memory leak from crossentropy...
bergstra@is23.m
parents: 34
diff changeset
423 }
440
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
424 if (%(x)s->dimensions[0] != %(y_idx)s->dimensions[0])
67
810a8e3c85e1 fixed horrible memory leak from crossentropy...
bergstra@is23.m
parents: 34
diff changeset
425 {
810a8e3c85e1 fixed horrible memory leak from crossentropy...
bergstra@is23.m
parents: 34
diff changeset
426 PyErr_SetString(PyExc_ValueError, "dimension mismatch in arguments");
810a8e3c85e1 fixed horrible memory leak from crossentropy...
bergstra@is23.m
parents: 34
diff changeset
427 %(fail)s;
810a8e3c85e1 fixed horrible memory leak from crossentropy...
bergstra@is23.m
parents: 34
diff changeset
428 }
34
1b152f46ad0c consolidated code
bergstrj@iro.umontreal.ca
parents: 32
diff changeset
429
67
810a8e3c85e1 fixed horrible memory leak from crossentropy...
bergstra@is23.m
parents: 34
diff changeset
430 if ((NULL == %(nll)s) //initial condition
810a8e3c85e1 fixed horrible memory leak from crossentropy...
bergstra@is23.m
parents: 34
diff changeset
431 || (%(nll)s->dimensions[0] != %(y_idx)s->dimensions[0]))
810a8e3c85e1 fixed horrible memory leak from crossentropy...
bergstra@is23.m
parents: 34
diff changeset
432 {
810a8e3c85e1 fixed horrible memory leak from crossentropy...
bergstra@is23.m
parents: 34
diff changeset
433 if (NULL != %(nll)s) Py_XDECREF(%(nll)s);
810a8e3c85e1 fixed horrible memory leak from crossentropy...
bergstra@is23.m
parents: 34
diff changeset
434 %(nll)s = (PyArrayObject*)PyArray_SimpleNew(1, PyArray_DIMS(%(y_idx)s), type_num_%(x)s);
810a8e3c85e1 fixed horrible memory leak from crossentropy...
bergstra@is23.m
parents: 34
diff changeset
435 if(!%(nll)s)
810a8e3c85e1 fixed horrible memory leak from crossentropy...
bergstra@is23.m
parents: 34
diff changeset
436 {
810a8e3c85e1 fixed horrible memory leak from crossentropy...
bergstra@is23.m
parents: 34
diff changeset
437 PyErr_SetString(PyExc_MemoryError, "failed to alloc nll output");
810a8e3c85e1 fixed horrible memory leak from crossentropy...
bergstra@is23.m
parents: 34
diff changeset
438 %(fail)s;
810a8e3c85e1 fixed horrible memory leak from crossentropy...
bergstra@is23.m
parents: 34
diff changeset
439 }
34
1b152f46ad0c consolidated code
bergstrj@iro.umontreal.ca
parents: 32
diff changeset
440 }
440
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
441 """,
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
442 begin_row_loop,
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
443 """
185
3d953844abd3 support for more int types in crossentropysoftmax1hot
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 184
diff changeset
444 const %(y_idx_type)s y_i = ((%(y_idx_type)s*)(%(y_idx)s->data + %(y_idx)s->strides[0] * i))[0];
30
bf0145fa73e8 added c implementation for CrossentropySoftmax1Hot
bergstrj@iro.umontreal.ca
parents: 25
diff changeset
445 double* __restrict__ nll_i = (double*)(%(nll)s->data + %(nll)s->strides[0] * i);
440
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
446 """,
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
447 inside_row_loop,
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
448 """
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
449 nll_i[0] = - x_i[y_i*Sx]
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
450 - b_i[y_i*Sb]
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
451 + log(sum);
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
452 """,
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
453 end_row_loop)
30
bf0145fa73e8 added c implementation for CrossentropySoftmax1Hot
bergstrj@iro.umontreal.ca
parents: 25
diff changeset
454
bf0145fa73e8 added c implementation for CrossentropySoftmax1Hot
bergstrj@iro.umontreal.ca
parents: 25
diff changeset
455
440
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
456 def c_code(self, node, name, (x, b, y_idx), (nll, sm), sub):
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
457 y_idx_type = node.inputs[2].type.dtype_specs()[1]
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
458 code_template = ''.join(self.c_code_template())
18dbc1c11647 Work on softmax operators
Pascal Lamblin <lamblinp@iro.umontreal.ca>
parents: 419
diff changeset
459 return code_template % dict(locals(), **sub)
30
bf0145fa73e8 added c implementation for CrossentropySoftmax1Hot
bergstrj@iro.umontreal.ca
parents: 25
diff changeset
460
117
3ef569b92fba ported nnet_ops to new theano
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 70
diff changeset
461 crossentropy_softmax_1hot_with_bias = CrossentropySoftmax1HotWithBias()
30
bf0145fa73e8 added c implementation for CrossentropySoftmax1Hot
bergstrj@iro.umontreal.ca
parents: 25
diff changeset
462
117
3ef569b92fba ported nnet_ops to new theano
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 70
diff changeset
463 class CrossentropySoftmax1HotWithBiasDx (theano.Op):
30
bf0145fa73e8 added c implementation for CrossentropySoftmax1Hot
bergstrj@iro.umontreal.ca
parents: 25
diff changeset
464 nin=3
bf0145fa73e8 added c implementation for CrossentropySoftmax1Hot
bergstrj@iro.umontreal.ca
parents: 25
diff changeset
465 nout=1
bf0145fa73e8 added c implementation for CrossentropySoftmax1Hot
bergstrj@iro.umontreal.ca
parents: 25
diff changeset
466 """Gradient wrt x of the CrossentropySoftmax1Hot Op"""
117
3ef569b92fba ported nnet_ops to new theano
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 70
diff changeset
467 def __init__(self, **kwargs):
3ef569b92fba ported nnet_ops to new theano
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 70
diff changeset
468 theano.Op.__init__(self,**kwargs)
3ef569b92fba ported nnet_ops to new theano
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 70
diff changeset
469 def make_node(self, dy, sm, y_idx,**kwargs):
3ef569b92fba ported nnet_ops to new theano
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 70
diff changeset
470 dy = tensor.as_tensor(dy)
3ef569b92fba ported nnet_ops to new theano
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 70
diff changeset
471 sm = tensor.as_tensor(sm)
3ef569b92fba ported nnet_ops to new theano
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 70
diff changeset
472 y_idx = tensor.as_tensor(y_idx)
3ef569b92fba ported nnet_ops to new theano
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 70
diff changeset
473 return theano.Apply(self, [dy, sm, y_idx],[sm.type.make_result()])
3ef569b92fba ported nnet_ops to new theano
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 70
diff changeset
474 def perform(self, node, input_storage, output_storage):
3ef569b92fba ported nnet_ops to new theano
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 70
diff changeset
475 dy,sm,y_idx = input_storage
30
bf0145fa73e8 added c implementation for CrossentropySoftmax1Hot
bergstrj@iro.umontreal.ca
parents: 25
diff changeset
476 dx = numpy.zeros_like(sm)
bf0145fa73e8 added c implementation for CrossentropySoftmax1Hot
bergstrj@iro.umontreal.ca
parents: 25
diff changeset
477 for i in xrange(sm.shape[0]):
bf0145fa73e8 added c implementation for CrossentropySoftmax1Hot
bergstrj@iro.umontreal.ca
parents: 25
diff changeset
478 dx[i] = dy[i] * sm[i] #vector scale
bf0145fa73e8 added c implementation for CrossentropySoftmax1Hot
bergstrj@iro.umontreal.ca
parents: 25
diff changeset
479 dx[i, y_idx[i]] -= dy[i] #scalar decrement
117
3ef569b92fba ported nnet_ops to new theano
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 70
diff changeset
480 output_storage[0][0] = dx
30
bf0145fa73e8 added c implementation for CrossentropySoftmax1Hot
bergstrj@iro.umontreal.ca
parents: 25
diff changeset
481 def grad(self, *args):
bf0145fa73e8 added c implementation for CrossentropySoftmax1Hot
bergstrj@iro.umontreal.ca
parents: 25
diff changeset
482 raise NotImplementedError()
181
1b06bc2c3ca9 fixed c_code for the ops in nnet_ops.py
Olivier Breuleux <breuleuo@iro.umontreal.ca>
parents: 121
diff changeset
483 def c_code(self, node, name, (dnll, sm, y_idx), (dx,), sub):
185
3d953844abd3 support for more int types in crossentropysoftmax1hot
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 184
diff changeset
484 y_idx_type = node.inputs[2].type.dtype_specs()[1]
32
039c0f249859 added C impl for softmax dx
bergstrj@iro.umontreal.ca
parents: 30
diff changeset
485 return """
039c0f249859 added C impl for softmax dx
bergstrj@iro.umontreal.ca
parents: 30
diff changeset
486
67
810a8e3c85e1 fixed horrible memory leak from crossentropy...
bergstra@is23.m
parents: 34
diff changeset
487 if ((%(dnll)s->descr->type_num != PyArray_DOUBLE)
810a8e3c85e1 fixed horrible memory leak from crossentropy...
bergstra@is23.m
parents: 34
diff changeset
488 || (%(sm)s->descr->type_num != PyArray_DOUBLE)
185
3d953844abd3 support for more int types in crossentropysoftmax1hot
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 184
diff changeset
489 )
67
810a8e3c85e1 fixed horrible memory leak from crossentropy...
bergstra@is23.m
parents: 34
diff changeset
490 {
810a8e3c85e1 fixed horrible memory leak from crossentropy...
bergstra@is23.m
parents: 34
diff changeset
491 PyErr_SetString(PyExc_TypeError, "types should be float64, float64, int64");
810a8e3c85e1 fixed horrible memory leak from crossentropy...
bergstra@is23.m
parents: 34
diff changeset
492 %(fail)s;
810a8e3c85e1 fixed horrible memory leak from crossentropy...
bergstra@is23.m
parents: 34
diff changeset
493 }
185
3d953844abd3 support for more int types in crossentropysoftmax1hot
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 184
diff changeset
494 if ((%(y_idx)s->descr->type_num != PyArray_INT64)
3d953844abd3 support for more int types in crossentropysoftmax1hot
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 184
diff changeset
495 && (%(y_idx)s->descr->type_num != PyArray_INT32)
3d953844abd3 support for more int types in crossentropysoftmax1hot
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 184
diff changeset
496 && (%(y_idx)s->descr->type_num != PyArray_INT16)
3d953844abd3 support for more int types in crossentropysoftmax1hot
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 184
diff changeset
497 && (%(y_idx)s->descr->type_num != PyArray_INT8))
3d953844abd3 support for more int types in crossentropysoftmax1hot
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 184
diff changeset
498 {
3d953844abd3 support for more int types in crossentropysoftmax1hot
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 184
diff changeset
499 PyErr_SetString(PyExc_TypeError, "y_idx not int8, int16, int32, or int64");
3d953844abd3 support for more int types in crossentropysoftmax1hot
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 184
diff changeset
500 %(fail)s;
3d953844abd3 support for more int types in crossentropysoftmax1hot
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 184
diff changeset
501 }
67
810a8e3c85e1 fixed horrible memory leak from crossentropy...
bergstra@is23.m
parents: 34
diff changeset
502 if ((%(dnll)s->nd != 1)
810a8e3c85e1 fixed horrible memory leak from crossentropy...
bergstra@is23.m
parents: 34
diff changeset
503 || (%(sm)s->nd != 2)
810a8e3c85e1 fixed horrible memory leak from crossentropy...
bergstra@is23.m
parents: 34
diff changeset
504 || (%(y_idx)s->nd != 1))
810a8e3c85e1 fixed horrible memory leak from crossentropy...
bergstra@is23.m
parents: 34
diff changeset
505 {
810a8e3c85e1 fixed horrible memory leak from crossentropy...
bergstra@is23.m
parents: 34
diff changeset
506 PyErr_SetString(PyExc_ValueError, "rank error");
810a8e3c85e1 fixed horrible memory leak from crossentropy...
bergstra@is23.m
parents: 34
diff changeset
507 %(fail)s;
810a8e3c85e1 fixed horrible memory leak from crossentropy...
bergstra@is23.m
parents: 34
diff changeset
508 }
810a8e3c85e1 fixed horrible memory leak from crossentropy...
bergstra@is23.m
parents: 34
diff changeset
509 if ((%(dnll)s->dimensions[0] != %(sm)s->dimensions[0])
68
315eb36ff954 fixed typo in crossentropy_dx.c_code
bergstra@is23.m
parents: 67
diff changeset
510 || (%(dnll)s->dimensions[0] != %(y_idx)s->dimensions[0]))
67
810a8e3c85e1 fixed horrible memory leak from crossentropy...
bergstra@is23.m
parents: 34
diff changeset
511 {
810a8e3c85e1 fixed horrible memory leak from crossentropy...
bergstra@is23.m
parents: 34
diff changeset
512 PyErr_SetString(PyExc_ValueError, "dimension mismatch");
810a8e3c85e1 fixed horrible memory leak from crossentropy...
bergstra@is23.m
parents: 34
diff changeset
513 %(fail)s;
810a8e3c85e1 fixed horrible memory leak from crossentropy...
bergstra@is23.m
parents: 34
diff changeset
514 }
810a8e3c85e1 fixed horrible memory leak from crossentropy...
bergstra@is23.m
parents: 34
diff changeset
515 if ((NULL == %(dx)s)
810a8e3c85e1 fixed horrible memory leak from crossentropy...
bergstra@is23.m
parents: 34
diff changeset
516 || (%(dx)s->dimensions[0] != %(sm)s->dimensions[0])
810a8e3c85e1 fixed horrible memory leak from crossentropy...
bergstra@is23.m
parents: 34
diff changeset
517 || (%(dx)s->dimensions[1] != %(sm)s->dimensions[1]))
810a8e3c85e1 fixed horrible memory leak from crossentropy...
bergstra@is23.m
parents: 34
diff changeset
518 {
810a8e3c85e1 fixed horrible memory leak from crossentropy...
bergstra@is23.m
parents: 34
diff changeset
519 if (NULL != %(dx)s) Py_XDECREF(%(dx)s);
68
315eb36ff954 fixed typo in crossentropy_dx.c_code
bergstra@is23.m
parents: 67
diff changeset
520 %(dx)s = (PyArrayObject*)PyArray_SimpleNew(2, PyArray_DIMS(%(sm)s), type_num_%(sm)s);
67
810a8e3c85e1 fixed horrible memory leak from crossentropy...
bergstra@is23.m
parents: 34
diff changeset
521 if(!%(dx)s) {
810a8e3c85e1 fixed horrible memory leak from crossentropy...
bergstra@is23.m
parents: 34
diff changeset
522 PyErr_SetString(PyExc_MemoryError, "failed to alloc dx output");
810a8e3c85e1 fixed horrible memory leak from crossentropy...
bergstra@is23.m
parents: 34
diff changeset
523 %(fail)s
810a8e3c85e1 fixed horrible memory leak from crossentropy...
bergstra@is23.m
parents: 34
diff changeset
524 }
810a8e3c85e1 fixed horrible memory leak from crossentropy...
bergstra@is23.m
parents: 34
diff changeset
525 }
24
2e8be9f5412b added nnet_ops
bergstrj@iro.umontreal.ca
parents:
diff changeset
526
67
810a8e3c85e1 fixed horrible memory leak from crossentropy...
bergstra@is23.m
parents: 34
diff changeset
527 for (size_t i = 0; i < %(dx)s->dimensions[0]; ++i)
32
039c0f249859 added C impl for softmax dx
bergstrj@iro.umontreal.ca
parents: 30
diff changeset
528 {
039c0f249859 added C impl for softmax dx
bergstrj@iro.umontreal.ca
parents: 30
diff changeset
529 const double dnll_i = ((double*)(%(dnll)s->data + %(dnll)s->strides[0] * i))[0];
039c0f249859 added C impl for softmax dx
bergstrj@iro.umontreal.ca
parents: 30
diff changeset
530
185
3d953844abd3 support for more int types in crossentropysoftmax1hot
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 184
diff changeset
531 const %(y_idx_type)s y_i = ((%(y_idx_type)s*)(%(y_idx)s->data + %(y_idx)s->strides[0] * i))[0];
32
039c0f249859 added C impl for softmax dx
bergstrj@iro.umontreal.ca
parents: 30
diff changeset
532
039c0f249859 added C impl for softmax dx
bergstrj@iro.umontreal.ca
parents: 30
diff changeset
533 const double* __restrict__ sm_i = (double*)(%(sm)s->data + %(sm)s->strides[0] * i);
039c0f249859 added C impl for softmax dx
bergstrj@iro.umontreal.ca
parents: 30
diff changeset
534 npy_intp Ssm = %(sm)s->strides[1]/sizeof(double);
039c0f249859 added C impl for softmax dx
bergstrj@iro.umontreal.ca
parents: 30
diff changeset
535
039c0f249859 added C impl for softmax dx
bergstrj@iro.umontreal.ca
parents: 30
diff changeset
536 double* __restrict__ dx_i = (double*)(%(dx)s->data + %(dx)s->strides[0] * i);
039c0f249859 added C impl for softmax dx
bergstrj@iro.umontreal.ca
parents: 30
diff changeset
537 npy_intp Sdx = %(dx)s->strides[1]/sizeof(double);
039c0f249859 added C impl for softmax dx
bergstrj@iro.umontreal.ca
parents: 30
diff changeset
538
67
810a8e3c85e1 fixed horrible memory leak from crossentropy...
bergstra@is23.m
parents: 34
diff changeset
539 for (size_t j = 0; j < %(dx)s->dimensions[1]; ++j)
32
039c0f249859 added C impl for softmax dx
bergstrj@iro.umontreal.ca
parents: 30
diff changeset
540 {
039c0f249859 added C impl for softmax dx
bergstrj@iro.umontreal.ca
parents: 30
diff changeset
541 dx_i[j * Sdx] = dnll_i * sm_i[j * Ssm];
039c0f249859 added C impl for softmax dx
bergstrj@iro.umontreal.ca
parents: 30
diff changeset
542 }
67
810a8e3c85e1 fixed horrible memory leak from crossentropy...
bergstra@is23.m
parents: 34
diff changeset
543 if (y_i >= %(dx)s->dimensions[1])
32
039c0f249859 added C impl for softmax dx
bergstrj@iro.umontreal.ca
parents: 30
diff changeset
544 {
039c0f249859 added C impl for softmax dx
bergstrj@iro.umontreal.ca
parents: 30
diff changeset
545 %(fail)s;
039c0f249859 added C impl for softmax dx
bergstrj@iro.umontreal.ca
parents: 30
diff changeset
546 }
039c0f249859 added C impl for softmax dx
bergstrj@iro.umontreal.ca
parents: 30
diff changeset
547 dx_i[y_i * Sdx] -= dnll_i;
039c0f249859 added C impl for softmax dx
bergstrj@iro.umontreal.ca
parents: 30
diff changeset
548 }
039c0f249859 added C impl for softmax dx
bergstrj@iro.umontreal.ca
parents: 30
diff changeset
549 """ % dict(locals(), **sub)
69
8c2607f387e6 added softplus, elaborated sigmoid
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 68
diff changeset
550
70
76e5c0f37165 better docs & precondition testing for cross_entropy_softmax_1hot & friends
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 69
diff changeset
551 def crossentropy_softmax_1hot(x, y_idx, **kwargs):
76e5c0f37165 better docs & precondition testing for cross_entropy_softmax_1hot & friends
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 69
diff changeset
552 b = tensor.zeros_like(x[0,:])
76e5c0f37165 better docs & precondition testing for cross_entropy_softmax_1hot & friends
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 69
diff changeset
553 return crossentropy_softmax_1hot_with_bias(x, b, y_idx, **kwargs)
382
b4efd192d880 Moved xent loss to nnet_ups
Joseph Turian <turian@gmail.com>
parents: 381
diff changeset
554
b4efd192d880 Moved xent loss to nnet_ups
Joseph Turian <turian@gmail.com>
parents: 381
diff changeset
555 def binary_crossentropy(output, target):
b4efd192d880 Moved xent loss to nnet_ups
Joseph Turian <turian@gmail.com>
parents: 381
diff changeset
556 """
b4efd192d880 Moved xent loss to nnet_ups
Joseph Turian <turian@gmail.com>
parents: 381
diff changeset
557 Compute the crossentropy of binary output wrt binary target.
b4efd192d880 Moved xent loss to nnet_ups
Joseph Turian <turian@gmail.com>
parents: 381
diff changeset
558 @note: We do not sum, crossentropy is computed by component.
b4efd192d880 Moved xent loss to nnet_ups
Joseph Turian <turian@gmail.com>
parents: 381
diff changeset
559 @todo: Rewrite as a scalar, and then broadcast to tensor.
b4efd192d880 Moved xent loss to nnet_ups
Joseph Turian <turian@gmail.com>
parents: 381
diff changeset
560 """
383
344d1f874af7 Small fix
Joseph Turian <turian@gmail.com>
parents: 382
diff changeset
561 return -(target * tensor.log(output) + (1 - target) * tensor.log(1 - output))
419
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
562
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
563
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
564
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
565 class Prepend_scalar_constant_to_each_row(theano.Op):
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
566 def __init__(self, val = 0):
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
567 if isinstance(val, float):
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
568 val = scalar.constant(val)
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
569 self.val = val
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
570
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
571 def make_node(self, mat):
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
572 #check type of input
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
573 if not isinstance(mat,theano.Result) or not mat.type==tensor.matrix().type:
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
574 raise TypeError("Expected a matrix as input")
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
575 x = tensor.as_tensor(mat)
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
576 y = tensor.as_tensor(self.val)
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
577 if x.type.dtype != y.type.dtype:
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
578 TypeError("the value to prepend don't have the same type as the matrix")
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
579
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
580 node = theano.Apply(op=self, inputs=[mat], outputs=[tensor.matrix()])
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
581 return node
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
582
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
583 def perform(self, node, (mat, ), (output, )):
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
584 new_shape=(mat.shape[0],mat.shape[1]+1)
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
585 if output[0] == None:
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
586 output[0]=numpy.empty(new_shape,dtype=mat.dtype)
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
587 out=output[0]
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
588 else:
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
589 if output[0].shape!=new_shape:
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
590 try:
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
591 output[0].resize(new_shape)
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
592 except:
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
593 output[0]=numpy.empty(new_shape, dtype=mat.dtype)
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
594 out=output[0]
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
595
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
596 out[:,0].fill(self.val.data)
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
597 out[:,1:]=mat
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
598
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
599 def grad(self, (mat,), (goutput,)):
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
600 return goutput[:,1:]
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
601
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
602 class Prepend_scalar_to_each_row(theano.Op):
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
603 def make_node(self, val, mat):
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
604 #check type of input
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
605 if isinstance(val, float):
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
606 val = scalar.constant(val)
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
607 if not isinstance(mat,theano.Result) or not mat.type==tensor.matrix().type:
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
608 raise TypeError("Expected a matrix as input")
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
609 x = tensor.as_tensor(mat)
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
610 y = tensor.as_tensor(val)
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
611 if x.type.dtype != y.type.dtype:
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
612 TypeError("the value to prepend don't have the same type as the matrix")
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
613
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
614 node = theano.Apply(op=self, inputs=[val,mat], outputs=[tensor.matrix()])
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
615 return node
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
616
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
617 def perform(self, node, (val,mat), (output, )):
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
618 new_shape=(mat.shape[0],mat.shape[1]+1)
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
619 if output[0] == None:
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
620 output[0]=numpy.empty(new_shape,dtype=mat.dtype)
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
621 out=output[0]
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
622 else:
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
623 if output[0].shape!=new_shape:
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
624 try:
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
625 output[0].resize(new_shape)
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
626 except:
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
627 output[0]=numpy.empty(new_shape, dtype=mat.dtype)
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
628 out=output[0]
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
629 out[:,0].fill(val)
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
630 out[:,1:]=mat
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
631
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
632 def grad(self, (val, mat), (goutput,)):
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
633 return goutput[:,0], goutput[:,1:]
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
634
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
635 prepend_scalar_to_each_row = Prepend_scalar_to_each_row()
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
636 prepend_0_to_each_row = Prepend_scalar_constant_to_each_row(0.)
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
637 prepend_1_to_each_row = Prepend_scalar_constant_to_each_row(1.)
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
638
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
639 class solve(theano.Op):
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
640 """
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
641 Find the solution to the linear equation Ax=b,
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
642 where A is a 2d matrix and b is a 1d or 2d matrix.
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
643 It use numpy.solve to find the solution.
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
644 """
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
645
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
646 def make_node(self, A, b):
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
647 if not isinstance(A, theano.Result) or not A.type==tensor.matrix().type:
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
648 raise TypeError("We expected that A had a matrix type")
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
649 if not isinstance(B, theano.Result) or not B.type==tensor.matrix().type:
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
650 raise TypeError("We expected that B had a matrix type")
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
651
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
652 node = theano.Apply(op=self, inputs=[A, B], outputs=[tensor.matrix()])
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
653 return node
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
654
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
655 def perform(self, node, (A, B), (output, )):
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
656 ret=numpy.solve(A,B)
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
657 output[0]=ret
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
658
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
659 def grad(self, (theta, A, B), (gtheta,)):
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
660 raise NotImplementedError()
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
661
43d9aa93934e added other_ops.py to nnet_ops; added basic tests, no docs.
James Bergstra <bergstrj@iro.umontreal.ca>
parents: 383
diff changeset
662