Refactor config import and fix pylint issues in

numba_dpex/core/utils/kernel_launcher.py

Refactor config import of numba_dpex/core/descriptor.py

Refactor config import in numba_dpex/decorators.py

Refactor config import in numba_dpex/tests/misc/test_warnings.py

Refactor config import in tests._helper.py

Author: chudur-budur

numba_dpex/core/descriptor.py

@@ -8,7 +8,7 @@
 from numba.core.cpu import CPUTargetOptions
 from numba.core.descriptors import TargetDescriptor
 
-from numba_dpex import config
+from numba_dpex.core import config
 
 from .targets.dpjit_target import DPEX_TARGET_NAME, DpexTargetContext
 from .targets.kernel_target import (

numba_dpex/core/utils/kernel_launcher.py

@@ -16,7 +16,8 @@
 from numba.core.datamodel import DataModelManager
 from numba.core.types.containers import UniTuple
 
-from numba_dpex import config, utils
+from numba_dpex import utils
+from numba_dpex.core import config
 from numba_dpex.core.exceptions import UnreachableError
 from numba_dpex.core.runtime.context import DpexRTContext
 from numba_dpex.core.types import USMNdArray
@@ -165,7 +166,7 @@ def _build_array_attr_arg(  # pylint: disable=too-many-arguments
 
         self._build_arg(
             val=array_attr,
-            ty=array_attr_ty,
+            typ=array_attr_ty,
             arg_list=arg_list,
             args_ty_list=args_ty_list,
             arg_num=arg_num,
@@ -193,14 +194,14 @@ def _build_unituple_member_arg(  # pylint: disable=too-many-arguments
             )
 
     def _build_arg(
-        self, val, ty, arg_list, args_ty_list, arg_num
+        self, val, typ, arg_list, args_ty_list, arg_num
     ):  # pylint: disable=too-many-arguments
         """Stores the kernel arguments and the kernel argument types into
         arrays that will be passed to DPCTLQueue_SubmitRange.
 
         Args:
             val: An LLVM IR Value that will be stored into the arguments array
-            ty: A Numba type that will be converted to a DPCTLKernelArgType
+            typ: A Numba type that will be converted to a DPCTLKernelArgType
             enum and stored into the argument types list array
             arg_list: An LLVM IR Value array that stores the kernel arguments
             args_ty_list: An LLVM IR Value array that stores the
@@ -222,19 +223,19 @@ def _build_arg(
         )
         self.builder.store(val, kernel_arg_dst)
         self.builder.store(
-            numba_type_to_dpctl_typenum(self.context, ty), kernel_arg_ty_dst
+            numba_type_to_dpctl_typenum(self.context, typ), kernel_arg_ty_dst
         )
 
     def _build_complex_arg(
-        self, val, ty, arg_list, args_ty_list, arg_num
+        self, val, typ, arg_list, args_ty_list, arg_num
     ):  # pylint: disable=too-many-arguments
         """Creates a list of LLVM Values for an unpacked complex kernel
         argument.
         """
         self._build_array_attr_arg(
             array_val=val,
             array_attr_pos=0,
-            array_attr_ty=ty,
+            array_attr_ty=typ,
             arg_list=arg_list,
             args_ty_list=args_ty_list,
             arg_num=arg_num,
@@ -243,7 +244,7 @@ def _build_complex_arg(
         self._build_array_attr_arg(
             array_val=val,
             array_attr_pos=1,
-            array_attr_ty=ty,
+            array_attr_ty=typ,
             arg_list=arg_list,
             args_ty_list=args_ty_list,
             arg_num=arg_num,
@@ -268,7 +269,7 @@ def _build_array_arg(  # pylint: disable=too-many-arguments
         nullptr = self._build_nullptr()
         self._build_arg(
             val=nullptr,
-            ty=types.int64,
+            typ=types.int64,
             arg_list=arg_list,
             args_ty_list=args_ty_list,
             arg_num=arg_num,
@@ -278,7 +279,7 @@ def _build_array_arg(  # pylint: disable=too-many-arguments
         nullptr = self._build_nullptr()
         self._build_arg(
             val=nullptr,
-            ty=types.int64,
+            typ=types.int64,
             arg_list=arg_list,
             args_ty_list=args_ty_list,
             arg_num=arg_num,
@@ -318,7 +319,7 @@ def _build_array_arg(  # pylint: disable=too-many-arguments
         # kernel we always pass in a nullptr
         self._build_arg(
             val=nullptr,
-            ty=types.int64,
+            typ=types.int64,
             arg_list=arg_list,
             args_ty_list=args_ty_list,
             arg_num=arg_num,

numba_dpex/decorators.py

@@ -8,6 +8,7 @@
 from numba.core import decorators, sigutils
 from numba.core.target_extension import jit_registry, target_registry
 
+from numba_dpex.core import config
 from numba_dpex.core.kernel_interface.dispatcher import JitKernel
 from numba_dpex.core.kernel_interface.func import (
     compile_func,
@@ -16,8 +17,6 @@
 from numba_dpex.core.pipelines.dpjit_compiler import get_compiler
 from numba_dpex.core.targets.dpjit_target import DPEX_TARGET_NAME
 
-from .config import USE_MLIR
-
 
 def kernel(
     func_or_sig=None,
@@ -156,7 +155,7 @@ def dpjit(*args, **kws):
         )
         del kws["pipeline_class"]
 
-    use_mlir = kws.pop("use_mlir", bool(USE_MLIR))
+    use_mlir = kws.pop("use_mlir", bool(config.USE_MLIR))
 
     kws.update({"nopython": True})
     kws.update({"parallel": True})

numba_dpex/tests/_helper.py

@@ -12,8 +12,8 @@
 import dpnp
 import pytest
 
-from numba_dpex.core import config
 from numba_dpex import dpjit, numba_sem_version
+from numba_dpex.core import config
 
 
 @cache

numba_dpex/tests/misc/test_warnings.py

@@ -8,7 +8,7 @@
 import pytest
 
 import numba_dpex as dpex
-import numba_dpex.config as config
+from numba_dpex.core import config
 
 
 @dpex.kernel(enable_cache=False)