Rename _kernel_api_impl and pylint changes.

Diptorup Deb · Diptorup Deb · commit 73c8fb3ec9dd · 2024-02-12T14:09:43.000-06:00
diff --git a/numba_dpex/__init__.py b/numba_dpex/__init__.py
@@ -18,7 +18,7 @@
 
 from numba_dpex.core.kernel_interface.launcher import call_kernel
 
-from ._kernel_api_impl.spirv import target as spirv_kernel_target
+from .kernel_api_impl.spirv import target as spirv_kernel_target
 from .numba_patches import patch_arrayexpr_tree_to_ir, patch_is_ufunc
 
 
diff --git a/numba_dpex/core/descriptor.py b/numba_dpex/core/descriptor.py
@@ -8,13 +8,13 @@
 from numba.core.cpu import CPUTargetOptions
 from numba.core.descriptors import TargetDescriptor
 
-from numba_dpex._kernel_api_impl.spirv.target import (
+from numba_dpex.core import config
+from numba_dpex.kernel_api_impl.spirv.target import (
     SPIRV_TARGET_NAME,
     CompilationMode,
     SPIRVTargetContext,
     SPIRVTypingContext,
 )
-from numba_dpex.core import config
 
 from .targets.dpjit_target import (
     DPEX_TARGET_NAME,
diff --git a/numba_dpex/core/kernel_interface/spirv_kernel.py b/numba_dpex/core/kernel_interface/spirv_kernel.py
@@ -7,11 +7,11 @@
 
 from numba.core import ir
 
-from numba_dpex._kernel_api_impl.spirv import spirv_generator
-from numba_dpex._kernel_api_impl.spirv.target import SPIRVTargetContext
 from numba_dpex.core import config
 from numba_dpex.core.compiler import compile_with_dpex
 from numba_dpex.core.exceptions import UncompiledKernelError, UnreachableError
+from numba_dpex.kernel_api_impl.spirv import spirv_generator
+from numba_dpex.kernel_api_impl.spirv.target import SPIRVTargetContext
 
 from .kernel_base import KernelInterface
 
diff --git a/numba_dpex/dpnp_iface/arrayobj.py b/numba_dpex/dpnp_iface/arrayobj.py
@@ -16,11 +16,11 @@
 from numba.np.arrayobj import make_array
 from numba.np.numpy_support import is_nonelike
 
-from numba_dpex._kernel_api_impl.spirv.target import SPIRVTargetContext
 from numba_dpex.core.kernel_interface.arrayobj import (
     _getitem_array_generic as kernel_getitem_array_generic,
 )
 from numba_dpex.core.types import DpnpNdArray
+from numba_dpex.kernel_api_impl.spirv.target import SPIRVTargetContext
 
 from ._intrinsic import (
     impl_dpnp_empty,
diff --git a/numba_dpex/experimental/__init__.py b/numba_dpex/experimental/__init__.py
@@ -8,10 +8,9 @@
 
 from numba.core.imputils import Registry
 
-from numba_dpex._kernel_api_impl.spirv.dispatcher import SPIRVKernelDispatcher
-
 # Temporary so that Range and NdRange work in experimental call_kernel
 from numba_dpex.core.boxing import *
+from numba_dpex.kernel_api_impl.spirv.dispatcher import SPIRVKernelDispatcher
 
 from ._kernel_dpcpp_spirv_overloads import (
     _atomic_ref_overloads,
diff --git a/numba_dpex/experimental/_kernel_dpcpp_spirv_overloads/_atomic_ref_overloads.py b/numba_dpex/experimental/_kernel_dpcpp_spirv_overloads/_atomic_ref_overloads.py
@@ -11,10 +11,6 @@
 from numba.core import cgutils, types
 from numba.extending import intrinsic, overload, overload_method
 
-from numba_dpex._kernel_api_impl.spirv.target import (
-    CC_SPIR_FUNC,
-    LLVM_SPIRV_ARGS,
-)
 from numba_dpex.core import itanium_mangler as ext_itanium_mangler
 from numba_dpex.core.types import USMNdArray
 from numba_dpex.kernel_api import (
@@ -24,6 +20,10 @@
     MemoryScope,
 )
 from numba_dpex.kernel_api.flag_enum import FlagEnum
+from numba_dpex.kernel_api_impl.spirv.target import (
+    CC_SPIR_FUNC,
+    LLVM_SPIRV_ARGS,
+)
 
 from ..dpcpp_types import AtomicRefType
 from ..target import DPEX_KERNEL_EXP_TARGET_NAME
diff --git a/numba_dpex/experimental/_kernel_dpcpp_spirv_overloads/_index_space_id_overloads.py b/numba_dpex/experimental/_kernel_dpcpp_spirv_overloads/_index_space_id_overloads.py
@@ -11,12 +11,12 @@
 from numba.core.errors import TypingError
 from numba.extending import intrinsic, overload_method
 
-from numba_dpex._kernel_api_impl.spirv.target import SPIRVTargetContext
 from numba_dpex.experimental.core.types.kernel_api.items import (
     GroupType,
     ItemType,
     NdItemType,
 )
+from numba_dpex.kernel_api_impl.spirv.target import SPIRVTargetContext
 
 from ..target import DPEX_KERNEL_EXP_TARGET_NAME
 
diff --git a/numba_dpex/experimental/_kernel_dpcpp_spirv_overloads/spv_fn_generator.py b/numba_dpex/experimental/_kernel_dpcpp_spirv_overloads/spv_fn_generator.py
@@ -10,8 +10,8 @@
 from llvmlite import ir as llvmir
 from numba.core import cgutils, types
 
-from numba_dpex._kernel_api_impl.spirv.target import CC_SPIR_FUNC
 from numba_dpex.core import itanium_mangler as ext_itanium_mangler
+from numba_dpex.kernel_api_impl.spirv.target import CC_SPIR_FUNC
 
 
 def get_or_insert_atomic_load_fn(context, module, atomic_ref_ty):
diff --git a/numba_dpex/experimental/decorators.py b/numba_dpex/experimental/decorators.py
@@ -15,8 +15,8 @@
     target_registry,
 )
 
-from numba_dpex._kernel_api_impl.spirv.dispatcher import SPIRVKernelDispatcher
-from numba_dpex._kernel_api_impl.spirv.target import CompilationMode
+from numba_dpex.kernel_api_impl.spirv.dispatcher import SPIRVKernelDispatcher
+from numba_dpex.kernel_api_impl.spirv.target import CompilationMode
 
 from .target import DPEX_KERNEL_EXP_TARGET_NAME
 
diff --git a/numba_dpex/experimental/launcher.py b/numba_dpex/experimental/launcher.py
@@ -19,11 +19,6 @@
 from numba.extending import intrinsic
 
 from numba_dpex import dpjit
-from numba_dpex._kernel_api_impl.spirv.dispatcher import (
-    SPIRVKernelDispatcher,
-    _SPIRVKernelCompileResult,
-)
-from numba_dpex._kernel_api_impl.spirv.target import SPIRVTargetContext
 from numba_dpex.core.targets.dpjit_target import DPEX_TARGET_NAME
 from numba_dpex.core.types import DpctlSyclEvent, NdRangeType, RangeType
 from numba_dpex.core.utils import kernel_launcher as kl
@@ -33,6 +28,11 @@
     ItemType,
     NdItemType,
 )
+from numba_dpex.kernel_api_impl.spirv.dispatcher import (
+    SPIRVKernelDispatcher,
+    _SPIRVKernelCompileResult,
+)
+from numba_dpex.kernel_api_impl.spirv.target import SPIRVTargetContext
 
 
 class LLRange(NamedTuple):
diff --git a/numba_dpex/experimental/target.py b/numba_dpex/experimental/target.py
@@ -11,12 +11,12 @@
 from numba.core.descriptors import TargetDescriptor
 from numba.core.target_extension import GPU, target_registry
 
-from numba_dpex._kernel_api_impl.spirv.target import (
+from numba_dpex.core.descriptor import DpexTargetOptions
+from numba_dpex.experimental.models import exp_dmm
+from numba_dpex.kernel_api_impl.spirv.target import (
     SPIRVTargetContext,
     SPIRVTypingContext,
 )
-from numba_dpex.core.descriptor import DpexTargetOptions
-from numba_dpex.experimental.models import exp_dmm
 
 
 #  pylint: disable=R0903
diff --git a/numba_dpex/kernel_api_impl/__init__.py b/numba_dpex/kernel_api_impl/__init__.py
diff --git a/numba_dpex/kernel_api_impl/spirv/__init__.py b/numba_dpex/kernel_api_impl/spirv/__init__.py
diff --git a/numba_dpex/kernel_api_impl/spirv/codegen.py b/numba_dpex/kernel_api_impl/spirv/codegen.py
@@ -2,6 +2,9 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+"""Code generator for a LLVM module for SPIR-V kernels.
+"""
+
 import warnings
 
 from llvmlite import binding as ll
@@ -26,6 +29,10 @@
 
 
 class SPIRVCodeLibrary(CPUCodeLibrary):
+    """A Numba code library that stores a spir_kernel function and all the
+    internally defined spir_func functions called from the spir_kernel function.
+    """
+
     def _optimize_functions(self, ll_module):
         pass
 
@@ -36,8 +43,8 @@ def inline_threshold(self):
         """
         if hasattr(self, "_inline_threshold"):
             return self._inline_threshold
-        else:
-            return 0
+
+        return 0
 
     @inline_threshold.setter
     def inline_threshold(self, value: int):
@@ -105,6 +112,7 @@ def get_asm_str(self):
 
     @property
     def final_module(self):
+        """Return the final SPIR-V module after it has been finalized."""
         return self._final_module
 
 
@@ -116,7 +124,7 @@ class JITSPIRVCodegen(CPUCodegen):
     _library_class = SPIRVCodeLibrary
 
     def _init(self, llvm_module):
-        assert list(llvm_module.global_variables) == [], "Module isn't empty"
+        assert not list(llvm_module.global_variables), "Module isn't empty"
         self._data_layout = SPIR_DATA_LAYOUT[utils.MACHINE_BITS]
         self._target_data = ll.create_target_data(self._data_layout)
         self._tm_features = (
@@ -130,10 +138,15 @@ def _create_empty_module(self, name):
             ir_module.data_layout = self._data_layout
         return ir_module
 
-    def _module_pass_manager(self):
+    def create_empty_spirv_module(self, name):
+        """Public method to create an empty LLVM Module with SPIR-V layout."""
+
+        return self._create_empty_module(name)
+
+    def _module_pass_manager(self, **kwargs):
         raise NotImplementedError
 
-    def _function_pass_manager(self, llvm_module):
+    def _function_pass_manager(self, llvm_module, **kwargs):
         raise NotImplementedError
 
     def _add_module(self, module):
diff --git a/numba_dpex/kernel_api_impl/spirv/dispatcher.py b/numba_dpex/kernel_api_impl/spirv/dispatcher.py
@@ -26,12 +26,6 @@
 from numba.core.typing.typeof import Purpose, typeof
 
 from numba_dpex import config, numba_sem_version
-from numba_dpex._kernel_api_impl.spirv import spirv_generator
-from numba_dpex._kernel_api_impl.spirv.codegen import SPIRVCodeLibrary
-from numba_dpex._kernel_api_impl.spirv.target import (
-    CompilationMode,
-    SPIRVTargetContext,
-)
 from numba_dpex.core.exceptions import (
     ExecutionQueueInferenceError,
     InvalidKernelSpecializationError,
@@ -45,6 +39,12 @@
     DPEX_KERNEL_EXP_TARGET_NAME,
     dpex_exp_kernel_target,
 )
+from numba_dpex.kernel_api_impl.spirv import spirv_generator
+from numba_dpex.kernel_api_impl.spirv.codegen import SPIRVCodeLibrary
+from numba_dpex.kernel_api_impl.spirv.target import (
+    CompilationMode,
+    SPIRVTargetContext,
+)
 
 _SPIRVKernelCompileResult = namedtuple(
     "_KernelCompileResult", CompileResult._fields + ("kernel_device_ir_module",)
@@ -314,6 +314,7 @@ def __init__(
         self._kernel_name = pyfunc.__name__
 
         if numba_sem_version < (0, 59, 0):
+            # pylint: disable=unexpected-keyword-arg
             super().__init__(
                 py_func=pyfunc,
                 locals=local_vars_to_numba_types,
diff --git a/numba_dpex/kernel_api_impl/spirv/spirv_generator.py b/numba_dpex/kernel_api_impl/spirv/spirv_generator.py
diff --git a/numba_dpex/kernel_api_impl/spirv/target.py b/numba_dpex/kernel_api_impl/spirv/target.py
diff --git a/numba_dpex/ocl/oclimpl.py b/numba_dpex/ocl/oclimpl.py

Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,8 @@`
`15`	`15`	`target_registry,`
`16`	`16`	`)`
`17`	`17`
`18`		`-from numba_dpex._kernel_api_impl.spirv.dispatcher import SPIRVKernelDispatcher`
`19`		`-from numba_dpex._kernel_api_impl.spirv.target import CompilationMode`
	`18`	`+from numba_dpex.kernel_api_impl.spirv.dispatcher import SPIRVKernelDispatcher`
	`19`	`+from numba_dpex.kernel_api_impl.spirv.target import CompilationMode`
`20`	`20`
`21`	`21`	`from .target import DPEX_KERNEL_EXP_TARGET_NAME`
`22`	`22`