Merge pull request #1328 from IntelPython/refactor/experimental_to_core

Migrates more features from experimental to core modules
IntelPython · Feb 12, 2024 · 6290156 · 6290156
2 parents 12f89a4 + e450081
commit 6290156
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 21 deletions.
diff --git a/numba_dpex/experimental/dpcpp_types.py → ..._dpex/core/types/kernel_api/atomic_ref.py b/numba_dpex/experimental/dpcpp_types.py → ..._dpex/core/types/kernel_api/atomic_ref.py
diff --git a/...perimental/core/types/kernel_api/items.py → .../core/types/kernel_api/index_space_ids.py b/...perimental/core/types/kernel_api/items.py → .../core/types/kernel_api/index_space_ids.py
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
@@ -25,14 +25,14 @@
     LLVM_SPIRV_ARGS,
 )
 
-from ..dpcpp_types import AtomicRefType
+from ...core.types.kernel_api.atomic_ref import AtomicRefType
 from ..target import DPEX_KERNEL_EXP_TARGET_NAME
 from ._spv_atomic_inst_helper import (
     get_atomic_inst_name,
     get_memory_semantics_mask,
     get_scope,
 )
-from .spv_fn_generator import (
+from .spv_atomic_fn_declarations import (
     get_or_insert_atomic_load_fn,
     get_or_insert_spv_atomic_compare_exchange_fn,
     get_or_insert_spv_atomic_exchange_fn,

diff --git a/numba_dpex/experimental/_kernel_dpcpp_spirv_overloads/_group_barrier_overloads.py b/numba_dpex/experimental/_kernel_dpcpp_spirv_overloads/_group_barrier_overloads.py
@@ -14,7 +14,7 @@
 from numba.extending import intrinsic, overload
 
 from numba_dpex.core import itanium_mangler as ext_itanium_mangler
-from numba_dpex.experimental.core.types.kernel_api.items import GroupType
+from numba_dpex.core.types.kernel_api.index_space_ids import GroupType
 from numba_dpex.experimental.target import DPEX_KERNEL_EXP_TARGET_NAME
 from numba_dpex.kernel_api import group_barrier
 from numba_dpex.kernel_api.memory_enums import MemoryOrder, MemoryScope

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,7 +11,7 @@
 from numba.core.errors import TypingError
 from numba.extending import intrinsic, overload_method
 
-from numba_dpex.experimental.core.types.kernel_api.items import (
+from numba_dpex.core.types.kernel_api.index_space_ids import (
     GroupType,
     ItemType,
     NdItemType,

diff --git a/...dpcpp_spirv_overloads/spv_fn_generator.py → ...v_overloads/spv_atomic_fn_declarations.py b/...dpcpp_spirv_overloads/spv_fn_generator.py → ...v_overloads/spv_atomic_fn_declarations.py
diff --git a/numba_dpex/experimental/core/__init__.py b/numba_dpex/experimental/core/__init__.py
diff --git a/numba_dpex/experimental/core/types/__init__.py b/numba_dpex/experimental/core/types/__init__.py
diff --git a/numba_dpex/experimental/core/types/kernel_api/__init__.py b/numba_dpex/experimental/core/types/kernel_api/__init__.py
diff --git a/numba_dpex/experimental/launcher.py b/numba_dpex/experimental/launcher.py
@@ -21,13 +21,13 @@
 from numba_dpex import dpjit
 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
-from numba_dpex.dpctl_iface import libsyclinterface_bindings as sycl
-from numba_dpex.dpctl_iface.wrappers import wrap_event_reference
-from numba_dpex.experimental.core.types.kernel_api.items import (
+from numba_dpex.core.types.kernel_api.index_space_ids import (
     ItemType,
     NdItemType,
 )
+from numba_dpex.core.utils import kernel_launcher as kl
+from numba_dpex.dpctl_iface import libsyclinterface_bindings as sycl
+from numba_dpex.dpctl_iface.wrappers import wrap_event_reference
 from numba_dpex.kernel_api_impl.spirv.dispatcher import (
     SPIRVKernelDispatcher,
     _SPIRVKernelCompileResult,

diff --git a/numba_dpex/experimental/models.py b/numba_dpex/experimental/models.py
@@ -12,13 +12,13 @@
 from numba.core.extending import register_model
 
 import numba_dpex.core.datamodel.models as dpex_core_models
-from numba_dpex.experimental.core.types.kernel_api.items import (
+from numba_dpex.core.types.kernel_api.index_space_ids import (
     GroupType,
     ItemType,
     NdItemType,
 )
 
-from .dpcpp_types import AtomicRefType
+from ..core.types.kernel_api.atomic_ref import AtomicRefType
 from .types import KernelDispatcherType
 
 

diff --git a/numba_dpex/experimental/typeof.py b/numba_dpex/experimental/typeof.py
@@ -9,14 +9,14 @@
 
 from numba.extending import typeof_impl
 
-from numba_dpex.experimental.core.types.kernel_api.items import (
+from numba_dpex.core.types.kernel_api.index_space_ids import (
     GroupType,
     ItemType,
     NdItemType,
 )
 from numba_dpex.kernel_api import AtomicRef, Group, Item, NdItem
 
-from .dpcpp_types import AtomicRefType
+from ..core.types.kernel_api.atomic_ref import AtomicRefType
 
 
 @typeof_impl.register(AtomicRef)