move is_thor() is_tegra_platform() from dynamo.utils to utils to avoid circular import (#3851)

Author: lanluo-nvidia

py/torch_tensorrt/_utils.py

@@ -65,6 +65,12 @@ def is_tensorrt_version_supported(min_version: str) -> bool:
         return False
 
 
+def is_tegra_platform() -> bool:
+    if torch.cuda.get_device_capability() in [(8, 7), (7, 2)]:
+        return True
+    return False
+
+
 def is_thor() -> bool:
     if torch.cuda.get_device_capability() in [(11, 0)]:
         return True

py/torch_tensorrt/dynamo/backend/backends.py

@@ -10,6 +10,7 @@
 from torch._dynamo.backends.common import aot_autograd
 from torch._dynamo.utils import detect_fake_mode
 from torch._functorch.aot_autograd import aot_export_joint_simple
+from torch_tensorrt._utils import is_tegra_platform
 from torch_tensorrt.dynamo import CompilationSettings
 from torch_tensorrt.dynamo._compiler import compile_module
 from torch_tensorrt.dynamo.lowering import (
@@ -20,7 +21,6 @@
     repair_input_aliasing,
 )
 from torch_tensorrt.dynamo.utils import (
-    is_tegra_platform,
     parse_dynamo_kwargs,
     prepare_inputs,
     set_log_level,

py/torch_tensorrt/dynamo/lowering/passes/_aten_lowering_pass.py

@@ -2,8 +2,8 @@
 from typing import Any, Callable, Optional, Sequence, Union
 
 import torch
+from torch_tensorrt._utils import is_tegra_platform
 from torch_tensorrt.dynamo._settings import CompilationSettings
-from torch_tensorrt.dynamo.utils import is_tegra_platform
 
 from .complex_graph_rewrite import complex_graph_detection
 from .constant_folding import constant_fold

py/torch_tensorrt/dynamo/utils.py

@@ -853,15 +853,3 @@ def get_output_dtypes(output: Any, truncate_doulbe: bool = False) -> List[dtype]
             f"got unexpected type {type(output)}, expected type is a torch.fx.node.Node or a tuple/list of torch.fx.node.Node"
         )
     return output_dtypes
-
-
-def is_tegra_platform() -> bool:
-    if torch.cuda.get_device_capability() in [(8, 7), (7, 2)]:
-        return True
-    return False
-
-
-def is_thor() -> bool:
-    if torch.cuda.get_device_capability() in [(11, 0)]:
-        return True
-    return False

tests/py/dynamo/conversion/test_arange_aten.py

@@ -5,7 +5,7 @@
 import torch_tensorrt
 from parameterized import parameterized
 from torch.testing._internal.common_utils import run_tests
-from torch_tensorrt.dynamo.utils import is_tegra_platform, is_thor
+from torch_tensorrt._utils import is_tegra_platform, is_thor
 
 from .harness import DispatchTestCase
 

tests/py/dynamo/conversion/test_cumsum_aten.py

@@ -5,7 +5,7 @@
 import torch_tensorrt
 from parameterized import parameterized
 from torch.testing._internal.common_utils import run_tests
-from torch_tensorrt.dynamo.utils import is_tegra_platform, is_thor
+from torch_tensorrt._utils import is_tegra_platform, is_thor
 
 from .harness import DispatchTestCase
 

tests/py/dynamo/conversion/test_index_aten.py

@@ -6,7 +6,7 @@
 from parameterized import parameterized
 from torch.testing._internal.common_utils import run_tests
 from torch_tensorrt import Input
-from torch_tensorrt.dynamo.utils import is_tegra_platform, is_thor
+from torch_tensorrt._utils import is_tegra_platform, is_thor
 
 from .harness import DispatchTestCase
 

tests/py/dynamo/conversion/test_nonzero_aten.py

@@ -6,7 +6,7 @@
 from parameterized import parameterized
 from torch.testing._internal.common_utils import run_tests
 from torch_tensorrt import Input
-from torch_tensorrt.dynamo.utils import is_tegra_platform, is_thor
+from torch_tensorrt._utils import is_tegra_platform, is_thor
 
 from .harness import DispatchTestCase
 

tests/py/dynamo/conversion/test_sym_size.py

@@ -4,7 +4,7 @@
 import torch.nn as nn
 from parameterized import parameterized
 from torch.testing._internal.common_utils import run_tests
-from torch_tensorrt.dynamo.utils import is_thor
+from torch_tensorrt._utils import is_thor
 
 from .harness import DispatchTestCase
 

tests/py/dynamo/runtime/test_000_compilation_settings.py

@@ -4,8 +4,7 @@
 import torch
 import torch_tensorrt
 from torch.testing._internal.common_utils import TestCase, run_tests
-from torch_tensorrt._utils import is_tensorrt_version_supported
-from torch_tensorrt.dynamo.utils import is_tegra_platform
+from torch_tensorrt._utils import is_tegra_platform, is_tensorrt_version_supported
 
 from packaging.version import Version