diff --git a/debian/patches/deb_libsvm_verbosity_control b/debian/patches/deb_libsvm_verbosity_control index 91b4a76c57d917869bda5e7e5ed71cc9575bb42a..0ebfb4ac839aeda3fc9df21f61f2c643b3e50bce 100644 --- a/debian/patches/deb_libsvm_verbosity_control +++ b/debian/patches/deb_libsvm_verbosity_control @@ -22,7 +22,7 @@ +} + +/* provide convenience wrapper */ -+void svm_set_verbosity(int verbosity_flag){ ++void set_verbosity(int verbosity_flag){ + if (verbosity_flag) +# if LIBSVM_VERSION < 291 + svm_print_string = &print_string_stdout; @@ -43,7 +43,2363 @@ int free_model_SV (svm_model *) int free_param (svm_parameter *) - -+ void svm_set_verbosity(int) ++ void set_verbosity(int) ################################################################################ # Wrapper functions +@@ -579,3 +579,8 @@ def predict_margin_from_model_wrap(np.nd + free_param(param) + return dec_values + ++def set_verbosity_wrap(int verbosity): ++ """ ++ Control verbosity of libsvm library ++ """ ++ set_verbosity(verbosity) +--- a/scikits/learn/svm/base.py ++++ b/scikits/learn/svm/base.py +@@ -352,3 +352,5 @@ class BaseLibLinear(BaseEstimator): + """ + return int (self.fit_intercept) - .5 + ++ ++_libsvm.set_verbosity_wrap(0) +--- a/scikits/learn/svm/src/libsvm/_libsvm.c ++++ b/scikits/learn/svm/src/libsvm/_libsvm.c +@@ -1,4 +1,4 @@ +-/* Generated by Cython 0.12.1 on Tue Jul 27 15:22:08 2010 */ ++/* Generated by Cython 0.12.1 on Thu Oct 7 13:20:55 2010 */ + + #define PY_SSIZE_T_CLEAN + #include "Python.h" +@@ -672,6 +672,7 @@ static char __pyx_k_16[] = "predict_prob + static char __pyx_k_17[] = "predict_prob_from_model_wrap"; + static char __pyx_k_18[] = "predict_margin_from_model_wrap (line 533)"; + static char __pyx_k_19[] = "predict_margin_from_model_wrap"; ++static char __pyx_k_20[] = "set_verbosity_wrap (line 582)"; + static char __pyx_k__B[] = "B"; + static char __pyx_k__C[] = "C"; + static char __pyx_k__H[] = "H"; +@@ -757,6 +758,7 @@ static char __pyx_k__RuntimeError[] = "R + static char __pyx_k__sv_coef_data[] = "sv_coef_data"; + static char __pyx_k__weight_label[] = "weight_label"; + static char __pyx_k__csr_train_wrap[] = "csr_train_wrap"; ++static char __pyx_k__set_verbosity_wrap[] = "set_verbosity_wrap"; + static PyObject *__pyx_kp_s_1; + static PyObject *__pyx_kp_u_10; + static PyObject *__pyx_kp_u_11; +@@ -769,6 +771,7 @@ static PyObject *__pyx_n_s_17; + static PyObject *__pyx_kp_u_18; + static PyObject *__pyx_n_s_19; + static PyObject *__pyx_kp_s_2; ++static PyObject *__pyx_kp_u_20; + static PyObject *__pyx_kp_u_3; + static PyObject *__pyx_kp_u_4; + static PyObject *__pyx_kp_u_5; +@@ -831,6 +834,7 @@ static PyObject *__pyx_n_s__range; + static PyObject *__pyx_n_s__readonly; + static PyObject *__pyx_n_s__refcheck; + static PyObject *__pyx_n_s__resize; ++static PyObject *__pyx_n_s__set_verbosity_wrap; + static PyObject *__pyx_n_s__shape; + static PyObject *__pyx_n_s__shrinking; + static PyObject *__pyx_n_s__strides; +@@ -847,7 +851,7 @@ static PyObject *__pyx_int_0; + static PyObject *__pyx_int_1; + static PyObject *__pyx_int_15; + +-/* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":101 ++/* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":101 + * # Wrapper functions + * + * def train_wrap ( np.ndarray[np.float64_t, ndim=2, mode='c'] X, # <<<<<<<<<<<<<< +@@ -1225,7 +1229,7 @@ static PyObject *__pyx_pf_7_libsvm_train + __pyx_bstride_0_nclass_SV = __pyx_bstruct_nclass_SV.strides[0]; + __pyx_bshape_0_nclass_SV = __pyx_bstruct_nclass_SV.shape[0]; + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":146 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":146 + * + * # set libsvm problem + * problem = set_problem(X.data, Y.data, X.shape, kernel_type) # <<<<<<<<<<<<<< +@@ -1234,7 +1238,7 @@ static PyObject *__pyx_pf_7_libsvm_train + */ + __pyx_v_problem = set_problem(__pyx_v_X->data, __pyx_v_Y->data, __pyx_v_X->dimensions, __pyx_v_kernel_type); + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":152 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":152 + * coef0, nu, cache_size, + * C, eps, p, shrinking, probability, + * <int> weight.shape[0], weight_label.data, weight.data) # <<<<<<<<<<<<<< +@@ -1243,7 +1247,7 @@ static PyObject *__pyx_pf_7_libsvm_train + */ + __pyx_v_param = set_parameter(__pyx_v_svm_type, __pyx_v_kernel_type, __pyx_v_degree, __pyx_v_gamma, __pyx_v_coef0, __pyx_v_nu, __pyx_v_cache_size, __pyx_v_C, __pyx_v_eps, __pyx_v_p, __pyx_v_shrinking, __pyx_v_probability, ((int)(__pyx_v_weight->dimensions[0])), __pyx_v_weight_label->data, __pyx_v_weight->data); + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":155 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":155 + * + * # check parameters + * if (param == NULL or problem == NULL): # <<<<<<<<<<<<<< +@@ -1259,7 +1263,7 @@ static PyObject *__pyx_pf_7_libsvm_train + } + if (__pyx_t_3) { + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":156 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":156 + * # check parameters + * if (param == NULL or problem == NULL): + * raise MemoryError("Seems we've run out of of memory") # <<<<<<<<<<<<<< +@@ -1281,7 +1285,7 @@ static PyObject *__pyx_pf_7_libsvm_train + } + __pyx_L6:; + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":157 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":157 + * if (param == NULL or problem == NULL): + * raise MemoryError("Seems we've run out of of memory") + * error_msg = svm_check_parameter(problem, param); # <<<<<<<<<<<<<< +@@ -1290,7 +1294,7 @@ static PyObject *__pyx_pf_7_libsvm_train + */ + __pyx_v_error_msg = svm_check_parameter(__pyx_v_problem, __pyx_v_param); + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":158 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":158 + * raise MemoryError("Seems we've run out of of memory") + * error_msg = svm_check_parameter(problem, param); + * if error_msg: # <<<<<<<<<<<<<< +@@ -1300,7 +1304,7 @@ static PyObject *__pyx_pf_7_libsvm_train + __pyx_t_3 = (__pyx_v_error_msg != 0); + if (__pyx_t_3) { + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":159 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":159 + * error_msg = svm_check_parameter(problem, param); + * if error_msg: + * free_problem(problem) # <<<<<<<<<<<<<< +@@ -1309,7 +1313,7 @@ static PyObject *__pyx_pf_7_libsvm_train + */ + free_problem(__pyx_v_problem); + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":160 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":160 + * if error_msg: + * free_problem(problem) + * free_param(param) # <<<<<<<<<<<<<< +@@ -1318,7 +1322,7 @@ static PyObject *__pyx_pf_7_libsvm_train + */ + free_param(__pyx_v_param); + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":161 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":161 + * free_problem(problem) + * free_param(param) + * raise ValueError(error_msg) # <<<<<<<<<<<<<< +@@ -1342,7 +1346,7 @@ static PyObject *__pyx_pf_7_libsvm_train + } + __pyx_L7:; + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":164 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":164 + * + * # call svm_train, this does the real work + * model = svm_train(problem, param) # <<<<<<<<<<<<<< +@@ -1351,7 +1355,7 @@ static PyObject *__pyx_pf_7_libsvm_train + */ + __pyx_v_model = svm_train(__pyx_v_problem, __pyx_v_param); + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":166 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":166 + * model = svm_train(problem, param) + * + * cdef np.npy_intp SV_len = get_l(model) # <<<<<<<<<<<<<< +@@ -1360,7 +1364,7 @@ static PyObject *__pyx_pf_7_libsvm_train + */ + __pyx_v_SV_len = get_l(__pyx_v_model); + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":167 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":167 + * + * cdef np.npy_intp SV_len = get_l(model) + * cdef np.npy_intp nr = get_nr(model) # <<<<<<<<<<<<<< +@@ -1369,7 +1373,7 @@ static PyObject *__pyx_pf_7_libsvm_train + */ + __pyx_v_nr = get_nr(__pyx_v_model); + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":172 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":172 + * # we create a new array instead of resizing, otherwise + * # it would not erase previous information + * sv_coef.resize ((nr-1, SV_len), refcheck=False) # <<<<<<<<<<<<<< +@@ -1408,7 +1412,7 @@ static PyObject *__pyx_pf_7_libsvm_train + __Pyx_DECREF(((PyObject *)__pyx_t_7)); __pyx_t_7 = 0; + __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":173 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":173 + * # it would not erase previous information + * sv_coef.resize ((nr-1, SV_len), refcheck=False) + * copy_sv_coef (sv_coef.data, model) # <<<<<<<<<<<<<< +@@ -1417,7 +1421,7 @@ static PyObject *__pyx_pf_7_libsvm_train + */ + copy_sv_coef(__pyx_v_sv_coef->data, __pyx_v_model); + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":177 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":177 + * # copy model.rho into the intercept + * # the intercept is just model.rho but with sign changed + * intercept.resize (nr*(nr-1)/2, refcheck=False) # <<<<<<<<<<<<<< +@@ -1446,7 +1450,7 @@ static PyObject *__pyx_pf_7_libsvm_train + __Pyx_DECREF(((PyObject *)__pyx_t_7)); __pyx_t_7 = 0; + __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":178 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":178 + * # the intercept is just model.rho but with sign changed + * intercept.resize (nr*(nr-1)/2, refcheck=False) + * copy_intercept (intercept.data, model, intercept.shape) # <<<<<<<<<<<<<< +@@ -1455,7 +1459,7 @@ static PyObject *__pyx_pf_7_libsvm_train + */ + copy_intercept(__pyx_v_intercept->data, __pyx_v_model, __pyx_v_intercept->dimensions); + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":182 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":182 + * # copy model.SV + * # we erase any previous information in SV + * SV.resize((0,0), refcheck=False) # <<<<<<<<<<<<<< +@@ -1490,7 +1494,7 @@ static PyObject *__pyx_pf_7_libsvm_train + __Pyx_DECREF(((PyObject *)__pyx_t_7)); __pyx_t_7 = 0; + __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":183 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":183 + * # we erase any previous information in SV + * SV.resize((0,0), refcheck=False) + * if kernel_type == 4: # <<<<<<<<<<<<<< +@@ -1500,7 +1504,7 @@ static PyObject *__pyx_pf_7_libsvm_train + __pyx_t_3 = (__pyx_v_kernel_type == 4); + if (__pyx_t_3) { + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":184 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":184 + * SV.resize((0,0), refcheck=False) + * if kernel_type == 4: + * SV.resize((SV_len, 1), refcheck=False) # <<<<<<<<<<<<<< +@@ -1540,7 +1544,7 @@ static PyObject *__pyx_pf_7_libsvm_train + } + /*else*/ { + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":186 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":186 + * SV.resize((SV_len, 1), refcheck=False) + * else: + * SV.resize((SV_len, X.shape[1]), refcheck=False) # <<<<<<<<<<<<<< +@@ -1581,7 +1585,7 @@ static PyObject *__pyx_pf_7_libsvm_train + } + __pyx_L8:; + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":187 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":187 + * else: + * SV.resize((SV_len, X.shape[1]), refcheck=False) + * copy_SV(SV.data, model, SV.shape) # <<<<<<<<<<<<<< +@@ -1590,7 +1594,7 @@ static PyObject *__pyx_pf_7_libsvm_train + */ + copy_SV(__pyx_v_SV->data, __pyx_v_model, __pyx_v_SV->dimensions); + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":191 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":191 + * # copy model.nSV + * # TODO: do only in classification + * nclass_SV.resize(nr, refcheck=False) # <<<<<<<<<<<<<< +@@ -1619,7 +1623,7 @@ static PyObject *__pyx_pf_7_libsvm_train + __Pyx_DECREF(((PyObject *)__pyx_t_4)); __pyx_t_4 = 0; + __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":192 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":192 + * # TODO: do only in classification + * nclass_SV.resize(nr, refcheck=False) + * copy_nSV(nclass_SV.data, model) # <<<<<<<<<<<<<< +@@ -1628,7 +1632,7 @@ static PyObject *__pyx_pf_7_libsvm_train + */ + copy_nSV(__pyx_v_nclass_SV->data, __pyx_v_model); + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":196 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":196 + * # copy label + * cdef np.ndarray[np.int32_t, ndim=1, mode='c'] label + * label = np.empty((nr), dtype=np.int32) # <<<<<<<<<<<<<< +@@ -1685,7 +1689,7 @@ static PyObject *__pyx_pf_7_libsvm_train + __pyx_v_label = ((PyArrayObject *)__pyx_t_8); + __pyx_t_8 = 0; + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":197 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":197 + * cdef np.ndarray[np.int32_t, ndim=1, mode='c'] label + * label = np.empty((nr), dtype=np.int32) + * copy_label(label.data, model) # <<<<<<<<<<<<<< +@@ -1694,7 +1698,7 @@ static PyObject *__pyx_pf_7_libsvm_train + */ + copy_label(__pyx_v_label->data, __pyx_v_model); + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":202 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":202 + * cdef np.ndarray[np.float64_t, ndim=1, mode='c'] probA + * cdef np.ndarray[np.float64_t, ndim=1, mode='c'] probB + * if probability != 0: # <<<<<<<<<<<<<< +@@ -1704,7 +1708,7 @@ static PyObject *__pyx_pf_7_libsvm_train + __pyx_t_3 = (__pyx_v_probability != 0); + if (__pyx_t_3) { + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":204 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":204 + * if probability != 0: + * # this is only valid for SVC + * probA = np.empty(nr*(nr-1)/2, dtype=np.float64) # <<<<<<<<<<<<<< +@@ -1761,7 +1765,7 @@ static PyObject *__pyx_pf_7_libsvm_train + __pyx_v_probA = ((PyArrayObject *)__pyx_t_6); + __pyx_t_6 = 0; + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":205 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":205 + * # this is only valid for SVC + * probA = np.empty(nr*(nr-1)/2, dtype=np.float64) + * probB = np.empty(nr*(nr-1)/2, dtype=np.float64) # <<<<<<<<<<<<<< +@@ -1818,7 +1822,7 @@ static PyObject *__pyx_pf_7_libsvm_train + __pyx_v_probB = ((PyArrayObject *)__pyx_t_4); + __pyx_t_4 = 0; + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":206 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":206 + * probA = np.empty(nr*(nr-1)/2, dtype=np.float64) + * probB = np.empty(nr*(nr-1)/2, dtype=np.float64) + * copy_probA(probA.data, model, probA.shape) # <<<<<<<<<<<<<< +@@ -1827,7 +1831,7 @@ static PyObject *__pyx_pf_7_libsvm_train + */ + copy_probA(__pyx_v_probA->data, __pyx_v_model, __pyx_v_probA->dimensions); + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":207 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":207 + * probB = np.empty(nr*(nr-1)/2, dtype=np.float64) + * copy_probA(probA.data, model, probA.shape) + * copy_probB(probB.data, model, probB.shape) # <<<<<<<<<<<<<< +@@ -1839,7 +1843,7 @@ static PyObject *__pyx_pf_7_libsvm_train + } + __pyx_L9:; + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":209 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":209 + * copy_probB(probB.data, model, probB.shape) + * + * free_model(model) # <<<<<<<<<<<<<< +@@ -1848,7 +1852,7 @@ static PyObject *__pyx_pf_7_libsvm_train + */ + free_model(__pyx_v_model); + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":210 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":210 + * + * free_model(model) + * free_problem(problem) # <<<<<<<<<<<<<< +@@ -1857,7 +1861,7 @@ static PyObject *__pyx_pf_7_libsvm_train + */ + free_problem(__pyx_v_problem); + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":211 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":211 + * free_model(model) + * free_problem(problem) + * free_param(param) # <<<<<<<<<<<<<< +@@ -1866,7 +1870,7 @@ static PyObject *__pyx_pf_7_libsvm_train + */ + free_param(__pyx_v_param); + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":213 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":213 + * free_param(param) + * + * return label, probA, probB # <<<<<<<<<<<<<< +@@ -1943,7 +1947,7 @@ static PyObject *__pyx_pf_7_libsvm_train + return __pyx_r; + } + +-/* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":215 ++/* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":215 + * return label, probA, probB + * + * def csr_train_wrap ( int n_features, # <<<<<<<<<<<<<< +@@ -2414,7 +2418,7 @@ static PyObject *__pyx_pf_7_libsvm_csr_t + __pyx_bstride_0_nclass_SV = __pyx_bstruct_nclass_SV.strides[0]; + __pyx_bshape_0_nclass_SV = __pyx_bstruct_nclass_SV.shape[0]; + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":262 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":262 + * # set libsvm problem + * problem = csr_set_problem(values.data, indices.shape, indices.data, + * indptr.shape, indptr.data, Y.data, kernel_type) # <<<<<<<<<<<<<< +@@ -2423,7 +2427,7 @@ static PyObject *__pyx_pf_7_libsvm_csr_t + */ + __pyx_v_problem = csr_set_problem(__pyx_v_values->data, __pyx_v_indices->dimensions, __pyx_v_indices->data, __pyx_v_indptr->dimensions, __pyx_v_indptr->data, __pyx_v_Y->data, __pyx_v_kernel_type); + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":268 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":268 + * coef0, nu, cache_size, + * C, eps, p, shrinking, probability, + * <int> weight.shape[0], weight_label.data, weight.data) # <<<<<<<<<<<<<< +@@ -2432,7 +2436,7 @@ static PyObject *__pyx_pf_7_libsvm_csr_t + */ + __pyx_v_param = set_parameter(__pyx_v_svm_type, __pyx_v_kernel_type, __pyx_v_degree, __pyx_v_gamma, __pyx_v_coef0, __pyx_v_nu, __pyx_v_cache_size, __pyx_v_C, __pyx_v_eps, __pyx_v_p, __pyx_v_shrinking, __pyx_v_probability, ((int)(__pyx_v_weight->dimensions[0])), __pyx_v_weight_label->data, __pyx_v_weight->data); + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":271 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":271 + * + * # check parameters + * if (param == NULL or problem == NULL): # <<<<<<<<<<<<<< +@@ -2448,7 +2452,7 @@ static PyObject *__pyx_pf_7_libsvm_csr_t + } + if (__pyx_t_3) { + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":272 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":272 + * # check parameters + * if (param == NULL or problem == NULL): + * raise MemoryError("Seems we've run out of of memory") # <<<<<<<<<<<<<< +@@ -2470,7 +2474,7 @@ static PyObject *__pyx_pf_7_libsvm_csr_t + } + __pyx_L6:; + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":273 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":273 + * if (param == NULL or problem == NULL): + * raise MemoryError("Seems we've run out of of memory") + * error_msg = svm_check_parameter(problem, param); # <<<<<<<<<<<<<< +@@ -2479,7 +2483,7 @@ static PyObject *__pyx_pf_7_libsvm_csr_t + */ + __pyx_v_error_msg = svm_check_parameter(__pyx_v_problem, __pyx_v_param); + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":274 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":274 + * raise MemoryError("Seems we've run out of of memory") + * error_msg = svm_check_parameter(problem, param); + * if error_msg: # <<<<<<<<<<<<<< +@@ -2489,7 +2493,7 @@ static PyObject *__pyx_pf_7_libsvm_csr_t + __pyx_t_3 = (__pyx_v_error_msg != 0); + if (__pyx_t_3) { + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":275 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":275 + * error_msg = svm_check_parameter(problem, param); + * if error_msg: + * free_problem(problem) # <<<<<<<<<<<<<< +@@ -2498,7 +2502,7 @@ static PyObject *__pyx_pf_7_libsvm_csr_t + */ + free_problem(__pyx_v_problem); + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":276 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":276 + * if error_msg: + * free_problem(problem) + * free_param(param) # <<<<<<<<<<<<<< +@@ -2507,7 +2511,7 @@ static PyObject *__pyx_pf_7_libsvm_csr_t + */ + free_param(__pyx_v_param); + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":277 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":277 + * free_problem(problem) + * free_param(param) + * raise ValueError(error_msg) # <<<<<<<<<<<<<< +@@ -2531,7 +2535,7 @@ static PyObject *__pyx_pf_7_libsvm_csr_t + } + __pyx_L7:; + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":280 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":280 + * + * # call svm_train, this does the real work + * model = svm_train(problem, param) # <<<<<<<<<<<<<< +@@ -2540,7 +2544,7 @@ static PyObject *__pyx_pf_7_libsvm_csr_t + */ + __pyx_v_model = svm_train(__pyx_v_problem, __pyx_v_param); + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":282 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":282 + * model = svm_train(problem, param) + * + * cdef np.npy_intp SV_len = get_l(model) # <<<<<<<<<<<<<< +@@ -2549,7 +2553,7 @@ static PyObject *__pyx_pf_7_libsvm_csr_t + */ + __pyx_v_SV_len = get_l(__pyx_v_model); + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":283 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":283 + * + * cdef np.npy_intp SV_len = get_l(model) + * cdef np.npy_intp nr = get_nr(model) # <<<<<<<<<<<<<< +@@ -2558,7 +2562,7 @@ static PyObject *__pyx_pf_7_libsvm_csr_t + */ + __pyx_v_nr = get_nr(__pyx_v_model); + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":288 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":288 + * # we create a new array instead of resizing, otherwise + * # it would not erase previous information + * sv_coef_data.resize ((nr-1)*SV_len, refcheck=False) # <<<<<<<<<<<<<< +@@ -2587,7 +2591,7 @@ static PyObject *__pyx_pf_7_libsvm_csr_t + __Pyx_DECREF(((PyObject *)__pyx_t_4)); __pyx_t_4 = 0; + __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":289 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":289 + * # it would not erase previous information + * sv_coef_data.resize ((nr-1)*SV_len, refcheck=False) + * copy_sv_coef (sv_coef_data.data, model) # <<<<<<<<<<<<<< +@@ -2596,7 +2600,7 @@ static PyObject *__pyx_pf_7_libsvm_csr_t + */ + copy_sv_coef(__pyx_v_sv_coef_data->data, __pyx_v_model); + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":293 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":293 + * # copy model.rho into the intercept + * # the intercept is just model.rho but with sign changed + * intercept.resize (nr*(nr-1)/2, refcheck=False) # <<<<<<<<<<<<<< +@@ -2625,7 +2629,7 @@ static PyObject *__pyx_pf_7_libsvm_csr_t + __Pyx_DECREF(((PyObject *)__pyx_t_4)); __pyx_t_4 = 0; + __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":294 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":294 + * # the intercept is just model.rho but with sign changed + * intercept.resize (nr*(nr-1)/2, refcheck=False) + * copy_intercept (intercept.data, model, intercept.shape) # <<<<<<<<<<<<<< +@@ -2634,7 +2638,7 @@ static PyObject *__pyx_pf_7_libsvm_csr_t + */ + copy_intercept(__pyx_v_intercept->data, __pyx_v_model, __pyx_v_intercept->dimensions); + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":300 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":300 + * # TODO: custom kernel + * cdef np.npy_intp nonzero_SV + * nonzero_SV = get_nonzero_SV (model) # <<<<<<<<<<<<<< +@@ -2643,7 +2647,7 @@ static PyObject *__pyx_pf_7_libsvm_csr_t + */ + __pyx_v_nonzero_SV = get_nonzero_SV(__pyx_v_model); + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":303 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":303 + * + * # SV_data.resize((0,0), refcheck=False) # why is this needed ? + * SV_data.resize (nonzero_SV, refcheck=False) # <<<<<<<<<<<<<< +@@ -2672,7 +2676,7 @@ static PyObject *__pyx_pf_7_libsvm_csr_t + __Pyx_DECREF(((PyObject *)__pyx_t_4)); __pyx_t_4 = 0; + __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":304 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":304 + * # SV_data.resize((0,0), refcheck=False) # why is this needed ? + * SV_data.resize (nonzero_SV, refcheck=False) + * SV_indices.resize (nonzero_SV, refcheck=False) # <<<<<<<<<<<<<< +@@ -2701,7 +2705,7 @@ static PyObject *__pyx_pf_7_libsvm_csr_t + __Pyx_DECREF(((PyObject *)__pyx_t_4)); __pyx_t_4 = 0; + __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":305 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":305 + * SV_data.resize (nonzero_SV, refcheck=False) + * SV_indices.resize (nonzero_SV, refcheck=False) + * SV_indptr.resize (<np.npy_intp> SV_len + 1, refcheck=False) # <<<<<<<<<<<<<< +@@ -2730,7 +2734,7 @@ static PyObject *__pyx_pf_7_libsvm_csr_t + __Pyx_DECREF(((PyObject *)__pyx_t_4)); __pyx_t_4 = 0; + __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":307 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":307 + * SV_indptr.resize (<np.npy_intp> SV_len + 1, refcheck=False) + * csr_copy_SV(SV_data.data, SV_indices.shape, SV_indices.data, + * SV_indptr.shape, SV_indptr.data, model, n_features) # <<<<<<<<<<<<<< +@@ -2739,7 +2743,7 @@ static PyObject *__pyx_pf_7_libsvm_csr_t + */ + csr_copy_SV(__pyx_v_SV_data->data, __pyx_v_SV_indices->dimensions, __pyx_v_SV_indices->data, __pyx_v_SV_indptr->dimensions, __pyx_v_SV_indptr->data, __pyx_v_model, __pyx_v_n_features); + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":311 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":311 + * # copy model.nSV + * # TODO: do only in classification + * nclass_SV.resize(nr, refcheck=False) # <<<<<<<<<<<<<< +@@ -2768,7 +2772,7 @@ static PyObject *__pyx_pf_7_libsvm_csr_t + __Pyx_DECREF(((PyObject *)__pyx_t_4)); __pyx_t_4 = 0; + __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":312 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":312 + * # TODO: do only in classification + * nclass_SV.resize(nr, refcheck=False) + * copy_nSV(nclass_SV.data, model) # <<<<<<<<<<<<<< +@@ -2777,7 +2781,7 @@ static PyObject *__pyx_pf_7_libsvm_csr_t + */ + copy_nSV(__pyx_v_nclass_SV->data, __pyx_v_model); + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":316 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":316 + * # # copy label + * cdef np.ndarray[np.int32_t, ndim=1, mode='c'] label + * label = np.empty((nr), dtype=np.int32) # <<<<<<<<<<<<<< +@@ -2834,7 +2838,7 @@ static PyObject *__pyx_pf_7_libsvm_csr_t + __pyx_v_label = ((PyArrayObject *)__pyx_t_8); + __pyx_t_8 = 0; + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":317 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":317 + * cdef np.ndarray[np.int32_t, ndim=1, mode='c'] label + * label = np.empty((nr), dtype=np.int32) + * copy_label(label.data, model) # <<<<<<<<<<<<<< +@@ -2843,7 +2847,7 @@ static PyObject *__pyx_pf_7_libsvm_csr_t + */ + copy_label(__pyx_v_label->data, __pyx_v_model); + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":322 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":322 + * cdef np.ndarray[np.float64_t, ndim=1, mode='c'] probA + * cdef np.ndarray[np.float64_t, ndim=1, mode='c'] probB + * if probability != 0: # <<<<<<<<<<<<<< +@@ -2853,7 +2857,7 @@ static PyObject *__pyx_pf_7_libsvm_csr_t + __pyx_t_3 = (__pyx_v_probability != 0); + if (__pyx_t_3) { + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":324 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":324 + * if probability != 0: + * # this is only valid for SVC + * probA = np.empty(nr*(nr-1)/2, dtype=np.float64) # <<<<<<<<<<<<<< +@@ -2910,7 +2914,7 @@ static PyObject *__pyx_pf_7_libsvm_csr_t + __pyx_v_probA = ((PyArrayObject *)__pyx_t_7); + __pyx_t_7 = 0; + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":325 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":325 + * # this is only valid for SVC + * probA = np.empty(nr*(nr-1)/2, dtype=np.float64) + * probB = np.empty(nr*(nr-1)/2, dtype=np.float64) # <<<<<<<<<<<<<< +@@ -2967,7 +2971,7 @@ static PyObject *__pyx_pf_7_libsvm_csr_t + __pyx_v_probB = ((PyArrayObject *)__pyx_t_4); + __pyx_t_4 = 0; + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":326 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":326 + * probA = np.empty(nr*(nr-1)/2, dtype=np.float64) + * probB = np.empty(nr*(nr-1)/2, dtype=np.float64) + * copy_probA(probA.data, model, probA.shape) # <<<<<<<<<<<<<< +@@ -2976,7 +2980,7 @@ static PyObject *__pyx_pf_7_libsvm_csr_t + */ + copy_probA(__pyx_v_probA->data, __pyx_v_model, __pyx_v_probA->dimensions); + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":327 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":327 + * probB = np.empty(nr*(nr-1)/2, dtype=np.float64) + * copy_probA(probA.data, model, probA.shape) + * copy_probB(probB.data, model, probB.shape) # <<<<<<<<<<<<<< +@@ -2988,7 +2992,7 @@ static PyObject *__pyx_pf_7_libsvm_csr_t + } + __pyx_L8:; + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":329 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":329 + * copy_probB(probB.data, model, probB.shape) + * + * free_model(model) # <<<<<<<<<<<<<< +@@ -2997,7 +3001,7 @@ static PyObject *__pyx_pf_7_libsvm_csr_t + */ + free_model(__pyx_v_model); + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":330 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":330 + * + * free_model(model) + * free_problem(problem) # <<<<<<<<<<<<<< +@@ -3006,7 +3010,7 @@ static PyObject *__pyx_pf_7_libsvm_csr_t + */ + free_problem(__pyx_v_problem); + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":331 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":331 + * free_model(model) + * free_problem(problem) + * free_param(param) # <<<<<<<<<<<<<< +@@ -3015,7 +3019,7 @@ static PyObject *__pyx_pf_7_libsvm_csr_t + */ + free_param(__pyx_v_param); + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":333 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":333 + * free_param(param) + * + * return label, probA, probB # <<<<<<<<<<<<<< +@@ -3104,7 +3108,7 @@ static PyObject *__pyx_pf_7_libsvm_csr_t + return __pyx_r; + } + +-/* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":336 ++/* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":336 + * + * + * def predict_from_model_wrap(np.ndarray[np.float64_t, ndim=2, mode='c'] T, # <<<<<<<<<<<<<< +@@ -3504,7 +3508,7 @@ static PyObject *__pyx_pf_7_libsvm_predi + __pyx_bstride_0_probB = __pyx_bstruct_probB.strides[0]; + __pyx_bshape_0_probB = __pyx_bstruct_probB.shape[0]; + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":381 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":381 + * coef0, nu, cache_size, C, eps, p, shrinking, + * probability, <int> weight.shape[0], weight_label.data, + * weight.data) # <<<<<<<<<<<<<< +@@ -3513,7 +3517,7 @@ static PyObject *__pyx_pf_7_libsvm_predi + */ + __pyx_v_param = set_parameter(__pyx_v_svm_type, __pyx_v_kernel_type, __pyx_v_degree, __pyx_v_gamma, __pyx_v_coef0, __pyx_v_nu, __pyx_v_cache_size, __pyx_v_C, __pyx_v_eps, __pyx_v_p, __pyx_v_shrinking, __pyx_v_probability, ((int)(__pyx_v_weight->dimensions[0])), __pyx_v_weight_label->data, __pyx_v_weight->data); + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":385 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":385 + * model = set_model(param, <int> nSV.shape[0], SV.data, SV.shape, + * sv_coef.strides, sv_coef.data, intercept.data, + * nSV.data, label.data, probA.data, probB.data) # <<<<<<<<<<<<<< +@@ -3522,7 +3526,7 @@ static PyObject *__pyx_pf_7_libsvm_predi + */ + __pyx_v_model = set_model(__pyx_v_param, ((int)(__pyx_v_nSV->dimensions[0])), __pyx_v_SV->data, __pyx_v_SV->dimensions, __pyx_v_sv_coef->strides, __pyx_v_sv_coef->data, __pyx_v_intercept->data, __pyx_v_nSV->data, __pyx_v_label->data, __pyx_v_probA->data, __pyx_v_probB->data); + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":387 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":387 + * nSV.data, label.data, probA.data, probB.data) + * #TODO: use check_model + * dec_values = np.empty(T.shape[0]) # <<<<<<<<<<<<<< +@@ -3569,7 +3573,7 @@ static PyObject *__pyx_pf_7_libsvm_predi + __pyx_v_dec_values = ((PyArrayObject *)__pyx_t_1); + __pyx_t_1 = 0; + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":388 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":388 + * #TODO: use check_model + * dec_values = np.empty(T.shape[0]) + * if copy_predict(T.data, model, T.shape, dec_values.data) < 0: # <<<<<<<<<<<<<< +@@ -3579,7 +3583,7 @@ static PyObject *__pyx_pf_7_libsvm_predi + __pyx_t_9 = (copy_predict(__pyx_v_T->data, __pyx_v_model, __pyx_v_T->dimensions, __pyx_v_dec_values->data) < 0); + if (__pyx_t_9) { + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":389 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":389 + * dec_values = np.empty(T.shape[0]) + * if copy_predict(T.data, model, T.shape, dec_values.data) < 0: + * raise MemoryError("We've run out of of memory") # <<<<<<<<<<<<<< +@@ -3601,7 +3605,7 @@ static PyObject *__pyx_pf_7_libsvm_predi + } + __pyx_L6:; + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":391 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":391 + * raise MemoryError("We've run out of of memory") + * # free model and param + * free_model_SV(model) # <<<<<<<<<<<<<< +@@ -3610,7 +3614,7 @@ static PyObject *__pyx_pf_7_libsvm_predi + */ + free_model_SV(__pyx_v_model); + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":392 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":392 + * # free model and param + * free_model_SV(model) + * free_model(model) # <<<<<<<<<<<<<< +@@ -3619,7 +3623,7 @@ static PyObject *__pyx_pf_7_libsvm_predi + */ + free_model(__pyx_v_model); + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":393 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":393 + * free_model_SV(model) + * free_model(model) + * free_param(param) # <<<<<<<<<<<<<< +@@ -3628,7 +3632,7 @@ static PyObject *__pyx_pf_7_libsvm_predi + */ + free_param(__pyx_v_param); + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":394 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":394 + * free_model(model) + * free_param(param) + * return dec_values # <<<<<<<<<<<<<< +@@ -3692,7 +3696,7 @@ static PyObject *__pyx_pf_7_libsvm_predi + return __pyx_r; + } + +-/* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":399 ++/* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":399 + * + * + * def csr_predict_from_model_wrap(np.ndarray[np.float64_t, ndim=1, mode='c'] T_data, # <<<<<<<<<<<<<< +@@ -4174,7 +4178,7 @@ static PyObject *__pyx_pf_7_libsvm_csr_p + __pyx_bstride_0_probB = __pyx_bstruct_probB.strides[0]; + __pyx_bshape_0_probB = __pyx_bstruct_probB.shape[0]; + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":448 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":448 + * coef0, nu, cache_size, C, eps, p, shrinking, + * probability, <int> weight.shape[0], weight_label.data, + * weight.data) # <<<<<<<<<<<<<< +@@ -4183,7 +4187,7 @@ static PyObject *__pyx_pf_7_libsvm_csr_p + */ + __pyx_v_param = set_parameter(__pyx_v_svm_type, __pyx_v_kernel_type, __pyx_v_degree, __pyx_v_gamma, __pyx_v_coef0, __pyx_v_nu, __pyx_v_cache_size, __pyx_v_C, __pyx_v_eps, __pyx_v_p, __pyx_v_shrinking, __pyx_v_probability, ((int)(__pyx_v_weight->dimensions[0])), __pyx_v_weight_label->data, __pyx_v_weight->data); + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":454 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":454 + * SV_indptr.shape, SV_indptr.data, + * sv_coef.data, intercept.data, + * nSV.data, label.data, probA.data, probB.data) # <<<<<<<<<<<<<< +@@ -4192,7 +4196,7 @@ static PyObject *__pyx_pf_7_libsvm_csr_p + */ + __pyx_v_model = csr_set_model(__pyx_v_param, ((int)(__pyx_v_nSV->dimensions[0])), __pyx_v_SV_data->data, __pyx_v_SV_indices->dimensions, __pyx_v_SV_indices->data, __pyx_v_SV_indptr->dimensions, __pyx_v_SV_indptr->data, __pyx_v_sv_coef->data, __pyx_v_intercept->data, __pyx_v_nSV->data, __pyx_v_label->data, __pyx_v_probA->data, __pyx_v_probB->data); + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":456 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":456 + * nSV.data, label.data, probA.data, probB.data) + * #TODO: use check_model + * dec_values = np.empty(T_indptr.shape[0]-1) # <<<<<<<<<<<<<< +@@ -4239,7 +4243,7 @@ static PyObject *__pyx_pf_7_libsvm_csr_p + __pyx_v_dec_values = ((PyArrayObject *)__pyx_t_1); + __pyx_t_1 = 0; + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":460 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":460 + * T_indices.shape, T_indices.data, + * T_indptr.shape, T_indptr.data, + * model, dec_values.data) < 0: # <<<<<<<<<<<<<< +@@ -4249,7 +4253,7 @@ static PyObject *__pyx_pf_7_libsvm_csr_p + __pyx_t_9 = (csr_copy_predict(__pyx_v_T_data->dimensions, __pyx_v_T_data->data, __pyx_v_T_indices->dimensions, __pyx_v_T_indices->data, __pyx_v_T_indptr->dimensions, __pyx_v_T_indptr->data, __pyx_v_model, __pyx_v_dec_values->data) < 0); + if (__pyx_t_9) { + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":461 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":461 + * T_indptr.shape, T_indptr.data, + * model, dec_values.data) < 0: + * raise MemoryError("We've run out of of memory") # <<<<<<<<<<<<<< +@@ -4271,7 +4275,7 @@ static PyObject *__pyx_pf_7_libsvm_csr_p + } + __pyx_L6:; + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":463 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":463 + * raise MemoryError("We've run out of of memory") + * # free model and param + * free_model_SV(model) # <<<<<<<<<<<<<< +@@ -4280,7 +4284,7 @@ static PyObject *__pyx_pf_7_libsvm_csr_p + */ + free_model_SV(__pyx_v_model); + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":464 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":464 + * # free model and param + * free_model_SV(model) + * free_model(model) # <<<<<<<<<<<<<< +@@ -4289,7 +4293,7 @@ static PyObject *__pyx_pf_7_libsvm_csr_p + */ + free_model(__pyx_v_model); + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":465 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":465 + * free_model_SV(model) + * free_model(model) + * free_param(param) # <<<<<<<<<<<<<< +@@ -4298,7 +4302,7 @@ static PyObject *__pyx_pf_7_libsvm_csr_p + */ + free_param(__pyx_v_param); + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":466 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":466 + * free_model(model) + * free_param(param) + * return dec_values # <<<<<<<<<<<<<< +@@ -4374,7 +4378,7 @@ static PyObject *__pyx_pf_7_libsvm_csr_p + return __pyx_r; + } + +-/* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":470 ++/* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":470 + * + * + * def predict_prob_from_model_wrap(np.ndarray[np.float64_t, ndim=2, mode='c'] T, # <<<<<<<<<<<<<< +@@ -4779,7 +4783,7 @@ static PyObject *__pyx_pf_7_libsvm_predi + __pyx_bstride_0_probB = __pyx_bstruct_probB.strides[0]; + __pyx_bshape_0_probB = __pyx_bstruct_probB.shape[0]; + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":517 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":517 + * coef0, nu, cache_size, C, eps, p, shrinking, + * probability, <int> weight.shape[0], weight_label.data, + * weight.data) # <<<<<<<<<<<<<< +@@ -4788,7 +4792,7 @@ static PyObject *__pyx_pf_7_libsvm_predi + */ + __pyx_v_param = set_parameter(__pyx_v_svm_type, __pyx_v_kernel_type, __pyx_v_degree, __pyx_v_gamma, __pyx_v_coef0, __pyx_v_nu, __pyx_v_cache_size, __pyx_v_C, __pyx_v_eps, __pyx_v_p, __pyx_v_shrinking, __pyx_v_probability, ((int)(__pyx_v_weight->dimensions[0])), __pyx_v_weight_label->data, __pyx_v_weight->data); + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":520 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":520 + * model = set_model(param, <int> nSV.shape[0], SV.data, SV.shape, sv_coef.strides, + * sv_coef.data, intercept.data, nSV.data, label.data, + * probA.data, probB.data) # <<<<<<<<<<<<<< +@@ -4797,7 +4801,7 @@ static PyObject *__pyx_pf_7_libsvm_predi + */ + __pyx_v_model = set_model(__pyx_v_param, ((int)(__pyx_v_nSV->dimensions[0])), __pyx_v_SV->data, __pyx_v_SV->dimensions, __pyx_v_sv_coef->strides, __pyx_v_sv_coef->data, __pyx_v_intercept->data, __pyx_v_nSV->data, __pyx_v_label->data, __pyx_v_probA->data, __pyx_v_probB->data); + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":522 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":522 + * probA.data, probB.data) + * + * cdef np.npy_intp nr = get_nr(model) # <<<<<<<<<<<<<< +@@ -4806,7 +4810,7 @@ static PyObject *__pyx_pf_7_libsvm_predi + */ + __pyx_v_nr = get_nr(__pyx_v_model); + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":523 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":523 + * + * cdef np.npy_intp nr = get_nr(model) + * dec_values = np.empty((T.shape[0], nr), dtype=np.float64) # <<<<<<<<<<<<<< +@@ -4873,7 +4877,7 @@ static PyObject *__pyx_pf_7_libsvm_predi + __pyx_v_dec_values = ((PyArrayObject *)__pyx_t_5); + __pyx_t_5 = 0; + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":524 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":524 + * cdef np.npy_intp nr = get_nr(model) + * dec_values = np.empty((T.shape[0], nr), dtype=np.float64) + * if copy_predict_proba(T.data, model, T.shape, dec_values.data) < 0: # <<<<<<<<<<<<<< +@@ -4883,7 +4887,7 @@ static PyObject *__pyx_pf_7_libsvm_predi + __pyx_t_11 = (copy_predict_proba(__pyx_v_T->data, __pyx_v_model, __pyx_v_T->dimensions, __pyx_v_dec_values->data) < 0); + if (__pyx_t_11) { + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":525 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":525 + * dec_values = np.empty((T.shape[0], nr), dtype=np.float64) + * if copy_predict_proba(T.data, model, T.shape, dec_values.data) < 0: + * raise MemoryError("We've run out of of memory") # <<<<<<<<<<<<<< +@@ -4905,7 +4909,7 @@ static PyObject *__pyx_pf_7_libsvm_predi + } + __pyx_L6:; + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":527 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":527 + * raise MemoryError("We've run out of of memory") + * # free model and param + * free_model_SV(model) # <<<<<<<<<<<<<< +@@ -4914,7 +4918,7 @@ static PyObject *__pyx_pf_7_libsvm_predi + */ + free_model_SV(__pyx_v_model); + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":528 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":528 + * # free model and param + * free_model_SV(model) + * free_model(model) # <<<<<<<<<<<<<< +@@ -4923,7 +4927,7 @@ static PyObject *__pyx_pf_7_libsvm_predi + */ + free_model(__pyx_v_model); + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":529 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":529 + * free_model_SV(model) + * free_model(model) + * free_param(param) # <<<<<<<<<<<<<< +@@ -4932,7 +4936,7 @@ static PyObject *__pyx_pf_7_libsvm_predi + */ + free_param(__pyx_v_param); + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":530 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":530 + * free_model(model) + * free_param(param) + * return dec_values # <<<<<<<<<<<<<< +@@ -4998,7 +5002,7 @@ static PyObject *__pyx_pf_7_libsvm_predi + return __pyx_r; + } + +-/* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":533 ++/* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":533 + * + * + * def predict_margin_from_model_wrap(np.ndarray[np.float64_t, ndim=2, mode='c'] T, # <<<<<<<<<<<<<< +@@ -5403,7 +5407,7 @@ static PyObject *__pyx_pf_7_libsvm_predi + __pyx_bstride_0_probB = __pyx_bstruct_probB.strides[0]; + __pyx_bshape_0_probB = __pyx_bstruct_probB.shape[0]; + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":562 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":562 + * coef0, nu, cache_size, C, eps, p, shrinking, + * probability, <int> weight.shape[0], weight_label.data, + * weight.data) # <<<<<<<<<<<<<< +@@ -5412,7 +5416,7 @@ static PyObject *__pyx_pf_7_libsvm_predi + */ + __pyx_v_param = set_parameter(__pyx_v_svm_type, __pyx_v_kernel_type, __pyx_v_degree, __pyx_v_gamma, __pyx_v_coef0, __pyx_v_nu, __pyx_v_cache_size, __pyx_v_C, __pyx_v_eps, __pyx_v_p, __pyx_v_shrinking, __pyx_v_probability, ((int)(__pyx_v_weight->dimensions[0])), __pyx_v_weight_label->data, __pyx_v_weight->data); + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":565 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":565 + * model = set_model(param, <int> nSV.shape[0], SV.data, SV.shape, sv_coef.strides, + * sv_coef.data, intercept.data, nSV.data, label.data, + * probA.data, probB.data) # <<<<<<<<<<<<<< +@@ -5421,7 +5425,7 @@ static PyObject *__pyx_pf_7_libsvm_predi + */ + __pyx_v_model = set_model(__pyx_v_param, ((int)(__pyx_v_nSV->dimensions[0])), __pyx_v_SV->data, __pyx_v_SV->dimensions, __pyx_v_sv_coef->strides, __pyx_v_sv_coef->data, __pyx_v_intercept->data, __pyx_v_nSV->data, __pyx_v_label->data, __pyx_v_probA->data, __pyx_v_probB->data); + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":567 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":567 + * probA.data, probB.data) + * + * if svm_type > 1: # <<<<<<<<<<<<<< +@@ -5431,7 +5435,7 @@ static PyObject *__pyx_pf_7_libsvm_predi + __pyx_t_1 = (__pyx_v_svm_type > 1); + if (__pyx_t_1) { + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":568 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":568 + * + * if svm_type > 1: + * nr = 1 # <<<<<<<<<<<<<< +@@ -5443,7 +5447,7 @@ static PyObject *__pyx_pf_7_libsvm_predi + } + /*else*/ { + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":570 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":570 + * nr = 1 + * else: + * nr = get_nr(model) # <<<<<<<<<<<<<< +@@ -5452,7 +5456,7 @@ static PyObject *__pyx_pf_7_libsvm_predi + */ + __pyx_v_nr = get_nr(__pyx_v_model); + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":571 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":571 + * else: + * nr = get_nr(model) + * nr = nr * (nr - 1) / 2 # <<<<<<<<<<<<<< +@@ -5463,7 +5467,7 @@ static PyObject *__pyx_pf_7_libsvm_predi + } + __pyx_L6:; + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":573 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":573 + * nr = nr * (nr - 1) / 2 + * + * dec_values = np.empty((T.shape[0], nr), dtype=np.float64) # <<<<<<<<<<<<<< +@@ -5530,7 +5534,7 @@ static PyObject *__pyx_pf_7_libsvm_predi + __pyx_v_dec_values = ((PyArrayObject *)__pyx_t_6); + __pyx_t_6 = 0; + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":574 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":574 + * + * dec_values = np.empty((T.shape[0], nr), dtype=np.float64) + * if copy_predict_values(T.data, model, T.shape, dec_values.data, nr) < 0: # <<<<<<<<<<<<<< +@@ -5540,7 +5544,7 @@ static PyObject *__pyx_pf_7_libsvm_predi + __pyx_t_1 = (copy_predict_values(__pyx_v_T->data, __pyx_v_model, __pyx_v_T->dimensions, __pyx_v_dec_values->data, __pyx_v_nr) < 0); + if (__pyx_t_1) { + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":575 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":575 + * dec_values = np.empty((T.shape[0], nr), dtype=np.float64) + * if copy_predict_values(T.data, model, T.shape, dec_values.data, nr) < 0: + * raise MemoryError("We've run out of of memory") # <<<<<<<<<<<<<< +@@ -5562,7 +5566,7 @@ static PyObject *__pyx_pf_7_libsvm_predi + } + __pyx_L7:; + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":577 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":577 + * raise MemoryError("We've run out of of memory") + * # free model and param + * free_model_SV(model) # <<<<<<<<<<<<<< +@@ -5571,7 +5575,7 @@ static PyObject *__pyx_pf_7_libsvm_predi + */ + free_model_SV(__pyx_v_model); + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":578 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":578 + * # free model and param + * free_model_SV(model) + * free_model(model) # <<<<<<<<<<<<<< +@@ -5580,7 +5584,7 @@ static PyObject *__pyx_pf_7_libsvm_predi + */ + free_model(__pyx_v_model); + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":579 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":579 + * free_model_SV(model) + * free_model(model) + * free_param(param) # <<<<<<<<<<<<<< +@@ -5589,11 +5593,12 @@ static PyObject *__pyx_pf_7_libsvm_predi + */ + free_param(__pyx_v_param); + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":580 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":580 + * free_model(model) + * free_param(param) + * return dec_values # <<<<<<<<<<<<<< + * ++ * def set_verbosity_wrap(int verbosity): + */ + __Pyx_XDECREF(__pyx_r); + __Pyx_INCREF(((PyObject *)__pyx_v_dec_values)); +@@ -5654,7 +5659,44 @@ static PyObject *__pyx_pf_7_libsvm_predi + return __pyx_r; + } + +-/* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":187 ++/* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":582 ++ * return dec_values ++ * ++ * def set_verbosity_wrap(int verbosity): # <<<<<<<<<<<<<< ++ * """ ++ * Control verbosity of libsvm library ++ */ ++ ++static PyObject *__pyx_pf_7_libsvm_set_verbosity_wrap(PyObject *__pyx_self, PyObject *__pyx_arg_verbosity); /*proto*/ ++static char __pyx_doc_7_libsvm_set_verbosity_wrap[] = "\n Control verbosity of libsvm library\n "; ++static PyObject *__pyx_pf_7_libsvm_set_verbosity_wrap(PyObject *__pyx_self, PyObject *__pyx_arg_verbosity) { ++ int __pyx_v_verbosity; ++ PyObject *__pyx_r = NULL; ++ __Pyx_RefNannySetupContext("set_verbosity_wrap"); ++ __pyx_self = __pyx_self; ++ assert(__pyx_arg_verbosity); { ++ __pyx_v_verbosity = __Pyx_PyInt_AsInt(__pyx_arg_verbosity); if (unlikely((__pyx_v_verbosity == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 582; __pyx_clineno = __LINE__; goto __pyx_L3_error;} ++ } ++ goto __pyx_L4_argument_unpacking_done; ++ __pyx_L3_error:; ++ __Pyx_AddTraceback("_libsvm.set_verbosity_wrap"); ++ return NULL; ++ __pyx_L4_argument_unpacking_done:; ++ ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":586 ++ * Control verbosity of libsvm library ++ * """ ++ * set_verbosity(verbosity) # <<<<<<<<<<<<<< ++ */ ++ set_verbosity(__pyx_v_verbosity); ++ ++ __pyx_r = Py_None; __Pyx_INCREF(Py_None); ++ __Pyx_XGIVEREF(__pyx_r); ++ __Pyx_RefNannyFinishContext(); ++ return __pyx_r; ++} ++ ++/* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":187 + * # experimental exception made for __getbuffer__ and __releasebuffer__ + * # -- the details of this may change. + * def __getbuffer__(ndarray self, Py_buffer* info, int flags): # <<<<<<<<<<<<<< +@@ -5690,7 +5732,7 @@ static int __pyx_pf_5numpy_7ndarray___ge + __Pyx_GIVEREF(__pyx_v_info->obj); + __Pyx_INCREF((PyObject *)__pyx_v_self); + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":193 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":193 + * # of flags + * cdef int copy_shape, i, ndim + * cdef int endian_detector = 1 # <<<<<<<<<<<<<< +@@ -5699,7 +5741,7 @@ static int __pyx_pf_5numpy_7ndarray___ge + */ + __pyx_v_endian_detector = 1; + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":194 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":194 + * cdef int copy_shape, i, ndim + * cdef int endian_detector = 1 + * cdef bint little_endian = ((<char*>&endian_detector)[0] != 0) # <<<<<<<<<<<<<< +@@ -5708,7 +5750,7 @@ static int __pyx_pf_5numpy_7ndarray___ge + */ + __pyx_v_little_endian = ((((char *)(&__pyx_v_endian_detector))[0]) != 0); + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":196 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":196 + * cdef bint little_endian = ((<char*>&endian_detector)[0] != 0) + * + * ndim = PyArray_NDIM(self) # <<<<<<<<<<<<<< +@@ -5717,7 +5759,7 @@ static int __pyx_pf_5numpy_7ndarray___ge + */ + __pyx_v_ndim = PyArray_NDIM(((PyArrayObject *)__pyx_v_self)); + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":198 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":198 + * ndim = PyArray_NDIM(self) + * + * if sizeof(npy_intp) != sizeof(Py_ssize_t): # <<<<<<<<<<<<<< +@@ -5727,7 +5769,7 @@ static int __pyx_pf_5numpy_7ndarray___ge + __pyx_t_1 = ((sizeof(npy_intp)) != (sizeof(Py_ssize_t))); + if (__pyx_t_1) { + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":199 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":199 + * + * if sizeof(npy_intp) != sizeof(Py_ssize_t): + * copy_shape = 1 # <<<<<<<<<<<<<< +@@ -5739,7 +5781,7 @@ static int __pyx_pf_5numpy_7ndarray___ge + } + /*else*/ { + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":201 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":201 + * copy_shape = 1 + * else: + * copy_shape = 0 # <<<<<<<<<<<<<< +@@ -5750,7 +5792,7 @@ static int __pyx_pf_5numpy_7ndarray___ge + } + __pyx_L5:; + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":203 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":203 + * copy_shape = 0 + * + * if ((flags & pybuf.PyBUF_C_CONTIGUOUS == pybuf.PyBUF_C_CONTIGUOUS) # <<<<<<<<<<<<<< +@@ -5760,7 +5802,7 @@ static int __pyx_pf_5numpy_7ndarray___ge + __pyx_t_1 = ((__pyx_v_flags & PyBUF_C_CONTIGUOUS) == PyBUF_C_CONTIGUOUS); + if (__pyx_t_1) { + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":204 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":204 + * + * if ((flags & pybuf.PyBUF_C_CONTIGUOUS == pybuf.PyBUF_C_CONTIGUOUS) + * and not PyArray_CHKFLAGS(self, NPY_C_CONTIGUOUS)): # <<<<<<<<<<<<<< +@@ -5774,7 +5816,7 @@ static int __pyx_pf_5numpy_7ndarray___ge + } + if (__pyx_t_3) { + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":205 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":205 + * if ((flags & pybuf.PyBUF_C_CONTIGUOUS == pybuf.PyBUF_C_CONTIGUOUS) + * and not PyArray_CHKFLAGS(self, NPY_C_CONTIGUOUS)): + * raise ValueError(u"ndarray is not C contiguous") # <<<<<<<<<<<<<< +@@ -5796,7 +5838,7 @@ static int __pyx_pf_5numpy_7ndarray___ge + } + __pyx_L6:; + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":207 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":207 + * raise ValueError(u"ndarray is not C contiguous") + * + * if ((flags & pybuf.PyBUF_F_CONTIGUOUS == pybuf.PyBUF_F_CONTIGUOUS) # <<<<<<<<<<<<<< +@@ -5806,7 +5848,7 @@ static int __pyx_pf_5numpy_7ndarray___ge + __pyx_t_3 = ((__pyx_v_flags & PyBUF_F_CONTIGUOUS) == PyBUF_F_CONTIGUOUS); + if (__pyx_t_3) { + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":208 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":208 + * + * if ((flags & pybuf.PyBUF_F_CONTIGUOUS == pybuf.PyBUF_F_CONTIGUOUS) + * and not PyArray_CHKFLAGS(self, NPY_F_CONTIGUOUS)): # <<<<<<<<<<<<<< +@@ -5820,7 +5862,7 @@ static int __pyx_pf_5numpy_7ndarray___ge + } + if (__pyx_t_2) { + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":209 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":209 + * if ((flags & pybuf.PyBUF_F_CONTIGUOUS == pybuf.PyBUF_F_CONTIGUOUS) + * and not PyArray_CHKFLAGS(self, NPY_F_CONTIGUOUS)): + * raise ValueError(u"ndarray is not Fortran contiguous") # <<<<<<<<<<<<<< +@@ -5842,7 +5884,7 @@ static int __pyx_pf_5numpy_7ndarray___ge + } + __pyx_L7:; + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":211 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":211 + * raise ValueError(u"ndarray is not Fortran contiguous") + * + * info.buf = PyArray_DATA(self) # <<<<<<<<<<<<<< +@@ -5851,7 +5893,7 @@ static int __pyx_pf_5numpy_7ndarray___ge + */ + __pyx_v_info->buf = PyArray_DATA(((PyArrayObject *)__pyx_v_self)); + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":212 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":212 + * + * info.buf = PyArray_DATA(self) + * info.ndim = ndim # <<<<<<<<<<<<<< +@@ -5860,7 +5902,7 @@ static int __pyx_pf_5numpy_7ndarray___ge + */ + __pyx_v_info->ndim = __pyx_v_ndim; + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":213 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":213 + * info.buf = PyArray_DATA(self) + * info.ndim = ndim + * if copy_shape: # <<<<<<<<<<<<<< +@@ -5870,7 +5912,7 @@ static int __pyx_pf_5numpy_7ndarray___ge + __pyx_t_6 = __pyx_v_copy_shape; + if (__pyx_t_6) { + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":216 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":216 + * # Allocate new buffer for strides and shape info. This is allocated + * # as one block, strides first. + * info.strides = <Py_ssize_t*>stdlib.malloc(sizeof(Py_ssize_t) * ndim * 2) # <<<<<<<<<<<<<< +@@ -5879,7 +5921,7 @@ static int __pyx_pf_5numpy_7ndarray___ge + */ + __pyx_v_info->strides = ((Py_ssize_t *)malloc((((sizeof(Py_ssize_t)) * __pyx_v_ndim) * 2))); + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":217 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":217 + * # as one block, strides first. + * info.strides = <Py_ssize_t*>stdlib.malloc(sizeof(Py_ssize_t) * ndim * 2) + * info.shape = info.strides + ndim # <<<<<<<<<<<<<< +@@ -5888,7 +5930,7 @@ static int __pyx_pf_5numpy_7ndarray___ge + */ + __pyx_v_info->shape = (__pyx_v_info->strides + __pyx_v_ndim); + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":218 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":218 + * info.strides = <Py_ssize_t*>stdlib.malloc(sizeof(Py_ssize_t) * ndim * 2) + * info.shape = info.strides + ndim + * for i in range(ndim): # <<<<<<<<<<<<<< +@@ -5899,7 +5941,7 @@ static int __pyx_pf_5numpy_7ndarray___ge + for (__pyx_t_7 = 0; __pyx_t_7 < __pyx_t_6; __pyx_t_7+=1) { + __pyx_v_i = __pyx_t_7; + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":219 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":219 + * info.shape = info.strides + ndim + * for i in range(ndim): + * info.strides[i] = PyArray_STRIDES(self)[i] # <<<<<<<<<<<<<< +@@ -5908,7 +5950,7 @@ static int __pyx_pf_5numpy_7ndarray___ge + */ + (__pyx_v_info->strides[__pyx_v_i]) = (PyArray_STRIDES(((PyArrayObject *)__pyx_v_self))[__pyx_v_i]); + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":220 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":220 + * for i in range(ndim): + * info.strides[i] = PyArray_STRIDES(self)[i] + * info.shape[i] = PyArray_DIMS(self)[i] # <<<<<<<<<<<<<< +@@ -5921,7 +5963,7 @@ static int __pyx_pf_5numpy_7ndarray___ge + } + /*else*/ { + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":222 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":222 + * info.shape[i] = PyArray_DIMS(self)[i] + * else: + * info.strides = <Py_ssize_t*>PyArray_STRIDES(self) # <<<<<<<<<<<<<< +@@ -5930,7 +5972,7 @@ static int __pyx_pf_5numpy_7ndarray___ge + */ + __pyx_v_info->strides = ((Py_ssize_t *)PyArray_STRIDES(((PyArrayObject *)__pyx_v_self))); + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":223 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":223 + * else: + * info.strides = <Py_ssize_t*>PyArray_STRIDES(self) + * info.shape = <Py_ssize_t*>PyArray_DIMS(self) # <<<<<<<<<<<<<< +@@ -5941,7 +5983,7 @@ static int __pyx_pf_5numpy_7ndarray___ge + } + __pyx_L8:; + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":224 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":224 + * info.strides = <Py_ssize_t*>PyArray_STRIDES(self) + * info.shape = <Py_ssize_t*>PyArray_DIMS(self) + * info.suboffsets = NULL # <<<<<<<<<<<<<< +@@ -5950,7 +5992,7 @@ static int __pyx_pf_5numpy_7ndarray___ge + */ + __pyx_v_info->suboffsets = NULL; + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":225 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":225 + * info.shape = <Py_ssize_t*>PyArray_DIMS(self) + * info.suboffsets = NULL + * info.itemsize = PyArray_ITEMSIZE(self) # <<<<<<<<<<<<<< +@@ -5959,7 +6001,7 @@ static int __pyx_pf_5numpy_7ndarray___ge + */ + __pyx_v_info->itemsize = PyArray_ITEMSIZE(((PyArrayObject *)__pyx_v_self)); + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":226 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":226 + * info.suboffsets = NULL + * info.itemsize = PyArray_ITEMSIZE(self) + * info.readonly = not PyArray_ISWRITEABLE(self) # <<<<<<<<<<<<<< +@@ -5968,7 +6010,7 @@ static int __pyx_pf_5numpy_7ndarray___ge + */ + __pyx_v_info->readonly = (!PyArray_ISWRITEABLE(((PyArrayObject *)__pyx_v_self))); + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":229 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":229 + * + * cdef int t + * cdef char* f = NULL # <<<<<<<<<<<<<< +@@ -5977,7 +6019,7 @@ static int __pyx_pf_5numpy_7ndarray___ge + */ + __pyx_v_f = NULL; + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":230 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":230 + * cdef int t + * cdef char* f = NULL + * cdef dtype descr = self.descr # <<<<<<<<<<<<<< +@@ -5987,7 +6029,7 @@ static int __pyx_pf_5numpy_7ndarray___ge + __Pyx_INCREF(((PyObject *)((PyArrayObject *)__pyx_v_self)->descr)); + __pyx_v_descr = ((PyArrayObject *)__pyx_v_self)->descr; + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":234 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":234 + * cdef int offset + * + * cdef bint hasfields = PyDataType_HASFIELDS(descr) # <<<<<<<<<<<<<< +@@ -5996,7 +6038,7 @@ static int __pyx_pf_5numpy_7ndarray___ge + */ + __pyx_v_hasfields = PyDataType_HASFIELDS(__pyx_v_descr); + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":236 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":236 + * cdef bint hasfields = PyDataType_HASFIELDS(descr) + * + * if not hasfields and not copy_shape: # <<<<<<<<<<<<<< +@@ -6012,7 +6054,7 @@ static int __pyx_pf_5numpy_7ndarray___ge + } + if (__pyx_t_1) { + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":238 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":238 + * if not hasfields and not copy_shape: + * # do not call releasebuffer + * info.obj = None # <<<<<<<<<<<<<< +@@ -6028,7 +6070,7 @@ static int __pyx_pf_5numpy_7ndarray___ge + } + /*else*/ { + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":241 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":241 + * else: + * # need to call releasebuffer + * info.obj = self # <<<<<<<<<<<<<< +@@ -6043,7 +6085,7 @@ static int __pyx_pf_5numpy_7ndarray___ge + } + __pyx_L11:; + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":243 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":243 + * info.obj = self + * + * if not hasfields: # <<<<<<<<<<<<<< +@@ -6053,7 +6095,7 @@ static int __pyx_pf_5numpy_7ndarray___ge + __pyx_t_1 = (!__pyx_v_hasfields); + if (__pyx_t_1) { + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":244 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":244 + * + * if not hasfields: + * t = descr.type_num # <<<<<<<<<<<<<< +@@ -6062,7 +6104,7 @@ static int __pyx_pf_5numpy_7ndarray___ge + */ + __pyx_v_t = __pyx_v_descr->type_num; + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":245 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":245 + * if not hasfields: + * t = descr.type_num + * if ((descr.byteorder == '>' and little_endian) or # <<<<<<<<<<<<<< +@@ -6077,7 +6119,7 @@ static int __pyx_pf_5numpy_7ndarray___ge + } + if (!__pyx_t_2) { + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":246 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":246 + * t = descr.type_num + * if ((descr.byteorder == '>' and little_endian) or + * (descr.byteorder == '<' and not little_endian)): # <<<<<<<<<<<<<< +@@ -6097,7 +6139,7 @@ static int __pyx_pf_5numpy_7ndarray___ge + } + if (__pyx_t_1) { + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":247 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":247 + * if ((descr.byteorder == '>' and little_endian) or + * (descr.byteorder == '<' and not little_endian)): + * raise ValueError(u"Non-native byte order not supported") # <<<<<<<<<<<<<< +@@ -6119,7 +6161,7 @@ static int __pyx_pf_5numpy_7ndarray___ge + } + __pyx_L13:; + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":248 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":248 + * (descr.byteorder == '<' and not little_endian)): + * raise ValueError(u"Non-native byte order not supported") + * if t == NPY_BYTE: f = "b" # <<<<<<<<<<<<<< +@@ -6132,7 +6174,7 @@ static int __pyx_pf_5numpy_7ndarray___ge + goto __pyx_L14; + } + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":249 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":249 + * raise ValueError(u"Non-native byte order not supported") + * if t == NPY_BYTE: f = "b" + * elif t == NPY_UBYTE: f = "B" # <<<<<<<<<<<<<< +@@ -6145,7 +6187,7 @@ static int __pyx_pf_5numpy_7ndarray___ge + goto __pyx_L14; + } + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":250 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":250 + * if t == NPY_BYTE: f = "b" + * elif t == NPY_UBYTE: f = "B" + * elif t == NPY_SHORT: f = "h" # <<<<<<<<<<<<<< +@@ -6158,7 +6200,7 @@ static int __pyx_pf_5numpy_7ndarray___ge + goto __pyx_L14; + } + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":251 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":251 + * elif t == NPY_UBYTE: f = "B" + * elif t == NPY_SHORT: f = "h" + * elif t == NPY_USHORT: f = "H" # <<<<<<<<<<<<<< +@@ -6171,7 +6213,7 @@ static int __pyx_pf_5numpy_7ndarray___ge + goto __pyx_L14; + } + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":252 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":252 + * elif t == NPY_SHORT: f = "h" + * elif t == NPY_USHORT: f = "H" + * elif t == NPY_INT: f = "i" # <<<<<<<<<<<<<< +@@ -6184,7 +6226,7 @@ static int __pyx_pf_5numpy_7ndarray___ge + goto __pyx_L14; + } + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":253 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":253 + * elif t == NPY_USHORT: f = "H" + * elif t == NPY_INT: f = "i" + * elif t == NPY_UINT: f = "I" # <<<<<<<<<<<<<< +@@ -6197,7 +6239,7 @@ static int __pyx_pf_5numpy_7ndarray___ge + goto __pyx_L14; + } + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":254 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":254 + * elif t == NPY_INT: f = "i" + * elif t == NPY_UINT: f = "I" + * elif t == NPY_LONG: f = "l" # <<<<<<<<<<<<<< +@@ -6210,7 +6252,7 @@ static int __pyx_pf_5numpy_7ndarray___ge + goto __pyx_L14; + } + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":255 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":255 + * elif t == NPY_UINT: f = "I" + * elif t == NPY_LONG: f = "l" + * elif t == NPY_ULONG: f = "L" # <<<<<<<<<<<<<< +@@ -6223,7 +6265,7 @@ static int __pyx_pf_5numpy_7ndarray___ge + goto __pyx_L14; + } + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":256 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":256 + * elif t == NPY_LONG: f = "l" + * elif t == NPY_ULONG: f = "L" + * elif t == NPY_LONGLONG: f = "q" # <<<<<<<<<<<<<< +@@ -6236,7 +6278,7 @@ static int __pyx_pf_5numpy_7ndarray___ge + goto __pyx_L14; + } + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":257 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":257 + * elif t == NPY_ULONG: f = "L" + * elif t == NPY_LONGLONG: f = "q" + * elif t == NPY_ULONGLONG: f = "Q" # <<<<<<<<<<<<<< +@@ -6249,7 +6291,7 @@ static int __pyx_pf_5numpy_7ndarray___ge + goto __pyx_L14; + } + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":258 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":258 + * elif t == NPY_LONGLONG: f = "q" + * elif t == NPY_ULONGLONG: f = "Q" + * elif t == NPY_FLOAT: f = "f" # <<<<<<<<<<<<<< +@@ -6262,7 +6304,7 @@ static int __pyx_pf_5numpy_7ndarray___ge + goto __pyx_L14; + } + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":259 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":259 + * elif t == NPY_ULONGLONG: f = "Q" + * elif t == NPY_FLOAT: f = "f" + * elif t == NPY_DOUBLE: f = "d" # <<<<<<<<<<<<<< +@@ -6275,7 +6317,7 @@ static int __pyx_pf_5numpy_7ndarray___ge + goto __pyx_L14; + } + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":260 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":260 + * elif t == NPY_FLOAT: f = "f" + * elif t == NPY_DOUBLE: f = "d" + * elif t == NPY_LONGDOUBLE: f = "g" # <<<<<<<<<<<<<< +@@ -6288,7 +6330,7 @@ static int __pyx_pf_5numpy_7ndarray___ge + goto __pyx_L14; + } + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":261 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":261 + * elif t == NPY_DOUBLE: f = "d" + * elif t == NPY_LONGDOUBLE: f = "g" + * elif t == NPY_CFLOAT: f = "Zf" # <<<<<<<<<<<<<< +@@ -6301,7 +6343,7 @@ static int __pyx_pf_5numpy_7ndarray___ge + goto __pyx_L14; + } + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":262 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":262 + * elif t == NPY_LONGDOUBLE: f = "g" + * elif t == NPY_CFLOAT: f = "Zf" + * elif t == NPY_CDOUBLE: f = "Zd" # <<<<<<<<<<<<<< +@@ -6314,7 +6356,7 @@ static int __pyx_pf_5numpy_7ndarray___ge + goto __pyx_L14; + } + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":263 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":263 + * elif t == NPY_CFLOAT: f = "Zf" + * elif t == NPY_CDOUBLE: f = "Zd" + * elif t == NPY_CLONGDOUBLE: f = "Zg" # <<<<<<<<<<<<<< +@@ -6327,7 +6369,7 @@ static int __pyx_pf_5numpy_7ndarray___ge + goto __pyx_L14; + } + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":264 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":264 + * elif t == NPY_CDOUBLE: f = "Zd" + * elif t == NPY_CLONGDOUBLE: f = "Zg" + * elif t == NPY_OBJECT: f = "O" # <<<<<<<<<<<<<< +@@ -6341,7 +6383,7 @@ static int __pyx_pf_5numpy_7ndarray___ge + } + /*else*/ { + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":266 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":266 + * elif t == NPY_OBJECT: f = "O" + * else: + * raise ValueError(u"unknown dtype code in numpy.pxd (%d)" % t) # <<<<<<<<<<<<<< +@@ -6367,7 +6409,7 @@ static int __pyx_pf_5numpy_7ndarray___ge + } + __pyx_L14:; + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":267 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":267 + * else: + * raise ValueError(u"unknown dtype code in numpy.pxd (%d)" % t) + * info.format = f # <<<<<<<<<<<<<< +@@ -6376,7 +6418,7 @@ static int __pyx_pf_5numpy_7ndarray___ge + */ + __pyx_v_info->format = __pyx_v_f; + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":268 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":268 + * raise ValueError(u"unknown dtype code in numpy.pxd (%d)" % t) + * info.format = f + * return # <<<<<<<<<<<<<< +@@ -6389,7 +6431,7 @@ static int __pyx_pf_5numpy_7ndarray___ge + } + /*else*/ { + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":270 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":270 + * return + * else: + * info.format = <char*>stdlib.malloc(_buffer_format_string_len) # <<<<<<<<<<<<<< +@@ -6398,7 +6440,7 @@ static int __pyx_pf_5numpy_7ndarray___ge + */ + __pyx_v_info->format = ((char *)malloc(255)); + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":271 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":271 + * else: + * info.format = <char*>stdlib.malloc(_buffer_format_string_len) + * info.format[0] = '^' # Native data types, manual alignment # <<<<<<<<<<<<<< +@@ -6407,7 +6449,7 @@ static int __pyx_pf_5numpy_7ndarray___ge + */ + (__pyx_v_info->format[0]) = '^'; + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":272 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":272 + * info.format = <char*>stdlib.malloc(_buffer_format_string_len) + * info.format[0] = '^' # Native data types, manual alignment + * offset = 0 # <<<<<<<<<<<<<< +@@ -6416,7 +6458,7 @@ static int __pyx_pf_5numpy_7ndarray___ge + */ + __pyx_v_offset = 0; + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":275 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":275 + * f = _util_dtypestring(descr, info.format + 1, + * info.format + _buffer_format_string_len, + * &offset) # <<<<<<<<<<<<<< +@@ -6426,7 +6468,7 @@ static int __pyx_pf_5numpy_7ndarray___ge + __pyx_t_9 = __pyx_f_5numpy__util_dtypestring(__pyx_v_descr, (__pyx_v_info->format + 1), (__pyx_v_info->format + 255), (&__pyx_v_offset)); if (unlikely(__pyx_t_9 == NULL)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 273; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_v_f = __pyx_t_9; + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":276 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":276 + * info.format + _buffer_format_string_len, + * &offset) + * f[0] = 0 # Terminate format string # <<<<<<<<<<<<<< +@@ -6459,7 +6501,7 @@ static int __pyx_pf_5numpy_7ndarray___ge + return __pyx_r; + } + +-/* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":278 ++/* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":278 + * f[0] = 0 # Terminate format string + * + * def __releasebuffer__(ndarray self, Py_buffer* info): # <<<<<<<<<<<<<< +@@ -6473,7 +6515,7 @@ static void __pyx_pf_5numpy_7ndarray___r + __Pyx_RefNannySetupContext("__releasebuffer__"); + __Pyx_INCREF((PyObject *)__pyx_v_self); + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":279 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":279 + * + * def __releasebuffer__(ndarray self, Py_buffer* info): + * if PyArray_HASFIELDS(self): # <<<<<<<<<<<<<< +@@ -6483,7 +6525,7 @@ static void __pyx_pf_5numpy_7ndarray___r + __pyx_t_1 = PyArray_HASFIELDS(((PyArrayObject *)__pyx_v_self)); + if (__pyx_t_1) { + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":280 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":280 + * def __releasebuffer__(ndarray self, Py_buffer* info): + * if PyArray_HASFIELDS(self): + * stdlib.free(info.format) # <<<<<<<<<<<<<< +@@ -6495,7 +6537,7 @@ static void __pyx_pf_5numpy_7ndarray___r + } + __pyx_L5:; + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":281 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":281 + * if PyArray_HASFIELDS(self): + * stdlib.free(info.format) + * if sizeof(npy_intp) != sizeof(Py_ssize_t): # <<<<<<<<<<<<<< +@@ -6505,7 +6547,7 @@ static void __pyx_pf_5numpy_7ndarray___r + __pyx_t_1 = ((sizeof(npy_intp)) != (sizeof(Py_ssize_t))); + if (__pyx_t_1) { + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":282 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":282 + * stdlib.free(info.format) + * if sizeof(npy_intp) != sizeof(Py_ssize_t): + * stdlib.free(info.strides) # <<<<<<<<<<<<<< +@@ -6521,7 +6563,7 @@ static void __pyx_pf_5numpy_7ndarray___r + __Pyx_RefNannyFinishContext(); + } + +-/* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":755 ++/* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":755 + * ctypedef npy_cdouble complex_t + * + * cdef inline object PyArray_MultiIterNew1(a): # <<<<<<<<<<<<<< +@@ -6534,7 +6576,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5 + PyObject *__pyx_t_1 = NULL; + __Pyx_RefNannySetupContext("PyArray_MultiIterNew1"); + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":756 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":756 + * + * cdef inline object PyArray_MultiIterNew1(a): + * return PyArray_MultiIterNew(1, <void*>a) # <<<<<<<<<<<<<< +@@ -6560,7 +6602,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5 + return __pyx_r; + } + +-/* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":758 ++/* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":758 + * return PyArray_MultiIterNew(1, <void*>a) + * + * cdef inline object PyArray_MultiIterNew2(a, b): # <<<<<<<<<<<<<< +@@ -6573,7 +6615,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5 + PyObject *__pyx_t_1 = NULL; + __Pyx_RefNannySetupContext("PyArray_MultiIterNew2"); + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":759 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":759 + * + * cdef inline object PyArray_MultiIterNew2(a, b): + * return PyArray_MultiIterNew(2, <void*>a, <void*>b) # <<<<<<<<<<<<<< +@@ -6599,7 +6641,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5 + return __pyx_r; + } + +-/* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":761 ++/* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":761 + * return PyArray_MultiIterNew(2, <void*>a, <void*>b) + * + * cdef inline object PyArray_MultiIterNew3(a, b, c): # <<<<<<<<<<<<<< +@@ -6612,7 +6654,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5 + PyObject *__pyx_t_1 = NULL; + __Pyx_RefNannySetupContext("PyArray_MultiIterNew3"); + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":762 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":762 + * + * cdef inline object PyArray_MultiIterNew3(a, b, c): + * return PyArray_MultiIterNew(3, <void*>a, <void*>b, <void*> c) # <<<<<<<<<<<<<< +@@ -6638,7 +6680,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5 + return __pyx_r; + } + +-/* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":764 ++/* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":764 + * return PyArray_MultiIterNew(3, <void*>a, <void*>b, <void*> c) + * + * cdef inline object PyArray_MultiIterNew4(a, b, c, d): # <<<<<<<<<<<<<< +@@ -6651,7 +6693,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5 + PyObject *__pyx_t_1 = NULL; + __Pyx_RefNannySetupContext("PyArray_MultiIterNew4"); + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":765 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":765 + * + * cdef inline object PyArray_MultiIterNew4(a, b, c, d): + * return PyArray_MultiIterNew(4, <void*>a, <void*>b, <void*>c, <void*> d) # <<<<<<<<<<<<<< +@@ -6677,7 +6719,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5 + return __pyx_r; + } + +-/* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":767 ++/* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":767 + * return PyArray_MultiIterNew(4, <void*>a, <void*>b, <void*>c, <void*> d) + * + * cdef inline object PyArray_MultiIterNew5(a, b, c, d, e): # <<<<<<<<<<<<<< +@@ -6690,7 +6732,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5 + PyObject *__pyx_t_1 = NULL; + __Pyx_RefNannySetupContext("PyArray_MultiIterNew5"); + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":768 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":768 + * + * cdef inline object PyArray_MultiIterNew5(a, b, c, d, e): + * return PyArray_MultiIterNew(5, <void*>a, <void*>b, <void*>c, <void*> d, <void*> e) # <<<<<<<<<<<<<< +@@ -6716,7 +6758,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5 + return __pyx_r; + } + +-/* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":770 ++/* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":770 + * return PyArray_MultiIterNew(5, <void*>a, <void*>b, <void*>c, <void*> d, <void*> e) + * + * cdef inline char* _util_dtypestring(dtype descr, char* f, char* end, int* offset) except NULL: # <<<<<<<<<<<<<< +@@ -6751,7 +6793,7 @@ static CYTHON_INLINE char *__pyx_f_5nump + __pyx_v_new_offset = Py_None; __Pyx_INCREF(Py_None); + __pyx_v_t = Py_None; __Pyx_INCREF(Py_None); + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":777 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":777 + * cdef int delta_offset + * cdef tuple i + * cdef int endian_detector = 1 # <<<<<<<<<<<<<< +@@ -6760,7 +6802,7 @@ static CYTHON_INLINE char *__pyx_f_5nump + */ + __pyx_v_endian_detector = 1; + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":778 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":778 + * cdef tuple i + * cdef int endian_detector = 1 + * cdef bint little_endian = ((<char*>&endian_detector)[0] != 0) # <<<<<<<<<<<<<< +@@ -6769,7 +6811,7 @@ static CYTHON_INLINE char *__pyx_f_5nump + */ + __pyx_v_little_endian = ((((char *)(&__pyx_v_endian_detector))[0]) != 0); + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":781 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":781 + * cdef tuple fields + * + * for childname in descr.names: # <<<<<<<<<<<<<< +@@ -6788,7 +6830,7 @@ static CYTHON_INLINE char *__pyx_f_5nump + __pyx_v_childname = __pyx_t_3; + __pyx_t_3 = 0; + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":782 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":782 + * + * for childname in descr.names: + * fields = descr.fields[childname] # <<<<<<<<<<<<<< +@@ -6802,7 +6844,7 @@ static CYTHON_INLINE char *__pyx_f_5nump + __pyx_v_fields = ((PyObject *)__pyx_t_3); + __pyx_t_3 = 0; + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":783 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":783 + * for childname in descr.names: + * fields = descr.fields[childname] + * child, new_offset = fields # <<<<<<<<<<<<<< +@@ -6825,7 +6867,7 @@ static CYTHON_INLINE char *__pyx_f_5nump + {__pyx_filename = __pyx_f[1]; __pyx_lineno = 783; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + } + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":785 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":785 + * child, new_offset = fields + * + * if (end - f) - (new_offset - offset[0]) < 15: # <<<<<<<<<<<<<< +@@ -6850,7 +6892,7 @@ static CYTHON_INLINE char *__pyx_f_5nump + __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; + if (__pyx_t_6) { + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":786 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":786 + * + * if (end - f) - (new_offset - offset[0]) < 15: + * raise RuntimeError(u"Format string allocated too short, see comment in numpy.pxd") # <<<<<<<<<<<<<< +@@ -6872,7 +6914,7 @@ static CYTHON_INLINE char *__pyx_f_5nump + } + __pyx_L5:; + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":788 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":788 + * raise RuntimeError(u"Format string allocated too short, see comment in numpy.pxd") + * + * if ((child.byteorder == '>' and little_endian) or # <<<<<<<<<<<<<< +@@ -6887,7 +6929,7 @@ static CYTHON_INLINE char *__pyx_f_5nump + } + if (!__pyx_t_7) { + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":789 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":789 + * + * if ((child.byteorder == '>' and little_endian) or + * (child.byteorder == '<' and not little_endian)): # <<<<<<<<<<<<<< +@@ -6907,7 +6949,7 @@ static CYTHON_INLINE char *__pyx_f_5nump + } + if (__pyx_t_6) { + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":790 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":790 + * if ((child.byteorder == '>' and little_endian) or + * (child.byteorder == '<' and not little_endian)): + * raise ValueError(u"Non-native byte order not supported") # <<<<<<<<<<<<<< +@@ -6929,7 +6971,7 @@ static CYTHON_INLINE char *__pyx_f_5nump + } + __pyx_L6:; + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":800 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":800 + * + * # Output padding bytes + * while offset[0] < new_offset: # <<<<<<<<<<<<<< +@@ -6946,7 +6988,7 @@ static CYTHON_INLINE char *__pyx_f_5nump + __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + if (!__pyx_t_6) break; + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":801 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":801 + * # Output padding bytes + * while offset[0] < new_offset: + * f[0] = 120 # "x"; pad byte # <<<<<<<<<<<<<< +@@ -6955,7 +6997,7 @@ static CYTHON_INLINE char *__pyx_f_5nump + */ + (__pyx_v_f[0]) = 120; + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":802 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":802 + * while offset[0] < new_offset: + * f[0] = 120 # "x"; pad byte + * f += 1 # <<<<<<<<<<<<<< +@@ -6964,7 +7006,7 @@ static CYTHON_INLINE char *__pyx_f_5nump + */ + __pyx_v_f += 1; + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":803 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":803 + * f[0] = 120 # "x"; pad byte + * f += 1 + * offset[0] += 1 # <<<<<<<<<<<<<< +@@ -6974,7 +7016,7 @@ static CYTHON_INLINE char *__pyx_f_5nump + (__pyx_v_offset[0]) += 1; + } + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":805 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":805 + * offset[0] += 1 + * + * offset[0] += child.itemsize # <<<<<<<<<<<<<< +@@ -6983,7 +7025,7 @@ static CYTHON_INLINE char *__pyx_f_5nump + */ + (__pyx_v_offset[0]) += __pyx_v_child->elsize; + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":807 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":807 + * offset[0] += child.itemsize + * + * if not PyDataType_HASFIELDS(child): # <<<<<<<<<<<<<< +@@ -6993,7 +7035,7 @@ static CYTHON_INLINE char *__pyx_f_5nump + __pyx_t_6 = (!PyDataType_HASFIELDS(__pyx_v_child)); + if (__pyx_t_6) { + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":808 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":808 + * + * if not PyDataType_HASFIELDS(child): + * t = child.type_num # <<<<<<<<<<<<<< +@@ -7006,7 +7048,7 @@ static CYTHON_INLINE char *__pyx_f_5nump + __pyx_v_t = __pyx_t_3; + __pyx_t_3 = 0; + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":809 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":809 + * if not PyDataType_HASFIELDS(child): + * t = child.type_num + * if end - f < 5: # <<<<<<<<<<<<<< +@@ -7016,7 +7058,7 @@ static CYTHON_INLINE char *__pyx_f_5nump + __pyx_t_6 = ((__pyx_v_end - __pyx_v_f) < 5); + if (__pyx_t_6) { + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":810 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":810 + * t = child.type_num + * if end - f < 5: + * raise RuntimeError(u"Format string allocated too short.") # <<<<<<<<<<<<<< +@@ -7038,7 +7080,7 @@ static CYTHON_INLINE char *__pyx_f_5nump + } + __pyx_L10:; + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":813 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":813 + * + * # Until ticket #99 is fixed, use integers to avoid warnings + * if t == NPY_BYTE: f[0] = 98 #"b" # <<<<<<<<<<<<<< +@@ -7057,7 +7099,7 @@ static CYTHON_INLINE char *__pyx_f_5nump + goto __pyx_L11; + } + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":814 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":814 + * # Until ticket #99 is fixed, use integers to avoid warnings + * if t == NPY_BYTE: f[0] = 98 #"b" + * elif t == NPY_UBYTE: f[0] = 66 #"B" # <<<<<<<<<<<<<< +@@ -7076,7 +7118,7 @@ static CYTHON_INLINE char *__pyx_f_5nump + goto __pyx_L11; + } + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":815 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":815 + * if t == NPY_BYTE: f[0] = 98 #"b" + * elif t == NPY_UBYTE: f[0] = 66 #"B" + * elif t == NPY_SHORT: f[0] = 104 #"h" # <<<<<<<<<<<<<< +@@ -7095,7 +7137,7 @@ static CYTHON_INLINE char *__pyx_f_5nump + goto __pyx_L11; + } + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":816 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":816 + * elif t == NPY_UBYTE: f[0] = 66 #"B" + * elif t == NPY_SHORT: f[0] = 104 #"h" + * elif t == NPY_USHORT: f[0] = 72 #"H" # <<<<<<<<<<<<<< +@@ -7114,7 +7156,7 @@ static CYTHON_INLINE char *__pyx_f_5nump + goto __pyx_L11; + } + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":817 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":817 + * elif t == NPY_SHORT: f[0] = 104 #"h" + * elif t == NPY_USHORT: f[0] = 72 #"H" + * elif t == NPY_INT: f[0] = 105 #"i" # <<<<<<<<<<<<<< +@@ -7133,7 +7175,7 @@ static CYTHON_INLINE char *__pyx_f_5nump + goto __pyx_L11; + } + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":818 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":818 + * elif t == NPY_USHORT: f[0] = 72 #"H" + * elif t == NPY_INT: f[0] = 105 #"i" + * elif t == NPY_UINT: f[0] = 73 #"I" # <<<<<<<<<<<<<< +@@ -7152,7 +7194,7 @@ static CYTHON_INLINE char *__pyx_f_5nump + goto __pyx_L11; + } + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":819 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":819 + * elif t == NPY_INT: f[0] = 105 #"i" + * elif t == NPY_UINT: f[0] = 73 #"I" + * elif t == NPY_LONG: f[0] = 108 #"l" # <<<<<<<<<<<<<< +@@ -7171,7 +7213,7 @@ static CYTHON_INLINE char *__pyx_f_5nump + goto __pyx_L11; + } + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":820 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":820 + * elif t == NPY_UINT: f[0] = 73 #"I" + * elif t == NPY_LONG: f[0] = 108 #"l" + * elif t == NPY_ULONG: f[0] = 76 #"L" # <<<<<<<<<<<<<< +@@ -7190,7 +7232,7 @@ static CYTHON_INLINE char *__pyx_f_5nump + goto __pyx_L11; + } + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":821 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":821 + * elif t == NPY_LONG: f[0] = 108 #"l" + * elif t == NPY_ULONG: f[0] = 76 #"L" + * elif t == NPY_LONGLONG: f[0] = 113 #"q" # <<<<<<<<<<<<<< +@@ -7209,7 +7251,7 @@ static CYTHON_INLINE char *__pyx_f_5nump + goto __pyx_L11; + } + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":822 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":822 + * elif t == NPY_ULONG: f[0] = 76 #"L" + * elif t == NPY_LONGLONG: f[0] = 113 #"q" + * elif t == NPY_ULONGLONG: f[0] = 81 #"Q" # <<<<<<<<<<<<<< +@@ -7228,7 +7270,7 @@ static CYTHON_INLINE char *__pyx_f_5nump + goto __pyx_L11; + } + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":823 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":823 + * elif t == NPY_LONGLONG: f[0] = 113 #"q" + * elif t == NPY_ULONGLONG: f[0] = 81 #"Q" + * elif t == NPY_FLOAT: f[0] = 102 #"f" # <<<<<<<<<<<<<< +@@ -7247,7 +7289,7 @@ static CYTHON_INLINE char *__pyx_f_5nump + goto __pyx_L11; + } + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":824 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":824 + * elif t == NPY_ULONGLONG: f[0] = 81 #"Q" + * elif t == NPY_FLOAT: f[0] = 102 #"f" + * elif t == NPY_DOUBLE: f[0] = 100 #"d" # <<<<<<<<<<<<<< +@@ -7266,7 +7308,7 @@ static CYTHON_INLINE char *__pyx_f_5nump + goto __pyx_L11; + } + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":825 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":825 + * elif t == NPY_FLOAT: f[0] = 102 #"f" + * elif t == NPY_DOUBLE: f[0] = 100 #"d" + * elif t == NPY_LONGDOUBLE: f[0] = 103 #"g" # <<<<<<<<<<<<<< +@@ -7285,7 +7327,7 @@ static CYTHON_INLINE char *__pyx_f_5nump + goto __pyx_L11; + } + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":826 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":826 + * elif t == NPY_DOUBLE: f[0] = 100 #"d" + * elif t == NPY_LONGDOUBLE: f[0] = 103 #"g" + * elif t == NPY_CFLOAT: f[0] = 90; f[1] = 102; f += 1 # Zf # <<<<<<<<<<<<<< +@@ -7306,7 +7348,7 @@ static CYTHON_INLINE char *__pyx_f_5nump + goto __pyx_L11; + } + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":827 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":827 + * elif t == NPY_LONGDOUBLE: f[0] = 103 #"g" + * elif t == NPY_CFLOAT: f[0] = 90; f[1] = 102; f += 1 # Zf + * elif t == NPY_CDOUBLE: f[0] = 90; f[1] = 100; f += 1 # Zd # <<<<<<<<<<<<<< +@@ -7327,7 +7369,7 @@ static CYTHON_INLINE char *__pyx_f_5nump + goto __pyx_L11; + } + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":828 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":828 + * elif t == NPY_CFLOAT: f[0] = 90; f[1] = 102; f += 1 # Zf + * elif t == NPY_CDOUBLE: f[0] = 90; f[1] = 100; f += 1 # Zd + * elif t == NPY_CLONGDOUBLE: f[0] = 90; f[1] = 103; f += 1 # Zg # <<<<<<<<<<<<<< +@@ -7348,7 +7390,7 @@ static CYTHON_INLINE char *__pyx_f_5nump + goto __pyx_L11; + } + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":829 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":829 + * elif t == NPY_CDOUBLE: f[0] = 90; f[1] = 100; f += 1 # Zd + * elif t == NPY_CLONGDOUBLE: f[0] = 90; f[1] = 103; f += 1 # Zg + * elif t == NPY_OBJECT: f[0] = 79 #"O" # <<<<<<<<<<<<<< +@@ -7368,7 +7410,7 @@ static CYTHON_INLINE char *__pyx_f_5nump + } + /*else*/ { + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":831 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":831 + * elif t == NPY_OBJECT: f[0] = 79 #"O" + * else: + * raise ValueError(u"unknown dtype code in numpy.pxd (%d)" % t) # <<<<<<<<<<<<<< +@@ -7391,7 +7433,7 @@ static CYTHON_INLINE char *__pyx_f_5nump + } + __pyx_L11:; + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":832 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":832 + * else: + * raise ValueError(u"unknown dtype code in numpy.pxd (%d)" % t) + * f += 1 # <<<<<<<<<<<<<< +@@ -7403,7 +7445,7 @@ static CYTHON_INLINE char *__pyx_f_5nump + } + /*else*/ { + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":836 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":836 + * # Cython ignores struct boundary information ("T{...}"), + * # so don't output it + * f = _util_dtypestring(child, f, end, offset) # <<<<<<<<<<<<<< +@@ -7417,7 +7459,7 @@ static CYTHON_INLINE char *__pyx_f_5nump + } + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":837 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":837 + * # so don't output it + * f = _util_dtypestring(child, f, end, offset) + * return f # <<<<<<<<<<<<<< +@@ -7447,7 +7489,7 @@ static CYTHON_INLINE char *__pyx_f_5nump + return __pyx_r; + } + +-/* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":952 ++/* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":952 + * + * + * cdef inline void set_array_base(ndarray arr, object base): # <<<<<<<<<<<<<< +@@ -7462,7 +7504,7 @@ static CYTHON_INLINE void __pyx_f_5numpy + __Pyx_INCREF((PyObject *)__pyx_v_arr); + __Pyx_INCREF(__pyx_v_base); + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":954 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":954 + * cdef inline void set_array_base(ndarray arr, object base): + * cdef PyObject* baseptr + * if base is None: # <<<<<<<<<<<<<< +@@ -7472,7 +7514,7 @@ static CYTHON_INLINE void __pyx_f_5numpy + __pyx_t_1 = (__pyx_v_base == Py_None); + if (__pyx_t_1) { + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":955 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":955 + * cdef PyObject* baseptr + * if base is None: + * baseptr = NULL # <<<<<<<<<<<<<< +@@ -7484,7 +7526,7 @@ static CYTHON_INLINE void __pyx_f_5numpy + } + /*else*/ { + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":957 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":957 + * baseptr = NULL + * else: + * Py_INCREF(base) # important to do this before decref below! # <<<<<<<<<<<<<< +@@ -7493,7 +7535,7 @@ static CYTHON_INLINE void __pyx_f_5numpy + */ + Py_INCREF(__pyx_v_base); + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":958 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":958 + * else: + * Py_INCREF(base) # important to do this before decref below! + * baseptr = <PyObject*>base # <<<<<<<<<<<<<< +@@ -7504,7 +7546,7 @@ static CYTHON_INLINE void __pyx_f_5numpy + } + __pyx_L3:; + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":959 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":959 + * Py_INCREF(base) # important to do this before decref below! + * baseptr = <PyObject*>base + * Py_XDECREF(arr.base) # <<<<<<<<<<<<<< +@@ -7513,7 +7555,7 @@ static CYTHON_INLINE void __pyx_f_5numpy + */ + Py_XDECREF(__pyx_v_arr->base); + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":960 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":960 + * baseptr = <PyObject*>base + * Py_XDECREF(arr.base) + * arr.base = baseptr # <<<<<<<<<<<<<< +@@ -7527,7 +7569,7 @@ static CYTHON_INLINE void __pyx_f_5numpy + __Pyx_RefNannyFinishContext(); + } + +-/* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":962 ++/* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":962 + * arr.base = baseptr + * + * cdef inline object get_array_base(ndarray arr): # <<<<<<<<<<<<<< +@@ -7541,7 +7583,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5 + __Pyx_RefNannySetupContext("get_array_base"); + __Pyx_INCREF((PyObject *)__pyx_v_arr); + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":963 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":963 + * + * cdef inline object get_array_base(ndarray arr): + * if arr.base is NULL: # <<<<<<<<<<<<<< +@@ -7551,7 +7593,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5 + __pyx_t_1 = (__pyx_v_arr->base == NULL); + if (__pyx_t_1) { + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":964 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":964 + * cdef inline object get_array_base(ndarray arr): + * if arr.base is NULL: + * return None # <<<<<<<<<<<<<< +@@ -7566,7 +7608,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5 + } + /*else*/ { + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":966 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/numpy.pxd":966 + * return None + * else: + * return <object>arr.base # <<<<<<<<<<<<<< +@@ -7593,6 +7635,7 @@ static struct PyMethodDef __pyx_methods[ + {__Pyx_NAMESTR("csr_predict_from_model_wrap"), (PyCFunction)__pyx_pf_7_libsvm_csr_predict_from_model_wrap, METH_VARARGS|METH_KEYWORDS, __Pyx_DOCSTR(__pyx_doc_7_libsvm_csr_predict_from_model_wrap)}, + {__Pyx_NAMESTR("predict_prob_from_model_wrap"), (PyCFunction)__pyx_pf_7_libsvm_predict_prob_from_model_wrap, METH_VARARGS|METH_KEYWORDS, __Pyx_DOCSTR(__pyx_doc_7_libsvm_predict_prob_from_model_wrap)}, + {__Pyx_NAMESTR("predict_margin_from_model_wrap"), (PyCFunction)__pyx_pf_7_libsvm_predict_margin_from_model_wrap, METH_VARARGS|METH_KEYWORDS, __Pyx_DOCSTR(__pyx_doc_7_libsvm_predict_margin_from_model_wrap)}, ++ {__Pyx_NAMESTR("set_verbosity_wrap"), (PyCFunction)__pyx_pf_7_libsvm_set_verbosity_wrap, METH_O, __Pyx_DOCSTR(__pyx_doc_7_libsvm_set_verbosity_wrap)}, + {0, 0, 0, 0} + }; + +@@ -7625,6 +7668,7 @@ static __Pyx_StringTabEntry __pyx_string + {&__pyx_kp_u_18, __pyx_k_18, sizeof(__pyx_k_18), 0, 1, 0, 0}, + {&__pyx_n_s_19, __pyx_k_19, sizeof(__pyx_k_19), 0, 0, 1, 1}, + {&__pyx_kp_s_2, __pyx_k_2, sizeof(__pyx_k_2), 0, 0, 1, 0}, ++ {&__pyx_kp_u_20, __pyx_k_20, sizeof(__pyx_k_20), 0, 1, 0, 0}, + {&__pyx_kp_u_3, __pyx_k_3, sizeof(__pyx_k_3), 0, 1, 0, 0}, + {&__pyx_kp_u_4, __pyx_k_4, sizeof(__pyx_k_4), 0, 1, 0, 0}, + {&__pyx_kp_u_5, __pyx_k_5, sizeof(__pyx_k_5), 0, 1, 0, 0}, +@@ -7687,6 +7731,7 @@ static __Pyx_StringTabEntry __pyx_string + {&__pyx_n_s__readonly, __pyx_k__readonly, sizeof(__pyx_k__readonly), 0, 0, 1, 1}, + {&__pyx_n_s__refcheck, __pyx_k__refcheck, sizeof(__pyx_k__refcheck), 0, 0, 1, 1}, + {&__pyx_n_s__resize, __pyx_k__resize, sizeof(__pyx_k__resize), 0, 0, 1, 1}, ++ {&__pyx_n_s__set_verbosity_wrap, __pyx_k__set_verbosity_wrap, sizeof(__pyx_k__set_verbosity_wrap), 0, 0, 1, 1}, + {&__pyx_n_s__shape, __pyx_k__shape, sizeof(__pyx_k__shape), 0, 0, 1, 1}, + {&__pyx_n_s__shrinking, __pyx_k__shrinking, sizeof(__pyx_k__shrinking), 0, 0, 1, 1}, + {&__pyx_n_s__strides, __pyx_k__strides, sizeof(__pyx_k__strides), 0, 0, 1, 1}, +@@ -7789,7 +7834,7 @@ PyMODINIT_FUNC PyInit__libsvm(void) + /*--- Function import code ---*/ + /*--- Execution code ---*/ + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":41 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":41 + * """ + * + * import numpy as np # <<<<<<<<<<<<<< +@@ -7801,7 +7846,7 @@ PyMODINIT_FUNC PyInit__libsvm(void) + if (PyObject_SetAttr(__pyx_m, __pyx_n_s__np, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 41; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + +- /* "/Users/fabian/dev/scikit-learn/scikits/learn/src/libsvm/_libsvm.pyx":1 ++ /* "/home/yoh/deb/gits/scikit-learn/scikits/learn/svm/src/libsvm/_libsvm.pyx":1 + * """ # <<<<<<<<<<<<<< + * Binding for libsvm[1] + * --------------------- +@@ -7850,10 +7895,17 @@ PyMODINIT_FUNC PyInit__libsvm(void) + __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + if (PyDict_SetItem(__pyx_t_1, ((PyObject *)__pyx_kp_u_18), __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; ++ __pyx_t_2 = PyObject_GetAttr(__pyx_m, __pyx_n_s__set_verbosity_wrap); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} ++ __Pyx_GOTREF(__pyx_t_2); ++ __pyx_t_3 = __Pyx_GetAttrString(__pyx_t_2, "__doc__"); ++ __Pyx_GOTREF(__pyx_t_3); ++ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; ++ if (PyDict_SetItem(__pyx_t_1, ((PyObject *)__pyx_kp_u_20), __pyx_t_3) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} ++ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + if (PyObject_SetAttr(__pyx_m, __pyx_n_s____test__, ((PyObject *)__pyx_t_1)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0; + +- /* "/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/Cython/Includes/stdlib.pxd":2 ++ /* "/usr/lib/pymodules/python2.6/Cython/Includes/stdlib.pxd":2 + * + * cdef extern from "stdlib.h" nogil: # <<<<<<<<<<<<<< + * void free(void *ptr)