Skip to content

Commit

Permalink
Move atomic_ref and index_space_ids types into core from exp.
Browse files Browse the repository at this point in the history
  • Loading branch information
Diptorup Deb committed Feb 12, 2024
1 parent 12f89a4 commit 6c5859a
Show file tree
Hide file tree
Showing 11 changed files with 12 additions and 21 deletions.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
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.kernel_api_impl.spirv.target import SPIRVTargetContext
from numba_dpex.core.types.kernel_api.index_space_ids import (
GroupType,
ItemType,
NdItemType,
)
from numba_dpex.kernel_api_impl.spirv.target import SPIRVTargetContext

from ..target import DPEX_KERNEL_EXP_TARGET_NAME

Expand Down
3 changes: 0 additions & 3 deletions numba_dpex/experimental/core/__init__.py

This file was deleted.

3 changes: 0 additions & 3 deletions numba_dpex/experimental/core/types/__init__.py

This file was deleted.

3 changes: 0 additions & 3 deletions numba_dpex/experimental/core/types/kernel_api/__init__.py

This file was deleted.

8 changes: 4 additions & 4 deletions numba_dpex/experimental/launcher.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,7 @@
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,
)
Expand All @@ -33,6 +30,9 @@
_SPIRVKernelCompileResult,
)
from numba_dpex.kernel_api_impl.spirv.target import SPIRVTargetContext
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


class LLRange(NamedTuple):
Expand Down
4 changes: 2 additions & 2 deletions numba_dpex/experimental/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down
4 changes: 2 additions & 2 deletions numba_dpex/experimental/typeof.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 6c5859a

Please sign in to comment.