From 757d9882599a4b689f901e1f1a41dc3c6f408887 Mon Sep 17 00:00:00 2001 From: hARRY Date: Thu, 31 Jan 2019 01:55:51 +0530 Subject: [PATCH] float64_t support removed --- seqlearn/_decode/bestfirst.pyx | 12 ++++++------ seqlearn/_decode/viterbi.pyx | 14 +++++++------- seqlearn/_utils/safeadd.pyx | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/seqlearn/_decode/bestfirst.pyx b/seqlearn/_decode/bestfirst.pyx index d731de1..1954919 100644 --- a/seqlearn/_decode/bestfirst.pyx +++ b/seqlearn/_decode/bestfirst.pyx @@ -6,16 +6,16 @@ import numpy as np np.import_array() -cdef np.float64_t NEGINF = -np.inf +cdef np.float64 NEGINF = -np.inf @cython.boundscheck(False) @cython.wraparound(False) -def bestfirst(np.ndarray[ndim=2, dtype=np.float64_t] score, +def bestfirst(np.ndarray[ndim=2, dtype=np.float64] score, trans_score, - np.ndarray[ndim=2, dtype=np.float64_t] trans, - np.ndarray[ndim=1, dtype=np.float64_t, mode="c"] init, - np.ndarray[ndim=1, dtype=np.float64_t, mode="c"] final): + np.ndarray[ndim=2, dtype=np.float64] trans, + np.ndarray[ndim=1, dtype=np.float64, mode="c"] init, + np.ndarray[ndim=1, dtype=np.float64, mode="c"] final): """First-order heuristic best-first decoder. See viterbi for the arguments. score may be overwritten. @@ -24,7 +24,7 @@ def bestfirst(np.ndarray[ndim=2, dtype=np.float64_t] score, cdef: np.ndarray[ndim=1, dtype=np.npy_intp, mode="c"] path - np.float64_t candidate, maxval + np.float64 candidate, maxval np.npy_intp i, j, maxind, n_samples, n_states if trans_score is not None: diff --git a/seqlearn/_decode/viterbi.pyx b/seqlearn/_decode/viterbi.pyx index 9498325..53d49f3 100644 --- a/seqlearn/_decode/viterbi.pyx +++ b/seqlearn/_decode/viterbi.pyx @@ -8,16 +8,16 @@ import numpy as np np.import_array() -cdef np.float64_t NEGINF = -np.inf +cdef np.float64 NEGINF = -np.inf @cython.boundscheck(False) @cython.wraparound(False) -def viterbi(np.ndarray[ndim=2, dtype=np.float64_t] score, - np.ndarray[ndim=3, dtype=np.float64_t] trans_score, - np.ndarray[ndim=2, dtype=np.float64_t] b_trans, - np.ndarray[ndim=1, dtype=np.float64_t] init, - np.ndarray[ndim=1, dtype=np.float64_t] final): +def viterbi(np.ndarray[ndim=2, dtype=np.float64] score, + np.ndarray[ndim=3, dtype=np.float64] trans_score, + np.ndarray[ndim=2, dtype=np.float64] b_trans, + np.ndarray[ndim=1, dtype=np.float64] init, + np.ndarray[ndim=1, dtype=np.float64] final): """First-order Viterbi algorithm. Parameters @@ -41,7 +41,7 @@ def viterbi(np.ndarray[ndim=2, dtype=np.float64_t] score, cdef np.ndarray[ndim=2, dtype=np.npy_intp, mode='c'] backp cdef np.ndarray[ndim=1, dtype=np.npy_intp, mode='c'] path - cdef np.float64_t candidate, maxval + cdef np.float64 candidate, maxval cdef np.npy_intp i, j, k, n_samples, n_states n_samples, n_states = score.shape[0], score.shape[1] diff --git a/seqlearn/_utils/safeadd.pyx b/seqlearn/_utils/safeadd.pyx index 89d7d14..3324d9b 100644 --- a/seqlearn/_utils/safeadd.pyx +++ b/seqlearn/_utils/safeadd.pyx @@ -10,7 +10,7 @@ np.import_array() @cython.boundscheck(False) @cython.wraparound(False) -def safe_add(np.ndarray[ndim=2, dtype=np.float64_t] A, B): +def safe_add(np.ndarray[ndim=2, dtype=np.float] A, B): """A += B where B is a sparse (CSR or CSC) matrix. __rsub__ on a sparse matrix densifies prior to subtracting, making it @@ -20,7 +20,7 @@ def safe_add(np.ndarray[ndim=2, dtype=np.float64_t] A, B): """ cdef: - np.ndarray[ndim=1, dtype=np.float64_t, mode="c"] data + np.ndarray[ndim=1, dtype=np.float, mode="c"] data np.ndarray[ndim=1, dtype=int, mode="c"] indices np.ndarray[ndim=1, dtype=int, mode="c"] indptr