Skip to content

Commit bbb3361

Browse files
Replaced use of six.integer_types with numbers.Integral
Added Cython directives for language_level=2
1 parent ec29aeb commit bbb3361

File tree

1 file changed

+11
-9
lines changed

1 file changed

+11
-9
lines changed

mkl/_mkl_service.pyx

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,12 @@
2323
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
2424
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2525

26+
# distutils: language = c
27+
# cython: language_level=3
2628

27-
import six
29+
import numbers
2830
import warnings
29-
cimport _mkl_service as mkl
31+
cimport mkl._mkl_service as mkl
3032

3133

3234
ctypedef struct MemStatData:
@@ -80,9 +82,9 @@ cdef int __domain_to_mkl_domain(domain):
8082
'pardiso': mkl.MKL_DOMAIN_PARDISO,
8183
'all': mkl.MKL_DOMAIN_ALL }
8284

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):
8688
if domain not in _mapping:
8789
c_mkl_domain = __warn_and_fallback_on_default_domain(domain)
8890
else:
@@ -113,7 +115,7 @@ cpdef set_num_threads_local(num_threads):
113115
https://software.intel.com/en-us/mkl-developer-reference-c-mkl-set-num-threads-local
114116
"""
115117
cdef c_num_threads = 0
116-
if isinstance(num_threads, six.string_types):
118+
if isinstance(num_threads, str):
117119
if num_threads is not 'global_num_threads':
118120
raise ValueError("The argument of set_num_threads_local is expected "
119121
"to be a non-negative integer or a string 'global_num_threads'")
@@ -382,9 +384,9 @@ cdef __mkl_status_to_string(int mkl_status):
382384

383385

384386
cdef int __python_obj_to_int(obj, func_name):
385-
if not isinstance(obj, six.integer_types):
387+
if not isinstance(obj, numbers.Integral):
386388
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
388390
return c_int
389391

390392

@@ -772,7 +774,7 @@ cdef object __enable_instructions(isa=None):
772774
cdef int c_mkl_isa = __mkl_str_to_int(isa, __variables['input'])
773775

774776
cdef int c_mkl_status = mkl.mkl_enable_instructions(c_mkl_isa)
775-
777+
776778
return __mkl_status_to_string(c_mkl_status)
777779

778780

0 commit comments

Comments
 (0)