Skip to content

Commit 965219d

Browse files
author
Halka
committed
numba_type_utils -> numba_cfunc_compiler
1 parent e027646 commit 965219d

11 files changed

Lines changed: 38 additions & 38 deletions

conda/dev-environment-unix.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ dependencies:
1313
- cyrus-sasl
1414
- deprecated
1515
- docutils<0.22.1
16-
- numba_type_utils
16+
- numba_cfunc_compiler
1717
- exprtk
1818
- flex
1919
- graphviz

conda/dev-environment-win.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ dependencies:
1313
- cyrus-sasl
1414
- deprecated
1515
- docutils<0.22.1
16-
- numba_type_utils
16+
- numba_cfunc_compiler
1717
- exprtk
1818
# - flex # not available on windows
1919
- graphviz

csp/impl/wiring/csp_numba/enum_support.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55

66
from csp.impl.enum import Enum as CspEnum
77

8-
from numba_type_utils.type_factory import TypeFactory
9-
from numba_type_utils.models import VariableType, ParameterInfo, StateVariableInfo
10-
from numba_type_utils.numba_type_inference import NumbaTypeInference
11-
from numba_type_utils.utils.ast import AST
8+
from numba_cfunc_compiler.type_factory import TypeFactory
9+
from numba_cfunc_compiler.models import VariableType, ParameterInfo, StateVariableInfo
10+
from numba_cfunc_compiler.numba_type_inference import NumbaTypeInference
11+
from numba_cfunc_compiler.utils.ast import AST
1212

1313

1414
def _resolve_csp_enum_member(node: ast.AST, globalns: dict) -> Optional[CspEnum]:

csp/impl/wiring/csp_numba/input_handlers.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
from csp.impl.wiring.edge import Edge
1414
from csp.impl.types.tstype import TsType
1515

16-
from numba_type_utils.function_analyzer import InputTypeHandler
17-
from numba_type_utils.models import ParameterInfo
16+
from numba_cfunc_compiler.function_analyzer import InputTypeHandler
17+
from numba_cfunc_compiler.models import ParameterInfo
1818

1919

2020
def _extract_ts_inner_type(ann: Any) -> Optional[type]:
@@ -130,7 +130,7 @@ def validate_value(self, param_name: str, value: Any, expected_type: Any) -> Any
130130

131131

132132
def register():
133-
from numba_type_utils.function_analyzer import FunctionAnalyzer
133+
from numba_cfunc_compiler.function_analyzer import FunctionAnalyzer
134134

135135
FunctionAnalyzer.register_input_handler(TsInputHandler())
136136
FunctionAnalyzer.register_input_handler(ListBasketInputHandler())

csp/impl/wiring/csp_numba/numba_node.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@
2222
register_ast_handlers as register_signal_set_ast_handlers,
2323
)
2424

