From e3f91a35c4eed78fafcbaf8b480c425188385989 Mon Sep 17 00:00:00 2001
From: Chris Dyer <cdyer@allegro.clab.cs.cmu.edu>
Date: Sun, 18 Nov 2012 14:26:10 -0500
Subject: fix python pointers into training lib

---
 python/setup.py.in    | 4 ++--
 python/src/_cdec.cpp  | 4 ++--
 python/src/mteval.pxd | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'python')

diff --git a/python/setup.py.in b/python/setup.py.in
index f191ef8b..dac72903 100644
--- a/python/setup.py.in
+++ b/python/setup.py.in
@@ -3,7 +3,7 @@ from distutils.extension import Extension
 import re
 
 INC = ['..', 'src/', '../decoder', '../utils', '../mteval']
-LIB = ['../decoder', '../utils', '../mteval', '../training', '../klm/lm', '../klm/util', '../klm/search']
+LIB = ['../decoder', '../utils', '../mteval', '../training/utils', '../klm/lm', '../klm/util', '../klm/search']
 
 # Set automatically by configure
 LIBS = re.findall('-l([^\s]+)', '@LIBS@')
@@ -17,7 +17,7 @@ ext_modules = [
         sources=['src/_cdec.cpp'],
         include_dirs=INC,
         library_dirs=LIB,
-        libraries=LIBS + ['z', 'cdec', 'utils', 'mteval', 'training', 'klm', 'klm_util', 'ksearch'],
+        libraries=LIBS + ['z', 'cdec', 'utils', 'mteval', 'training_utils', 'klm', 'klm_util', 'ksearch'],
         extra_compile_args=CPPFLAGS,
         extra_link_args=LDFLAGS),
     Extension(name='cdec.sa._sa',
diff --git a/python/src/_cdec.cpp b/python/src/_cdec.cpp
index c8d50a4f..6f341f41 100644
--- a/python/src/_cdec.cpp
+++ b/python/src/_cdec.cpp
@@ -1,4 +1,4 @@
-/* Generated by Cython 0.17.1 on Tue Oct 16 01:04:11 2012 */
+/* Generated by Cython 0.17.1 on Sun Nov 18 14:23:01 2012 */
 
 #define PY_SSIZE_T_CLEAN
 #include "Python.h"
@@ -286,7 +286,7 @@
 #include "decoder/kbest.h"
 #include "mteval/ns.h"
 #include "py_scorer.h"
-#include "training/candidate_set.h"
+#include "training/utils/candidate_set.h"
 #ifdef _OPENMP
 #include <omp.h>
 #endif /* _OPENMP */
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
-- 
cgit v1.2.3