Skip to content

Commit 202f257

Browse files
Sam-ArmstrongSam-Armstrong
committed
more transformations refactors
1 parent 68a358c commit 202f257

File tree

9 files changed

+40
-60
lines changed

9 files changed

+40
-60
lines changed

‎ivy/transpiler/transformations/transformers/closure_transformer/base_transformer.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
# local
21
import gast
3-
from ...configurations.base_transformer_config import (
2+
3+
from ivy.transpiler.transformations.configurations.base_transformer_config import (
44
BaseTransformerConfig,
55
)
6-
from ...transformer import Transformer
7-
from ...transformers.base_transformer import (
6+
from ivy.transpiler.transformations.transformer import Transformer
7+
from ivy.transpiler.transformations.transformers.base_transformer import (
88
BaseTransformer,
99
)
1010

‎ivy/transpiler/transformations/transformers/decorator_transformer/base_transformer.py‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
1-
# globals
2-
import types
1+
import gast
32

4-
# local
5-
from ...configurations.base_transformer_config import (
3+
from ivy.transpiler.transformations.configurations.base_transformer_config import (
64
BaseTransformerConfig,
75
)
8-
import gast
9-
from ...transformer import Transformer
10-
from ...transformers.base_transformer import (
6+
from ivy.transpiler.transformations.transformer import Transformer
7+
from ivy.transpiler.transformations.transformers.base_transformer import (
118
BaseTransformer,
129
)
13-
from ....utils.ast_utils import ast_to_source_code
14-
from ....utils.type_utils import Types
10+
from ivy.transpiler.utils.ast_utils import ast_to_source_code
11+
from ivy.transpiler.utils.type_utils import Types
1512

1613

1714
class BaseDecoratorRemover(BaseTransformer):

‎ivy/transpiler/transformations/transformers/decorator_transformer/frontend_torch_decorator_transformer.py‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
1-
# global
2-
3-
# local
41
from ivy.transpiler.transformations.configurations.base_transformer_config import (
52
BaseTransformerConfig,
63
)
74
from ivy.transpiler.transformations.transformer import Transformer
85
from ivy.transpiler.transformations.transformers.decorator_transformer.base_transformer import (
96
BaseDecoratorRemover,
107
)
11-
import ivy.transpiler.transformations.transformer_globals as glob
8+
from ivy.transpiler.transformations.transformer_globals import ALL_IVY_FRONTEND_DECORATORS
129

1310

1411
class FrontendTorchDecoratorRemover(BaseDecoratorRemover):
@@ -25,4 +22,4 @@ def __init__(
2522
self.root = root
2623
self.transformer = transformer
2724
self.configuration = configuration
28-
self.disallowed_decorators = set(glob.ALL_IVY_FRONTEND_DECORATORS)
25+
self.disallowed_decorators = set(ALL_IVY_FRONTEND_DECORATORS)

‎ivy/transpiler/transformations/transformers/decorator_transformer/ivy_decorator_transformer.py‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
1-
# global
2-
3-
# local
41
from ivy.transpiler.transformations.configurations.base_transformer_config import (
52
BaseTransformerConfig,
63
)
74
from ivy.transpiler.transformations.transformer import Transformer
85
from ivy.transpiler.transformations.transformers.decorator_transformer.base_transformer import (
96
BaseDecoratorRemover,
107
)
11-
import ivy.transpiler.transformations.transformer_globals as glob
8+
from ivy.transpiler.transformations.transformer_globals import ALL_IVY_DECORATORS, IVY_DECORATORS_TO_TRANSLATE
129

1310

1411
class IvyDecoratorRemover(BaseDecoratorRemover):
@@ -25,6 +22,6 @@ def __init__(
2522
self.root = root
2623
self.transformer = transformer
2724
self.configuration = configuration
28-
self.disallowed_decorators = set(glob.ALL_IVY_DECORATORS).difference(
29-
set(glob.IVY_DECORATORS_TO_TRANSLATE)
25+
self.disallowed_decorators = set(ALL_IVY_DECORATORS).difference(
26+
set(IVY_DECORATORS_TO_TRANSLATE)
3027
)

‎ivy/transpiler/transformations/transformers/decorator_transformer/native_torch_decorator_transformer.py‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
# global
2-
3-
# local
41
from ivy.transpiler.transformations.configurations.base_transformer_config import (
52
BaseTransformerConfig,
63
)

‎ivy/transpiler/transformations/transformers/deletion_transformer/base_transformer.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
# local
21
import gast
3-
from ...configurations.base_transformer_config import (
2+
3+
from ivy.transpiler.transformations.configurations.base_transformer_config import (
44
BaseTransformerConfig,
55
)
6-
from ...transformer import Transformer
7-
from ..base_transformer import (
6+
from ivy.transpiler.transformations.transformer import Transformer
7+
from ivy.transpiler.transformations.transformers.base_transformer import (
88
BaseTransformer,
99
)
10-
from ....utils.ast_utils import ast_to_source_code
10+
from ivy.transpiler.utils.ast_utils import ast_to_source_code
1111

1212

1313
class BaseNodeDeleter(BaseTransformer):

‎ivy/transpiler/transformations/transformers/deletion_transformer/ivy_deletion_transformer.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
# local
21
import gast
3-
from ...configurations.base_transformer_config import (
2+
3+
from ivy.transpiler.transformations.configurations.base_transformer_config import (
44
BaseTransformerConfig,
55
)
6-
from ...transformer import Transformer
7-
from ..base_transformer import (
6+
from ivy.transpiler.transformations.transformer import Transformer
7+
from ivy.transpiler.transformations.transformers.deletion_transformer.base_transformer import (
88
BaseTransformer,
99
)
10-
from ....utils.ast_utils import ast_to_source_code
10+
from ivy.transpiler.utils.ast_utils import ast_to_source_code
1111

1212

1313
class IvyNodeDeleter(BaseTransformer):

‎ivy/transpiler/transformations/transformers/docstring_transformer/base_transformer.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
# local
21
import gast
3-
from ...configurations.base_transformer_config import (
2+
3+
from ivy.transpiler.transformations.configurations.base_transformer_config import (
44
BaseTransformerConfig,
55
)
6-
from ...transformer import Transformer
7-
from ..base_transformer import (
6+
from ivy.transpiler.transformations.transformer import Transformer
7+
from ivy.transpiler.transformations.transformers.base_transformer import (
88
BaseTransformer,
99
)
1010

‎ivy/transpiler/transformations/transformers/dunders_transformer/base_transformer.py‎

Lines changed: 11 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,18 @@
1-
# global
21
import copy
32
import gast
4-
import ivy
53

6-
# local
7-
from ..base_transformer import (
8-
BaseTransformer,
9-
)
10-
from ...transformer import Transformer
11-
from ...configurations.base_transformer_config import (
4+
from ivy.transpiler.transformations.configurations.base_transformer_config import (
125
BaseTransformerConfig,
136
)
14-
from ...transformer import Transformer
15-
from ....utils.ast_utils import ast_to_source_code
16-
from ....utils.api_utils import (
17-
get_function_from_modules,
18-
is_backend_api,
7+
from ivy.transpiler.transformations.transformer import Transformer
8+
from ivy.transpiler.transformations.transformers.base_transformer import (
9+
BaseTransformer,
1910
)
20-
21-
from ... import transformer_globals as glob
22-
from ....utils.type_utils import Types
23-
from ....utils.naming_utils import NAME_GENERATOR
11+
from ivy.transpiler.transformations.transformer_globals import CONFLICTING_METHODS
12+
from ivy.transpiler.utils.ast_utils import ast_to_source_code
13+
from ivy.transpiler.utils.api_utils import get_function_from_modules
14+
from ivy.transpiler.utils.type_utils import Types
15+
from ivy.transpiler.utils.naming_utils import NAME_GENERATOR
2416

2517

2618
class NameNodeVisitor(gast.NodeVisitor):
@@ -184,7 +176,7 @@ def convert_slices(self, slice_node):
184176
return slice_node
185177

186178
def transform_getitem(self, node, slice_args):
187-
glob.CONFLICTING_METHODS.add("get_item")
179+
CONFLICTING_METHODS.add("get_item")
188180
return gast.Call(
189181
func=gast.Attribute(
190182
value=gast.parse(f"ivy").body[0].value,
@@ -196,7 +188,7 @@ def transform_getitem(self, node, slice_args):
196188
)
197189

198190
def transform_setitem(self, node, slice_args, value):
199-
glob.CONFLICTING_METHODS.add("set_item")
191+
CONFLICTING_METHODS.add("set_item")
200192
return gast.Assign(
201193
targets=[node.value],
202194
value=gast.Call(

0 commit comments

Comments
 (0)