Skip to content

Commit aeb844a

Browse files
author
Diptorup Deb
authored
Merge pull request #1305 from IntelPython/refactor/flag_enum_to_kernel_api
Move FlagEnum into kernel_api.
2 parents c8d6799 + a77757f commit aeb844a

File tree

9 files changed

+12
-11
lines changed

9 files changed

+12
-11
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
@@ -14,13 +14,13 @@
1414
from numba_dpex.core import itanium_mangler as ext_itanium_mangler
1515
from numba_dpex.core.targets.kernel_target import CC_SPIR_FUNC, LLVM_SPIRV_ARGS
1616
from numba_dpex.core.types import USMNdArray
17-
from numba_dpex.experimental.flag_enum import FlagEnum
1817
from numba_dpex.kernel_api import (
1918
AddressSpace,
2019
AtomicRef,
2120
MemoryOrder,
2221
MemoryScope,
2322
)
23+
from numba_dpex.kernel_api.flag_enum import FlagEnum
2424

2525
from ..dpcpp_types import AtomicRefType
2626
from ..target import DPEX_KERNEL_EXP_TARGET_NAME

numba_dpex/experimental/literal_intenum_type.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
from numba.core.typing.typeof import typeof
1414

1515
from numba_dpex.core.exceptions import IllegalIntEnumLiteralValueError
16-
from numba_dpex.experimental.flag_enum import FlagEnum
16+
from numba_dpex.kernel_api.flag_enum import FlagEnum
1717

1818

1919
class IntEnumLiteral(Literal, Integer):

numba_dpex/experimental/target.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
DpexKernelTypingContext,
2121
)
2222
from numba_dpex.experimental.models import exp_dmm
23+
from numba_dpex.kernel_api.flag_enum import FlagEnum
2324

24-
from .flag_enum import FlagEnum
2525
from .literal_intenum_type import IntEnumLiteral
2626

2727

numba_dpex/experimental/flag_enum.py renamed to numba_dpex/kernel_api/flag_enum.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,22 @@
22
#
33
# SPDX-License-Identifier: Apache-2.0
44

5-
"""Provides a FlagEnum class to help distinguish IntEnum types that numba-dpex
5+
"""
6+
Provides a FlagEnum class to help distinguish IntEnum types that numba_dpex
67
intends to use as Integer literal types inside the compiler type inferring
78
infrastructure.
89
"""
910
from enum import IntEnum
1011

1112

1213
class FlagEnum(IntEnum):
13-
"""Helper class to distinguish IntEnum types that numba-dpex should consider
14+
"""Helper class to distinguish IntEnum types that numba_dpex should consider
1415
as Numba Literal types.
1516
"""
1617

1718
@classmethod
1819
def basetype(cls) -> int:
19-
"""Returns an dummy int object that helps numba-dpex infer the type of
20+
"""Returns an dummy int object that helps numba_dpex infer the type of
2021
an instance of a FlagEnum class.
2122
2223
Returns:

numba_dpex/kernel_api/memory_enums.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
memory enum classes.
77
"""
88

9-
from numba_dpex.experimental.flag_enum import FlagEnum
9+
from numba_dpex.kernel_api.flag_enum import FlagEnum
1010

1111

1212
class MemoryOrder(FlagEnum):

numba_dpex/tests/experimental/IntEnumLiteral/test_compilation.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
import numba_dpex.experimental as exp_dpex
88
from numba_dpex import Range
9-
from numba_dpex.experimental.flag_enum import FlagEnum
9+
from numba_dpex.kernel_api.flag_enum import FlagEnum
1010

1111

1212
class MockFlags(FlagEnum):

numba_dpex/tests/experimental/IntEnumLiteral/test_type_creation.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
from numba_dpex.core.exceptions import IllegalIntEnumLiteralValueError
1010
from numba_dpex.experimental import IntEnumLiteral
11-
from numba_dpex.experimental.flag_enum import FlagEnum
11+
from numba_dpex.kernel_api.flag_enum import FlagEnum
1212

1313

1414
def test_intenumliteral_creation():

numba_dpex/tests/experimental/IntEnumLiteral/test_type_registration.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77

88
from numba_dpex.core.datamodel.models import dpex_data_model_manager
99
from numba_dpex.experimental import IntEnumLiteral
10-
from numba_dpex.experimental.flag_enum import FlagEnum
1110
from numba_dpex.experimental.models import exp_dmm
11+
from numba_dpex.kernel_api.flag_enum import FlagEnum
1212

1313

1414
def test_data_model_registration():

numba_dpex/tests/experimental/codegen/test_intenum_literal_codegen.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
import numba_dpex.experimental as exp_dpex
1111
from numba_dpex import DpctlSyclQueue, DpnpNdArray, int64
12-
from numba_dpex.experimental.flag_enum import FlagEnum
12+
from numba_dpex.kernel_api.flag_enum import FlagEnum
1313

1414

1515
def test_compilation_as_literal_constant():

0 commit comments

Comments
 (0)