25-
from numba_type_utils.compilation_context import CompilationContext
26-
from numba_type_utils.numba_core import create_compiled_func
27-
from numba_type_utils.numba_config import State, set_output
28-
from numba_type_utils.defaults import register_types as register_default_types
29-
from numba_type_utils.source_registry import SourceRegistry
30-
from numba_type_utils.defaults.source_categories import (
25+
from numba_cfunc_compiler.compilation_context import CompilationContext
26+
from numba_cfunc_compiler.numba_core import create_compiled_func
27+
from numba_cfunc_compiler.numba_config import State, set_output
28+
from numba_cfunc_compiler.defaults import register_types as register_default_types
29+
from numba_cfunc_compiler.source_registry import SourceRegistry
30+
from numba_cfunc_compiler.defaults.source_categories import (
3131
ConstantCategory,
3232
OutputCategory,
3333
StateCategory,

csp/impl/wiring/csp_numba/output_handlers.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
from csp.impl.struct import Struct as CspStruct
1313
from csp.impl.types.tstype import TsType
1414

15-
from numba_type_utils.function_analyzer import OutputTypeHandler
16-
from numba_type_utils.models import OutputAnalysis
17-
from numba_type_utils.defaults import is_supported_type
15+
from numba_cfunc_compiler.function_analyzer import OutputTypeHandler
16+
from numba_cfunc_compiler.models import OutputAnalysis
17+
from numba_cfunc_compiler.defaults import is_supported_type
1818

1919

2020
def validate_output_type(t: Any, context: str) -> None:
@@ -82,7 +82,7 @@ def try_parse(self, return_annotation: Any, ast_tree: ast.AST) -> Optional[Outpu
8282

8383

8484
def register():
85-
from numba_type_utils.function_analyzer import FunctionAnalyzer
85+
from numba_cfunc_compiler.function_analyzer import FunctionAnalyzer
8686

8787
FunctionAnalyzer.register_output_handler(SingleTsOutputHandler())
8888
FunctionAnalyzer.register_output_handler(CspOutputsHandler())

csp/impl/wiring/csp_numba/signal_set_support.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import ast
22
from typing import Optional
33

4-
from numba_type_utils.utils.ast import AST
5-
from numba_type_utils.method_factory import MethodBase
6-
from numba_type_utils.variable_factory import VariableSource
7-
from numba_type_utils.models import UnknownType, UnknownNumbaType
4+
from numba_cfunc_compiler.utils.ast import AST
5+
from numba_cfunc_compiler.method_factory import MethodBase
6+
from numba_cfunc_compiler.variable_factory import VariableSource
7+
from numba_cfunc_compiler.models import UnknownType, UnknownNumbaType
88

99
from csp.impl.wiring.csp_numba.signal_support import (
1010
INPUTS_ARRAY_NAME,
@@ -401,7 +401,7 @@ def handle_signal_set_iteration(converter, node: ast.For) -> Optional[ast.AST]:
401401

402402

403403
def register_ast_handlers():
404-
from numba_type_utils.ast_handlers import ASTHandlerRegistry, HandlerPhase
404+
from numba_cfunc_compiler.ast_handlers import ASTHandlerRegistry, HandlerPhase
405405

406406
ASTHandlerRegistry.register("Call", handle_len_signal_set, HandlerPhase.PRE, priority=0)
407407
ASTHandlerRegistry.register("Subscript", handle_signal_set_subscript, HandlerPhase.PRE, priority=0)

csp/impl/wiring/csp_numba/signal_support.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import ast
22

3-
from numba_type_utils.utils.ast import AST
4-
from numba_type_utils.method_factory import MethodBase
5-
from numba_type_utils.variable_factory import VoidPtrSource
6-
from numba_type_utils.source_registry import CfuncParam, SourceCategory, SourceInitFilter
3+
from numba_cfunc_compiler.utils.ast import AST
4+
from numba_cfunc_compiler.method_factory import MethodBase
5+
from numba_cfunc_compiler.variable_factory import VoidPtrSource
6+
from numba_cfunc_compiler.source_registry import CfuncParam, SourceCategory, SourceInitFilter
77

88
__all__ = [
99
"INPUTS_ARRAY_NAME",
@@ -144,7 +144,7 @@ def _create_signal_source(
144144
)
145145

146146
def create_variables(self, info, factory):
147-
from numba_type_utils.type_factory import TypeFactory
147+
from numba_cfunc_compiler.type_factory import TypeFactory
148148
from csp.impl.wiring.csp_numba.signal_set_support import SignalSetSource
149149

150150
input_idx = 0

csp/impl/wiring/csp_numba/struct_support.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88

99
from csp.impl.struct import Struct as CspStruct
1010

11-
from numba_type_utils.type_factory import TypeFactory
12-
from numba_type_utils.models import StateVariableInfo
13-
from numba_type_utils.defaults.struct_support import StructType, StructFieldInfo
14-
from numba_type_utils.numba_config import NumbaTypeRegistry
15-
from numba_type_utils.numba_type_inference import NumbaTypeInference
16-
from numba_type_utils.defaults.struct_support import struct_attribute_transformer, struct_attr_handler
17-
from numba_type_utils.utils.ast import AST
11+
from numba_cfunc_compiler.type_factory import TypeFactory
12+
from numba_cfunc_compiler.models import StateVariableInfo
13+
from numba_cfunc_compiler.defaults.struct_support import StructType, StructFieldInfo
14+
from numba_cfunc_compiler.numba_config import NumbaTypeRegistry
15+
from numba_cfunc_compiler.numba_type_inference import NumbaTypeInference
16+
from numba_cfunc_compiler.defaults.struct_support import struct_attribute_transformer, struct_attr_handler
17+
from numba_cfunc_compiler.utils.ast import AST
1818

1919

2020
def _is_csp_struct_subclass(value: Any) -> bool:

csp/tests/test_numba_node.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import csp
55
from csp import ts
66
from csp.impl.wiring.csp_numba import numba_node
7-
from numba_type_utils.numba_config import NumbaList, NumbaDict, create_new_list, create_new_dict
7+
from numba_cfunc_compiler.numba_config import NumbaList, NumbaDict, create_new_list, create_new_dict
88

99

1010
class TestBasicTypes(unittest.TestCase):

0 commit comments

Comments
 (0)