explosion/spaCy
1
1
Fork 0
mirror of https://github.com/explosion/spaCy.git synced 2024-09-21 03:19:13 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix set_features on _neural

Browse Source
This commit is contained in:
Matthew Honnibal 2016-08-29 14:25:54 +02:00
parent 52d2702782
commit 14f3da2a2e
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spacy/syntax/_neural.pxd
View File

@ -6,8 +6,7 @@ from thinc.structs cimport NeuralNetC, FeatureC
cdef class ParserNeuralNet(NeuralNet): cdef class ParserNeuralNet(NeuralNet):
cdef ConjunctionExtracter extracter cdef ConjunctionExtracter extracter
cdef int _set_featuresC(self, FeatureC* feats, const void* _state) nogil
cdef class ParserPerceptron(AveragedPerceptron): cdef class ParserPerceptron(AveragedPerceptron):
cdef int _set_featuresC(self, FeatureC* feats, const void* _state) nogil pass

11
spacy/syntax/_neural.pyx
View File

@ -48,8 +48,9 @@ cdef class ParserPerceptron(AveragedPerceptron):
self.update_weight(feat.key, clas, feat.value * step) self.update_weight(feat.key, clas, feat.value * step)
return int(loss) return int(loss)
cdef int _set_featuresC(self, FeatureC* feats, const void* _state) nogil: cdef int set_featuresC(self, FeatureC* feats, const void* _state) nogil:
cdef atom_t[CONTEXT_SIZE] context cdef atom_t[CONTEXT_SIZE] context
memset(context, 0, sizeof(context))
state = <const StateC*>_state state = <const StateC*>_state
fill_context(context, state) fill_context(context, state)
return self.extracter.set_features(feats, context) return self.extracter.set_features(feats, context)
@ -64,9 +65,9 @@ cdef class ParserPerceptron(AveragedPerceptron):
cdef class_t clas cdef class_t clas
self.time += 1 self.time += 1
for clas in history: for clas in history:
nr_feat = self._set_featuresC(features, stcls.c) nr_feat = self.set_featuresC(features, stcls.c)
for feat in features[:nr_feat]: for feat in features[:nr_feat]:
self.update_weight(feat.key, clas, feat.value * grad) self.update_weight(feat.key, clas, feat.value * -grad)
moves.c[clas].do(stcls.c, moves.c[clas].label) moves.c[clas].do(stcls.c, moves.c[clas].label)
@ -95,7 +96,7 @@ cdef class ParserNeuralNet(NeuralNet):
def nr_feat(self): def nr_feat(self):
return 2000 return 2000
cdef int _set_featuresC(self, FeatureC* feats, const void* _state) nogil: cdef int set_featuresC(self, FeatureC* feats, const void* _state) nogil:
memset(feats, 0, 2000 * sizeof(FeatureC)) memset(feats, 0, 2000 * sizeof(FeatureC))
state = <const StateC*>_state state = <const StateC*>_state
start = feats start = feats
@ -160,7 +161,7 @@ cdef class ParserNeuralNet(NeuralNet):
memset(costs, 0, moves.n_moves * sizeof(costs[0])) memset(costs, 0, moves.n_moves * sizeof(costs[0]))
for i in range(moves.n_moves): for i in range(moves.n_moves):
is_valid[i] = 1 is_valid[i] = 1
nr_feat = self._set_featuresC(features, stcls.c) nr_feat = self.set_featuresC(features, stcls.c)
moves.set_valid(is_valid, stcls.c) moves.set_valid(is_valid, stcls.c)
# Update with a sparse gradient: everything's 0, except our class. # Update with a sparse gradient: everything's 0, except our class.
# Remember, this is a component of the global update. It's not our # Remember, this is a component of the global update. It's not our