more refactors

Sam-Armstrong · Sam-Armstrong · commit 6f4bb76ff786 · 2025-06-08T00:37:32.000+01:00
diff --git a/ivy/transpiler/transformations/transformers/globals_transformer/base_transformer.py b/ivy/transpiler/transformations/transformers/globals_transformer/base_transformer.py
@@ -1,21 +1,19 @@
-# global
 from copy import copy, deepcopy
 import gast
 import types
 from typing import List, Tuple, Optional, Union, TYPE_CHECKING
 
-# local
-from ..base_transformer import (
+from ivy.transpiler.transformations.transformers.base_transformer import (
     BaseTransformer,
 )
-from ...transformer import Transformer
-from ....translations.data.global_like import (
+from ivy.transpiler.transformations.transformer import Transformer
+from ivy.transpiler.translations.data.global_like import (
     GlobalObjectLike,
     Position,
     StackObjectLike,
 )
-from ....translations.data.object_like import BaseObjectLike
-from ....utils.ast_utils import (
+from ivy.transpiler.translations.data.object_like import BaseObjectLike
+from ivy.transpiler.utils.ast_utils import (
     FRONTEND_STANDARD_GLOBALS_TARGET_TO_MODULE,
     IVY_STANDARD_GLOBALS_TARGET_TO_MODULE,
     ast_to_source_code,
@@ -27,21 +25,21 @@
     FileNameStrategy,
     TranslatedContext,
 )
-from ....utils.api_utils import (
+from ivy.transpiler.utils.api_utils import (
     get_function_from_modules,
     SUPPORTED_BACKENDS_PREFIX,
 )
-from ....utils.naming_utils import NAME_GENERATOR
-from ....utils.origin_utils import ORIGI_INFO
-from ....utils.conversion_utils import (
+from ivy.transpiler.utils.naming_utils import NAME_GENERATOR
+from ivy.transpiler.utils.origin_utils import ORIGI_INFO
+from ivy.transpiler.utils.conversion_utils import (
     BUILTIN_LIKELY_MODULE_NAMES,
 )
-from ...configurations.base_transformer_config import (
+from ivy.transpiler.transformations.configurations.base_transformer_config import (
     BaseTransformerConfig,
 )
 
 if TYPE_CHECKING:
-    from ....translations.data.object_like import (
+    from ivy.transpiler.translations.data.object_like import (
         TypeObjectLike,
         FuncObjectLike,
     )
diff --git a/ivy/transpiler/transformations/transformers/inject_transformer/base_transformer.py b/ivy/transpiler/transformations/transformers/inject_transformer/base_transformer.py
@@ -1,23 +1,21 @@
-# global
 import gast
 import inspect
 import textwrap
 
-# local
-from ...configurations.base_transformer_config import (
+from ivy.transpiler.transformations.configurations.base_transformer_config import (
     BaseTransformerConfig,
 )
-from ...transformer import Transformer
-from ....utils import pickling_utils
-from ....utils.ast_utils import (
+from ivy.transpiler.transformations.transformer import Transformer
+from ivy.transpiler.utils import pickling_utils
+from ivy.transpiler.utils.ast_utils import (
     ast_to_source_code,
     is_super_call_node,
 )
-from ....utils.origin_utils import ORIGI_INFO
-from ..base_transformer import (
+from ivy.transpiler.utils.origin_utils import ORIGI_INFO
+from ivy.transpiler.transformations.transformers.base_transformer import (
     BaseTransformer,
 )
-from ..rename_transformer.base_transformer import (
+from ivy.transpiler.transformations.transformers.rename_transformer.base_transformer import (
     BaseRenameTransformer,
 )
 
diff --git a/ivy/transpiler/transformations/transformers/inplace_update_transformer/base_transformer.py b/ivy/transpiler/transformations/transformers/inplace_update_transformer/base_transformer.py
@@ -1,21 +1,20 @@
-# global
+
 import copy
 import gast
 import re
 
-# local
-from ...configurations.base_transformer_config import (
+from ivy.transpiler.transformations.configurations.base_transformer_config import (
     BaseTransformerConfig,
 )
-from ...transformer import Transformer
-from ..base_transformer import (
+from ivy.transpiler.transformations.transformer import Transformer
+from ivy.transpiler.transformations.transformers.base_transformer import (
     BaseTransformer,
 )
-from ....utils.api_utils import (
+from ivy.transpiler.utils.api_utils import (
     TRANSLATED_OBJ_PREFIX,
     TRANSLATED_OBJ_SUFFIX,
 )
-from ....utils.ast_utils import ast_to_source_code, set_parents
+from ivy.transpiler.utils.ast_utils import ast_to_source_code, set_parents
 
 
 def clean_function_name(func_name):
diff --git a/ivy/transpiler/transformations/transformers/method_transformer/base_transformer.py b/ivy/transpiler/transformations/transformers/method_transformer/base_transformer.py
@@ -1,9 +1,8 @@
-# local
-from ...configurations.base_transformer_config import (
+from ivy.transpiler.transformations.configurations.base_transformer_config import (
     BaseTransformerConfig,
 )
-from ...transformer import Transformer
-from ..base_transformer import (
+from ivy.transpiler.transformations.transformer import Transformer
+from ivy.transpiler.transformations.transformers.base_transformer import (
     BaseTransformer,
 )
 
diff --git a/ivy/transpiler/transformations/transformers/method_transformer/frontend_torch_method_transformer.py b/ivy/transpiler/transformations/transformers/method_transformer/frontend_torch_method_transformer.py
@@ -1,33 +1,31 @@
-# global
 import builtins
 import gast
 
-# local
-from ...configurations.base_transformer_config import (
+from ivy.transpiler.transformations.configurations.base_transformer_config import (
     BaseTransformerConfig,
 )
-from ...transformer import Transformer
-from ....utils.conversion_utils import (
+from ivy.transpiler.transformations.transformer import Transformer
+from ivy.transpiler.utils.conversion_utils import (
     BUILTIN_LIKELY_MODULE_NAMES,
 )
-from ..method_transformer.base_transformer import (
+from ivy.transpiler.transformations.transformers.method_transformer.base_transformer import (
     BaseMethodToFunctionConverter,
 )
-from ....utils.api_utils import (
+from ivy.transpiler.utils.api_utils import (
     is_property,
     is_builtin_method,
     is_method_of_class,
     get_frontend_class,
     is_frontend_api,
     is_ivy_api,
 )
-from ....utils.ast_utils import (
+from ivy.transpiler.utils.ast_utils import (
     ast_to_source_code,
     is_super_call_node,
     MODULE_TO_ALIAS,
     get_function_vars,
 )
-from ... import transformer_globals as glob
+from ivy.transpiler.transformations.transformer_globals import CONFLICTING_METHODS
 
 
 class FrontendTorchMethodToFunctionConverter(BaseMethodToFunctionConverter):
@@ -90,7 +88,7 @@ def visit_Attribute(self, node):
                 node = new_call
 
                 # add the transformed method to the CONFLICTING_METHODS set
-                glob.CONFLICTING_METHODS.add(right)
+                CONFLICTING_METHODS.add(right)
 
                 return node
 
@@ -163,7 +161,7 @@ def visit_Call(self, node):
         new_node = gast.Call(func=new_func, args=new_args, keywords=node.keywords)
 
         # add the transformed method to the CONFLICTING_METHODS set
-        glob.CONFLICTING_METHODS.add(right)
+        CONFLICTING_METHODS.add(right)
 
         """
         Motivating example for using the @handle_methods decorator.
diff --git a/ivy/transpiler/transformations/transformers/method_transformer/ivy_method_transformer.py b/ivy/transpiler/transformations/transformers/method_transformer/ivy_method_transformer.py
@@ -1,34 +1,32 @@
-# global
 import gast
-import ivy
 import re
 
-# local
-from ...configurations.base_transformer_config import (
+import ivy
+from ivy.transpiler.transformations.configurations.base_transformer_config import (
     BaseTransformerConfig,
 )
-from ...transformer import Transformer
-from ....utils.conversion_utils import (
+from ivy.transpiler.transformations.transformer import Transformer
+from ivy.transpiler.utils.conversion_utils import (
     BUILTIN_LIKELY_MODULE_NAMES,
 )
-from ..method_transformer.base_transformer import (
+from ivy.transpiler.transformations.transformers.method_transformer.base_transformer import (
     BaseMethodToFunctionConverter,
 )
-from ....utils.api_utils import (
+from ivy.transpiler.utils.api_utils import (
     is_property,
     is_builtin_method,
     is_method_of_class,
     is_frontend_api,
     is_ivy_api,
     get_function_from_modules,
 )
-from ....utils.ast_utils import (
+from ivy.transpiler.utils.ast_utils import (
     ast_to_source_code,
     is_super_call_node,
     MODULE_TO_ALIAS,
     get_function_vars,
 )
-from ... import transformer_globals as glob
+from ivy.transpiler.transformations.transformer_globals import CONFLICTING_METHODS
 
 
 class IvyMethodToFunctionConverter(BaseMethodToFunctionConverter):
@@ -107,7 +105,7 @@ def visit_Attribute(self, node):
             node = new_call
 
             # add the transformed method to the CONFLICTING_METHODS set
-            glob.CONFLICTING_METHODS.add(right)
+            CONFLICTING_METHODS.add(right)
 
         return node
 
@@ -176,7 +174,7 @@ def visit_Call(self, node):
         new_node = gast.Call(func=new_func, args=new_args, keywords=node.keywords)
 
         # add the transformed method to the CONFLICTING_METHODS set
-        glob.CONFLICTING_METHODS.add(right)
+        CONFLICTING_METHODS.add(right)
 
         return new_node
 
diff --git a/ivy/transpiler/transformations/transformers/method_transformer/native_torch_method_transformer.py b/ivy/transpiler/transformations/transformers/method_transformer/native_torch_method_transformer.py
@@ -1,23 +1,21 @@
-# global
 import gast
 import importlib
 
-# local
-from ...configurations.base_transformer_config import (
+from ivy.transpiler.transformations.configurations.base_transformer_config import (
     BaseTransformerConfig,
 )
-from ...transformer import Transformer
-from ....utils.conversion_utils import (
+from ivy.transpiler.transformations.transformer import Transformer
+from ivy.transpiler.utils.conversion_utils import (
     BUILTIN_LIKELY_MODULE_NAMES,
 )
-from ..method_transformer.base_transformer import (
+from ivy.transpiler.transformations.transformers.method_transformer.base_transformer import (
     BaseMethodToFunctionConverter,
 )
-from ....utils.api_utils import (
+from ivy.transpiler.utils.api_utils import (
     is_method_of_class,
     get_hf_class,
 )
-from ....utils.ast_utils import (
+from ivy.transpiler.utils.ast_utils import (
     ast_to_source_code,
     MODULE_TO_ALIAS,
 )

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,8 @@`
`1`		`-# local`
`2`		`-from ...configurations.base_transformer_config import (`
	`1`	`+from ivy.transpiler.transformations.configurations.base_transformer_config import (`
`3`	`2`	`BaseTransformerConfig,`
`4`	`3`	`)`
`5`		`-from ...transformer import Transformer`
`6`		`-from ..base_transformer import (`
	`4`	`+from ivy.transpiler.transformations.transformer import Transformer`
	`5`	`+from ivy.transpiler.transformations.transformers.base_transformer import (`
`7`	`6`	`BaseTransformer,`
`8`	`7`	`)`
`9`	`8`
Original file line number	Diff line number	Diff line change
`@@ -1,23 +1,21 @@`
`1`		`-# global`
`2`	`1`	`import gast`
`3`	`2`	`import importlib`
`4`	`3`
`5`		`-# local`
`6`		`-from ...configurations.base_transformer_config import (`
	`4`	`+from ivy.transpiler.transformations.configurations.base_transformer_config import (`
`7`	`5`	`BaseTransformerConfig,`
`8`	`6`	`)`
`9`		`-from ...transformer import Transformer`
`10`		`-from ....utils.conversion_utils import (`
	`7`	`+from ivy.transpiler.transformations.transformer import Transformer`
	`8`	`+from ivy.transpiler.utils.conversion_utils import (`
`11`	`9`	`BUILTIN_LIKELY_MODULE_NAMES,`
`12`	`10`	`)`
`13`		`-from ..method_transformer.base_transformer import (`
	`11`	`+from ivy.transpiler.transformations.transformers.method_transformer.base_transformer import (`
`14`	`12`	`BaseMethodToFunctionConverter,`
`15`	`13`	`)`
`16`		`-from ....utils.api_utils import (`
	`14`	`+from ivy.transpiler.utils.api_utils import (`
`17`	`15`	`is_method_of_class,`
`18`	`16`	`get_hf_class,`
`19`	`17`	`)`
`20`		`-from ....utils.ast_utils import (`
	`18`	`+from ivy.transpiler.utils.ast_utils import (`
`21`	`19`	`ast_to_source_code,`
`22`	`20`	`MODULE_TO_ALIAS,`
`23`	`21`	`)`