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 | 3d8d656fa7911524e0e6885647173474524e0784 (patch) | |
| tree | 81b1ee2fcb67980376d03f0aa48e42e53abff222 /python/src/mteval.pxd | |
| parent | be7f57fdd484e063775d7abf083b9fa4c403b610 (diff) | |
| parent | 96fedabebafe7a38a6d5928be8fff767e411d705 (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 |