From b18ab8f700d23931aca2db4ab878beb6b2ea7ba3 Mon Sep 17 00:00:00 2001 From: Daisuke Oyama Date: Sat, 19 Mar 2016 20:36:55 +0900 Subject: [PATCH] DiscreteDP: Remove util.numba_installed --- quantecon/markov/ddp.py | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/quantecon/markov/ddp.py b/quantecon/markov/ddp.py index 4f4efb6c1..c54f7a63c 100644 --- a/quantecon/markov/ddp.py +++ b/quantecon/markov/ddp.py @@ -112,9 +112,9 @@ import warnings import numpy as np import scipy.sparse as sp +from numba import jit from .core import MarkovChain -from ..util import numba_installed, jit class DiscreteDP(object): @@ -897,6 +897,7 @@ def __dir__(self): return self.keys() +@jit(nopython=True) def _s_wise_max_argmax(a_indices, a_indptr, vals, out_max, out_argmax): n = len(out_max) for i in range(n): @@ -908,10 +909,8 @@ def _s_wise_max_argmax(a_indices, a_indptr, vals, out_max, out_argmax): out_max[i] = vals[m] out_argmax[i] = a_indices[m] -if numba_installed: - _s_wise_max_argmax = jit(nopython=True)(_s_wise_max_argmax) - +@jit(nopython=True) def _s_wise_max(a_indices, a_indptr, vals, out_max): n = len(out_max) for i in range(n): @@ -922,10 +921,8 @@ def _s_wise_max(a_indices, a_indptr, vals, out_max): m = j out_max[i] = vals[m] -if numba_installed: - _s_wise_max = jit(nopython=True)(_s_wise_max) - +@jit(nopython=True) def _find_indices(a_indices, a_indptr, sigma, out): n = len(sigma) for i in range(n): @@ -933,9 +930,6 @@ def _find_indices(a_indices, a_indptr, sigma, out): if sigma[i] == a_indices[j]: out[i] = j -if numba_installed: - _find_indices = jit(nopython=True)(_find_indices) - @jit(nopython=True) def _has_sorted_sa_indices(s_indices, a_indices):