Move numba.extending to numba.core.extending and then re-export

numba/core/ir_utils.py

@@ -13,6 +13,7 @@
 from llvmlite import ir as lir
 
 import numba
+from numba.core.extending import _Intrinsic
 from numba.core import types, utils, typing, ir, analysis, postproc, rewrites, config, cgutils
 from numba.core.typing.templates import (signature, infer_global,
                                          AbstractTemplate)
@@ -663,7 +664,7 @@ def has_no_side_effect(rhs, lives, call_table):
             call_list == [prange] or
             call_list == [parfor.internal_prange]):
             return True
-        elif (isinstance(call_list[0], numba.extending._Intrinsic) and
+        elif (isinstance(call_list[0], _Intrinsic) and
               (call_list[0]._name == 'empty_inferred' or
                call_list[0]._name == 'unsafe_empty_inferred')):
             return True
@@ -1505,7 +1506,7 @@ def find_callname(func_ir, expr, typemap=None, definition_finder=get_definition)
             # get the underlying definition of Intrinsic object to be able to
             # find the module effectively.
             # Otherwise, it will return numba.extending
-            if isinstance(def_val, numba.extending._Intrinsic):
+            if isinstance(def_val, _Intrinsic):
                 def_val = def_val._defn
             if hasattr(def_val, '__module__'):
                 mod_name = def_val.__module__

numba/core/typing/builtins.py

@@ -15,7 +15,7 @@
 
 from numba.cpython.builtins import get_type_min_value, get_type_max_value
 
-from numba.extending import (
+from numba.core.extending import (
     typeof_impl, type_callable, models, register_model, make_attribute_wrapper,
     )
 

numba/core/unsafe/bytes.py

@@ -3,7 +3,7 @@
 operations with bytes and workarounds for limitations enforced in userland.
 """
 
-from numba.extending import intrinsic
+from numba.core.extending import intrinsic
 from llvmlite import ir
 from numba.core import types, cgutils
 

numba/core/unsafe/eh.py

@@ -3,7 +3,7 @@
 """
 
 from numba.core import types, errors, cgutils
-from numba.extending import intrinsic
+from numba.core.extending import intrinsic
 
 
 @intrinsic

numba/core/unsafe/nrt.py

@@ -4,7 +4,7 @@
 
 from numba.core import types
 from numba.core.typing import signature
-from numba.extending import intrinsic
+from numba.core.extending import intrinsic
 
 
 @intrinsic

numba/core/unsafe/refcount.py

@@ -4,7 +4,7 @@
 from llvmlite import ir
 
 from numba.core import types, cgutils
-from numba.extending import intrinsic
+from numba.core.extending import intrinsic
 
 from numba.runtime.nrtdynmod import _meminfo_struct_type
 

numba/cpython/builtins.py

@@ -10,7 +10,7 @@
 
 from numba.core.imputils import lower_builtin, lower_getattr, lower_getattr_generic, lower_cast, lower_constant, iternext_impl, call_getiter, call_iternext, impl_ret_borrowed, impl_ret_untracked, numba_typeref_ctor
 from numba.core import typing, types, utils, cgutils
-from numba.extending import overload, intrinsic
+from numba.core.extending import overload, intrinsic
 from numba.core.typeconv import Conversion
 from numba.core.errors import TypingError
 

numba/cpython/charseq.py

@@ -4,7 +4,7 @@
 from llvmlite import ir
 
 from numba.core import types, cgutils
-from numba.extending import (overload, intrinsic, overload_method, lower_cast,
+from numba.core.extending import (overload, intrinsic, overload_method, lower_cast,
                              register_jitable)
 from numba.core.cgutils import is_nonelike
 from numba.cpython import unicode

numba/cpython/hashing.py

@@ -12,7 +12,7 @@
 import llvmlite.llvmpy.core as lc
 from llvmlite import ir
 
-from numba.extending import (
+from numba.core.extending import (
     overload, overload_method, intrinsic, register_jitable)
 from numba.core import errors
 from numba.core import types, utils

numba/cpython/heapq.py

@@ -5,7 +5,7 @@
 
 from numba.core import types
 from numba.core.errors import TypingError
-from numba.extending import overload, register_jitable
+from numba.core.extending import overload, register_jitable
 
 
 @register_jitable

numba/cpython/listobj.py

@@ -12,7 +12,7 @@
                                     iternext_impl, impl_ret_borrowed,
                                     impl_ret_new_ref, impl_ret_untracked,
                                     RefType)
-from numba.extending import overload_method, overload
+from numba.core.extending import overload_method, overload
 from numba.core.utils import cached_property
 from numba.misc import quicksort
 from numba.cpython import slicing

numba/cpython/mathimpl.py

@@ -13,7 +13,7 @@
 from numba.core.imputils import Registry, impl_ret_untracked
 from numba import typeof
 from numba.core import types, utils, config, cgutils
-from numba.extending import overload
+from numba.core.extending import overload
 from numba.core.typing import signature
 from numba.cpython.unsafe.numbers import trailing_zeros
 

numba/cpython/numbers.py

@@ -13,7 +13,7 @@
                                     lower_constant, impl_ret_borrowed,
                                     impl_ret_untracked)
 from numba.core import typing, types, utils, errors, cgutils, optional
-from numba.extending import intrinsic, overload_method
+from numba.core.extending import intrinsic, overload_method
 from numba.cpython.unsafe.numbers import viewer
 
 def _int_arith_flags(rettype):

numba/cpython/randomimpl.py

@@ -11,7 +11,7 @@
 
 from llvmlite import ir
 
-from numba.extending import overload, register_jitable
+from numba.core.extending import overload, register_jitable
 from numba.core.imputils import (Registry, impl_ret_untracked,
                                     impl_ret_new_ref)
 from numba.core.typing import signature

numba/cpython/rangeobj.py

@@ -13,7 +13,7 @@
 from numba.core.imputils import (lower_builtin, lower_cast,
                                     iterator_impl, impl_ret_untracked)
 from numba.core.typing import signature
-from numba.extending import intrinsic, overload, overload_attribute, register_jitable
+from numba.core.extending import intrinsic, overload, overload_attribute, register_jitable
 from numba.parfors.parfor import internal_prange
 
 def make_range_iterator(typ):

numba/cpython/tupleobj.py

@@ -11,7 +11,7 @@
                                     impl_ret_borrowed, impl_ret_untracked,
                                     RefType)
 from numba.core import typing, types, cgutils
-from numba.extending import overload_method, overload, intrinsic
+from numba.core.extending import overload_method, overload, intrinsic
 
 
 @lower_builtin(types.NamedTupleClass, types.VarArg(types.Any))

numba/cpython/unicode.py

@@ -4,7 +4,7 @@
 import numpy as np
 from llvmlite.ir import IntType, Constant
 
-from numba.extending import (
+from numba.core.extending import (
     models,
     register_model,
     make_attribute_wrapper,

numba/cpython/unicode_support.py

@@ -12,7 +12,7 @@
 from numba.core import types, cgutils
 from numba.core.imputils import (impl_ret_untracked)
 
-from numba.extending import overload, intrinsic, register_jitable
+from numba.core.extending import overload, intrinsic, register_jitable
 from numba.core.errors import TypingError
 
 # This is equivalent to the struct `_PyUnicode_TypeRecord defined in CPython's

numba/cpython/unsafe/numbers.py

@@ -1,7 +1,7 @@
 """ This module provides the unsafe things for targets/numbers.py
 """
 from numba.core import types
-from numba.extending import intrinsic
+from numba.core.extending import intrinsic
 
 from llvmlite import ir
 

numba/cpython/unsafe/tuple.py

@@ -4,7 +4,7 @@
 """
 
 from numba.core.cgutils import alloca_once
-from numba.extending import intrinsic
+from numba.core.extending import intrinsic
 
 
 @intrinsic

numba/misc/gdb_hook.py

@@ -5,7 +5,7 @@
 
 from numba.core import types, utils, config, cgutils
 from numba import gdb, gdb_init, gdb_breakpoint
-from numba.extending import overload, intrinsic
+from numba.core.extending import overload, intrinsic
 
 _path = os.path.dirname(__file__)
 

numba/misc/literal.py

@@ -1,4 +1,4 @@
-from numba.extending import overload
+from numba.core.extending import overload
 from numba.core import types
 from numba.misc.special import literally, literal_unroll
 from numba.core.errors import TypingError

numba/misc/quicksort.py

@@ -239,6 +239,6 @@ def make_py_quicksort(*args, **kwargs):
     return make_quicksort_impl((lambda f: f), *args, **kwargs)
 
 def make_jit_quicksort(*args, **kwargs):
-    from numba.extending import register_jitable
+    from numba.core.extending import register_jitable
     return make_quicksort_impl((lambda f: register_jitable(f)),
                                *args, **kwargs)

numba/np/arraymath.py

@@ -14,7 +14,7 @@
 
 from numba import generated_jit
 from numba.core import types, cgutils
-from numba.extending import overload, overload_method, register_jitable
+from numba.core.extending import overload, overload_method, register_jitable
 from numba.np.numpy_support import as_dtype, type_can_asarray
 from numba.np.numpy_support import numpy_version
 from numba.np.numpy_support import is_nonelike
@@ -24,7 +24,7 @@
 from numba.np.arrayobj import make_array, load_item, store_item, _empty_nd_impl
 from numba.np.linalg import ensure_blas
 
-from numba.extending import intrinsic
+from numba.core.extending import intrinsic
 from numba.core.errors import RequireLiteralValue, TypingError
 
 

numba/np/arrayobj.py

@@ -14,8 +14,8 @@
 
 import numpy as np
 
-from numba import extending, pndindex
-from numba.core import types, utils, typing, errors, cgutils
+from numba import pndindex
+from numba.core import types, utils, typing, errors, cgutils, extending
 from numba.np.numpy_support import (as_dtype, carray, farray, is_contiguous,
                                  is_fortran)
 from numba.np.numpy_support import type_can_asarray, is_nonelike
@@ -27,7 +27,7 @@
                                     impl_ret_new_ref, impl_ret_untracked,
                                     RefType)
 from numba.core.typing import signature
-from numba.extending import register_jitable, overload, overload_method
+from numba.core.extending import register_jitable, overload, overload_method
 from numba.misc import quicksort, mergesort
 from numba.cpython import slicing
 

numba/np/linalg.py

@@ -13,7 +13,7 @@
 from numba.core.imputils import (lower_builtin, impl_ret_borrowed,
                                     impl_ret_new_ref, impl_ret_untracked)
 from numba.core.typing import signature
-from numba.extending import overload, register_jitable
+from numba.core.extending import overload, register_jitable
 from numba.core import types, cgutils
 from numba.core.errors import TypingError
 from .arrayobj import make_array, _empty_nd_impl, array_copy

numba/np/npyimpl.py

@@ -18,7 +18,7 @@
 from numba.core import typing, types, utils, cgutils, callconv
 from numba.np.numpy_support import ufunc_find_matching_loop, select_array_wrapper, from_dtype
 from numba.core.typing import npydecl
-from numba.extending import overload, intrinsic
+from numba.core.extending import overload, intrinsic
 
 from numba.core import errors
 from numba.cpython import builtins

numba/np/polynomial.py

@@ -7,7 +7,7 @@
 
 from numba import jit
 from numba.core import types
-from numba.extending import overload
+from numba.core.extending import overload
 from numba.np import numpy_support as np_support
 
 

numba/np/unsafe/ndarray.py

@@ -4,7 +4,7 @@
 """
 from numba.core import types, typing
 from numba.core.cgutils import unpack_tuple
-from numba.extending import intrinsic
+from numba.core.extending import intrinsic
 from numba.core.imputils import impl_ret_new_ref
 from numba.core.errors import RequireLiteralValue, TypingError
 

numba/parfors/array_analysis.py

@@ -25,7 +25,7 @@
 from numba.core.typing import npydecl, signature
 import collections
 import copy
-from numba.extending import intrinsic
+from numba.core.extending import intrinsic
 import llvmlite.llvmpy.core as lc
 import llvmlite
 

numba/parfors/parfor.py

@@ -30,7 +30,7 @@
 from numba.np.numpy_support import as_dtype
 from numba.core.typing.templates import infer_global, AbstractTemplate
 from numba.stencils.stencilparfor import StencilPass
-from numba.extending import register_jitable
+from numba.core.extending import register_jitable
 
 
 from numba.core.ir_utils import (
@@ -86,7 +86,7 @@
 from numba.parfors.array_analysis import (random_int_args, random_1arg_size,
                                   random_2arg_sizelast, random_3arg_sizelast,
                                   random_calls, assert_equiv)
-from numba.extending import overload
+from numba.core.extending import overload
 import copy
 import numpy
 import numpy as np

numba/stencils/stencil.py

@@ -12,7 +12,7 @@
 from numba.core.typing.templates import (CallableTemplate, signature,
                                          infer_global, AbstractTemplate)
 from numba.core.imputils import lower_builtin
-from numba.extending import register_jitable
+from numba.core.extending import register_jitable
 import numba
 
 import operator

numba/tests/inlining_usecases.py

@@ -1,6 +1,6 @@
 """ Test cases for inlining IR from another module """
 from numba import njit
-from numba.extending import overload
+from numba.core.extending import overload
 
 _GLOBAL1 = 100
 

numba/tests/pdlike_usecase.py

@@ -6,7 +6,7 @@
 
 from numba.core import types, cgutils
 from numba.core.datamodel import models
-from numba.extending import (
+from numba.core.extending import (
     typeof_impl, type_callable, register_model,
     lower_builtin, box, unbox, NativeValue,
     overload, overload_attribute, overload_method, make_attribute_wrapper)

numba/tests/test_extending.py

@@ -38,8 +38,6 @@
 from .pdlike_usecase import Index, Series
 
 
-
-
 try:
     import scipy
     if LooseVersion(scipy.__version__) < '0.19':
@@ -59,7 +57,7 @@ class MyDummy(object):
 class MyDummyType(types.Opaque):
     def can_convert_to(self, context, toty):
         if isinstance(toty, types.Number):
-            from numba.typeconv import Conversion
+            from numba.core.typeconv import Conversion
             return Conversion.safe
 
 mydummy_type = MyDummyType('mydummy')

numba/tests/test_extending_types.py

@@ -5,12 +5,12 @@
 from numba import njit
 from numba.core import types, cgutils
 from numba.core.errors import TypingError
-from numba.extending import lower_builtin
-from numba.extending import models, register_model
-from numba.extending import make_attribute_wrapper
-from numba.extending import type_callable
-from numba.extending import overload
-from numba.extending import typeof_impl
+from numba.core.extending import lower_builtin
+from numba.core.extending import models, register_model
+from numba.core.extending import make_attribute_wrapper
+from numba.core.extending import type_callable
+from numba.core.extending import overload
+from numba.core.extending import typeof_impl
 
 from numba.testing import unittest_support as unittest
 

numba/tests/test_ir_inlining.py

@@ -8,7 +8,7 @@
 
 from numba import njit, typeof
 from numba.core import types, ir, ir_utils
-from numba.extending import (
+from numba.core.extending import (
     overload,
     overload_method,
     overload_attribute,