|
23 | 23 | # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
24 | 24 | # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
25 | 25 |
|
| 26 | +# distutils: language = c |
| 27 | +# cython: language_level=3 |
26 | 28 |
|
27 |
| -import six |
| 29 | +import numbers |
28 | 30 | import warnings
|
29 |
| -cimport _mkl_service as mkl |
| 31 | +cimport mkl._mkl_service as mkl |
30 | 32 |
|
31 | 33 |
|
32 | 34 | ctypedef struct MemStatData:
|
@@ -80,9 +82,9 @@ cdef int __domain_to_mkl_domain(domain):
|
80 | 82 | 'pardiso': mkl.MKL_DOMAIN_PARDISO,
|
81 | 83 | 'all': mkl.MKL_DOMAIN_ALL }
|
82 | 84 |
|
83 |
| - if isinstance(domain, six.integer_types): |
84 |
| - c_mkl_domain = domain |
85 |
| - elif isinstance(domain, six.string_types): |
| 85 | + if isinstance(domain, numbers.Integral): |
| 86 | + c_mkl_domain = <int>domain |
| 87 | + elif isinstance(domain, str): |
86 | 88 | if domain not in _mapping:
|
87 | 89 | c_mkl_domain = __warn_and_fallback_on_default_domain(domain)
|
88 | 90 | else:
|
@@ -113,7 +115,7 @@ cpdef set_num_threads_local(num_threads):
|
113 | 115 | https://software.intel.com/en-us/mkl-developer-reference-c-mkl-set-num-threads-local
|
114 | 116 | """
|
115 | 117 | cdef c_num_threads = 0
|
116 |
| - if isinstance(num_threads, six.string_types): |
| 118 | + if isinstance(num_threads, str): |
117 | 119 | if num_threads is not 'global_num_threads':
|
118 | 120 | raise ValueError("The argument of set_num_threads_local is expected "
|
119 | 121 | "to be a non-negative integer or a string 'global_num_threads'")
|
@@ -382,9 +384,9 @@ cdef __mkl_status_to_string(int mkl_status):
|
382 | 384 |
|
383 | 385 |
|
384 | 386 | cdef int __python_obj_to_int(obj, func_name):
|
385 |
| - if not isinstance(obj, six.integer_types): |
| 387 | + if not isinstance(obj, numbers.Integral): |
386 | 388 | raise ValueError("The argument of " + func_name + " is expected to be a positive integer")
|
387 |
| - cdef c_int = obj |
| 389 | + cdef int c_int = <int>obj |
388 | 390 | return c_int
|
389 | 391 |
|
390 | 392 |
|
@@ -772,7 +774,7 @@ cdef object __enable_instructions(isa=None):
|
772 | 774 | cdef int c_mkl_isa = __mkl_str_to_int(isa, __variables['input'])
|
773 | 775 |
|
774 | 776 | cdef int c_mkl_status = mkl.mkl_enable_instructions(c_mkl_isa)
|
775 |
| - |
| 777 | + |
776 | 778 | return __mkl_status_to_string(c_mkl_status)
|
777 | 779 |
|
778 | 780 |
|
|
0 commit comments