Merge pull request #216 from JesseLivezey/cython3-fix

fixed cython compile error and np.int
BouchardLab · Oct 18, 2023 · 64a3eab · 64a3eab
2 parents 37535ba + 76789b4
commit 64a3eab
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/pyuoi/lbfgs/_lowlevel.pyx b/src/pyuoi/lbfgs/_lowlevel.pyx
@@ -108,7 +108,7 @@ cdef class CallbackData(object):
 # Callback into Python evaluation callable.
 cdef lbfgsfloatval_t call_eval(void *cb_data_v,
                                lbfgsconst_p x, lbfgsfloatval_t *g,
-                               int n, lbfgsfloatval_t step):
+                               int n, lbfgsfloatval_t step) noexcept:
     cdef object cb_data
     cdef np.npy_intp tshape[1]
 
@@ -126,7 +126,7 @@ cdef int call_progress(void *cb_data_v,
                        lbfgsconst_p x, lbfgsconst_p g,
                        lbfgsfloatval_t fx,
                        lbfgsfloatval_t xnorm, lbfgsfloatval_t gnorm,
-                       lbfgsfloatval_t step, int n, int k, int ls):
+                       lbfgsfloatval_t step, int n, int k, int ls) noexcept:
     cdef object cb_data
     cdef np.npy_intp tshape[1]
 

diff --git a/src/pyuoi/mpi_utils.py b/src/pyuoi/mpi_utils.py
@@ -8,7 +8,7 @@
     from mpi4py import MPI
     _np2mpi = {np.dtype(np.float32): MPI.FLOAT,
                np.dtype(np.float64): MPI.DOUBLE,
-               np.dtype(np.int): MPI.LONG,
+               np.dtype(int): MPI.LONG,
                np.dtype(np.intc): MPI.INT}
 except ImportError:
     pass