diff options
| author | Avneesh Saluja <asaluja@gmail.com> | 2013-03-28 18:28:16 -0700 |
|---|---|---|
| committer | Avneesh Saluja <asaluja@gmail.com> | 2013-03-28 18:28:16 -0700 |
| commit | 5b8253e0e1f1393a509fb9975ba8c1347af758ed (patch) | |
| tree | 1790470b1d07a0b4973ebce19192e896566ea60b /python/src/mteval.pxd | |
| parent | 2389a5a8a43dda87c355579838559515b0428421 (diff) | |
| parent | b203f8c5dc8cff1b9c9c2073832b248fcad0765a (diff) | |
fixed conflicts
Diffstat (limited to 'python/src/mteval.pxd')
| -rw-r--r-- | python/src/mteval.pxd | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/python/src/mteval.pxd b/python/src/mteval.pxd index c97c4b34..33a6b7a5 100644 --- a/python/src/mteval.pxd +++ b/python/src/mteval.pxd @@ -37,7 +37,7 @@ cdef extern from "py_scorer.h": cdef EvaluationMetric* PyMetricInstance "PythonEvaluationMetric::Instance"( string& metric_id, void*, MetricStatsCallback, MetricScoreCallback) -cdef extern from "training/candidate_set.h" namespace "training": +cdef extern from "training/utils/candidate_set.h" namespace "training": cdef cppclass Candidate: vector[WordID] ewords FastSparseVector[weight_t] fmap |