Skip to content

Commit f6f7abf

Browse files
committed
fix lint
Signed-off-by: Mark Halka <mark.halka2001@gmail.com>
1 parent 558d587 commit f6f7abf

10 files changed

Lines changed: 49 additions & 45 deletions

File tree

csp/impl/wiring/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
from csp.impl.wiring.adapters import *
22
from csp.impl.wiring.context import *
3+
from csp.impl.wiring.csp_numba.numba_node import *
34
from csp.impl.wiring.delayed_edge import DelayedEdge
45
from csp.impl.wiring.dynamic import dynamic
56
from csp.impl.wiring.edge import *
67
from csp.impl.wiring.feedback import *
78
from csp.impl.wiring.graph import *
89
from csp.impl.wiring.node import *
910
from csp.impl.wiring.node_parser import *
10-
from csp.impl.wiring.csp_numba.numba_node import *
1111
from csp.impl.wiring.outputs import *
1212
from csp.impl.wiring.runtime import *
1313
from csp.impl.wiring.signature import *

csp/impl/wiring/csp_numba/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
from .csp_node_transformer import CspNodeTransformer, TransformedNode, StateVariable
2-
from .numba_node import numba_node, NumbaNodeDef
1+
from .csp_node_transformer import CspNodeTransformer, StateVariable, TransformedNode
2+
from .numba_node import NumbaNodeDef, numba_node
33

