Skip to content

Commit 6c5859a

Browse files
author
Diptorup Deb
committed
Move atomic_ref and index_space_ids types into core from exp.
1 parent 12f89a4 commit 6c5859a

File tree

11 files changed

+12
-21
lines changed

11 files changed

+12
-21
lines changed

numba_dpex/experimental/_kernel_dpcpp_spirv_overloads/_atomic_ref_overloads.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
LLVM_SPIRV_ARGS,
2626
)
2727

28-
from ..dpcpp_types import AtomicRefType
28+
from ...core.types.kernel_api.atomic_ref import AtomicRefType
2929
from ..target import DPEX_KERNEL_EXP_TARGET_NAME
3030
from ._spv_atomic_inst_helper import (
3131
get_atomic_inst_name,

numba_dpex/experimental/_kernel_dpcpp_spirv_overloads/_group_barrier_overloads.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
from numba.extending import intrinsic, overload
1515

1616
from numba_dpex.core import itanium_mangler as ext_itanium_mangler
17-
from numba_dpex.experimental.core.types.kernel_api.items import GroupType
17+
from numba_dpex.core.types.kernel_api.index_space_ids import GroupType
1818
from numba_dpex.experimental.target import DPEX_KERNEL_EXP_TARGET_NAME
1919
from numba_dpex.kernel_api import group_barrier
2020
from numba_dpex.kernel_api.memory_enums import MemoryOrder, MemoryScope

numba_dpex/experimental/_kernel_dpcpp_spirv_overloads/_index_space_id_overloads.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
from numba.core.errors import TypingError
1212
from numba.extending import intrinsic, overload_method
1313

14-
from numba_dpex.experimental.core.types.kernel_api.items import (
14+
from numba_dpex.kernel_api_impl.spirv.target import SPIRVTargetContext
15+
from numba_dpex.core.types.kernel_api.index_space_ids import (
1516
GroupType,
1617
ItemType,
1718
NdItemType,
1819
)
19-
from numba_dpex.kernel_api_impl.spirv.target import SPIRVTargetContext
2020

2121
from ..target import DPEX_KERNEL_EXP_TARGET_NAME
2222

numba_dpex/experimental/core/__init__.py

Lines changed: 0 additions & 3 deletions
This file was deleted.

numba_dpex/experimental/core/types/__init__.py

Lines changed: 0 additions & 3 deletions
This file was deleted.

numba_dpex/experimental/core/types/kernel_api/__init__.py

Lines changed: 0 additions & 3 deletions
This file was deleted.

numba_dpex/experimental/launcher.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,7 @@
2121
from numba_dpex import dpjit
2222
from numba_dpex.core.targets.dpjit_target import DPEX_TARGET_NAME
2323
from numba_dpex.core.types import DpctlSyclEvent, NdRangeType, RangeType
24-
from numba_dpex.core.utils import kernel_launcher as kl
25-
from numba_dpex.dpctl_iface import libsyclinterface_bindings as sycl
26-
from numba_dpex.dpctl_iface.wrappers import wrap_event_reference
27-
from numba_dpex.experimental.core.types.kernel_api.items import (
24+
from numba_dpex.core.types.kernel_api.index_space_ids import (
2825
ItemType,
2926
NdItemType,
3027
)
@@ -33,6 +30,9 @@
3330
_SPIRVKernelCompileResult,
3431
)
3532
from numba_dpex.kernel_api_impl.spirv.target import SPIRVTargetContext
33+
from numba_dpex.core.utils import kernel_launcher as kl
34+
from numba_dpex.dpctl_iface import libsyclinterface_bindings as sycl
35+
from numba_dpex.dpctl_iface.wrappers import wrap_event_reference
3636

3737

3838
class LLRange(NamedTuple):

numba_dpex/experimental/models.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
from numba.core.extending import register_model
1313

1414
import numba_dpex.core.datamodel.models as dpex_core_models
15-
from numba_dpex.experimental.core.types.kernel_api.items import (
15+
from numba_dpex.core.types.kernel_api.index_space_ids import (
1616
GroupType,
1717
ItemType,
1818
NdItemType,
1919
)
2020

21-
from .dpcpp_types import AtomicRefType
21+
from ..core.types.kernel_api.atomic_ref import AtomicRefType
2222
from .types import KernelDispatcherType
2323

2424

0 commit comments

Comments
 (0)