44
__all__ = [
55
"numba_node",

csp/impl/wiring/csp_numba/enum_support.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
from dataclasses import dataclass
44
from typing import Any, Optional
55

6-
from csp.impl.enum import Enum as CspEnum
7-
8-
from numba_cfunc_compiler.type_factory import TypeFactory
9-
from numba_cfunc_compiler.models import VariableType, ParameterInfo, StateVariableInfo
6+
from numba_cfunc_compiler.models import ParameterInfo, StateVariableInfo, VariableType
107
from numba_cfunc_compiler.numba_type_inference import NumbaTypeInference
8+
from numba_cfunc_compiler.type_factory import TypeFactory
119
from numba_cfunc_compiler.utils.ast import AST
1210

11+
from csp.impl.enum import Enum as CspEnum
12+
1313

1414
def _resolve_csp_enum_member(node: ast.AST, globalns: dict) -> Optional[CspEnum]:
1515
"""Resolve `MyEnum.VALUE` and `MyEnum.VALUE.value` AST nodes."""

csp/impl/wiring/csp_numba/input_handlers.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
import inspect
1111
from typing import Any, Optional, get_args, get_origin
1212

13-
from csp.impl.wiring.edge import Edge
14-
from csp.impl.types.tstype import TsType
15-
1613
from numba_cfunc_compiler.function_analyzer import InputTypeHandler
1714
from numba_cfunc_compiler.models import ParameterInfo
1815

16+
from csp.impl.types.tstype import TsType
17+
from csp.impl.wiring.edge import Edge
18+
1919

2020
def _extract_ts_inner_type(ann: Any) -> Optional[type]:
2121
if get_origin(ann) is not TsType:

csp/impl/wiring/csp_numba/numba_node.py

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,36 +3,34 @@
33
import inspect
44
from typing import Callable, List, Optional, Tuple
55

6+
from numba_cfunc_compiler.compilation_context import CompilationContext
7+
from numba_cfunc_compiler.defaults import register_types as register_default_types
8+
from numba_cfunc_compiler.defaults.source_categories import (
9+
ConstantCategory,
10+
LifecycleCategory,
11+
OutputCategory,
12+
StateCategory,
13+
)
14+
from numba_cfunc_compiler.numba_core import create_compiled_func
15+
from numba_cfunc_compiler.source_registry import SourceRegistry
16+
617
from csp.impl.__cspimpl import _cspimpl
7-
from csp.impl.wiring.edge import Edge
8-
from csp.impl.types.tstype import ts
918
from csp.impl.types.container_type_normalizer import ContainerTypeNormalizer
10-
19+
from csp.impl.types.tstype import ts
1120
from csp.impl.wiring.csp_numba.csp_node_transformer import CspNodeTransformer
21+
from csp.impl.wiring.csp_numba.enum_support import register as register_enum_support
1222
from csp.impl.wiring.csp_numba.input_handlers import register as register_input_handlers
1323
from csp.impl.wiring.csp_numba.output_handlers import register as register_output_handlers
14-
from csp.impl.wiring.csp_numba.enum_support import register as register_enum_support
24+
from csp.impl.wiring.csp_numba.signal_set_support import (
25+
register_ast_handlers as register_signal_set_ast_handlers,
26+
)
27+
from csp.impl.wiring.csp_numba.signal_support import SignalCategory
1528
from csp.impl.wiring.csp_numba.struct_support import (
1629
register as register_struct_support,
1730
struct_enum_store,
1831
struct_enum_value,
1932
)
20-
from csp.impl.wiring.csp_numba.signal_support import SignalCategory
21-
from csp.impl.wiring.csp_numba.signal_set_support import (
22-
register_ast_handlers as register_signal_set_ast_handlers,
23-
)
24-
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 (
31-
ConstantCategory,
32-
OutputCategory,
33-
StateCategory,
34-
LifecycleCategory,
35-
)
33+
from csp.impl.wiring.edge import Edge
3634

3735
__all__ = (
3836
"numba_node",

csp/impl/wiring/csp_numba/output_handlers.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
import ast
1010
from typing import Any, Optional, get_args, get_origin
1111

12-
from csp.impl.struct import Struct as CspStruct
13-
from csp.impl.types.tstype import TsType
14-
12+
from numba_cfunc_compiler.defaults import is_supported_type
1513
from numba_cfunc_compiler.function_analyzer import OutputTypeHandler
1614
from numba_cfunc_compiler.models import OutputAnalysis
17-
from numba_cfunc_compiler.defaults import is_supported_type
15+
16+
from csp.impl.struct import Struct as CspStruct
17+
from csp.impl.types.tstype import TsType
1818

1919

2020
def validate_output_type(t: Any, context: str) -> None:

csp/impl/wiring/csp_numba/signal_set_support.py

Lines changed: 2 additions & 2 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_cfunc_compiler.utils.ast import AST
54
from numba_cfunc_compiler.method_factory import MethodBase
5+
from numba_cfunc_compiler.models import UnknownNumbaType, UnknownType
6+
from numba_cfunc_compiler.utils.ast import AST
67
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,

csp/impl/wiring/csp_numba/signal_support.py

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

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

88
__all__ = [
99
"INPUTS_ARRAY_NAME",
@@ -145,6 +145,7 @@ def _create_signal_source(
145145

146146
def create_variables(self, info, factory):
147147
from numba_cfunc_compiler.type_factory import TypeFactory
148+
148149
from csp.impl.wiring.csp_numba.signal_set_support import SignalSetSource
149150

150151
input_idx = 0

csp/impl/wiring/csp_numba/struct_support.py

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,20 @@
55
from llvmlite import ir
66
from numba import types as numba_types
77
from numba.extending import intrinsic
8-
9-
from csp.impl.struct import Struct as CspStruct
10-
11-
from numba_cfunc_compiler.type_factory import TypeFactory
8+
from numba_cfunc_compiler.defaults.struct_support import (
9+
StructFieldInfo,
10+
StructType,
11+
struct_attr_handler,
12+
struct_attribute_transformer,
13+
)
1214
from numba_cfunc_compiler.models import StateVariableInfo
13-
from numba_cfunc_compiler.defaults.struct_support import StructType, StructFieldInfo
1415
from numba_cfunc_compiler.numba_config import NumbaTypeRegistry
1516
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.type_factory import TypeFactory
1718
from numba_cfunc_compiler.utils.ast import AST
1819

20+
from csp.impl.struct import Struct as CspStruct
21+
1922

2023
def _is_csp_struct_subclass(value: Any) -> bool:
2124
return isinstance(value, type) and issubclass(value, CspStruct) and value is not CspStruct
@@ -204,6 +207,7 @@ def register():
204207
import ctypes
205208

206209
import llvmlite.binding as llvm
210+
207211
from csp.impl.__cspimpl import _cspimpl
208212

209213
TypeFactory.register(CspStructType)

csp/tests/test_numba_node.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
import unittest
22
from datetime import datetime, timedelta, timezone
33

4+
from numba_cfunc_compiler.numba_config import NumbaDict, NumbaList, create_new_dict, create_new_list
5+
46
import csp
57
from csp import ts
68
from csp.impl.wiring.csp_numba import numba_node
7-
from numba_cfunc_compiler.numba_config import NumbaList, NumbaDict, create_new_list, create_new_dict
89

910

1011
class TestBasicTypes(unittest.TestCase):

0 commit comments

Comments
 (0)