Merge pull request #2255 from pytorch/testing_reorg

fix: Reorganize Dynamo testing directories

Author: narendasan

.circleci/config.yml

@@ -756,14 +756,30 @@ commands:
 
 # =================== Dynamo tests start ======================== #
 
-  test-dynamo-torch_compile:
-    description: "Test Dynamo torch_compile tests"
+  test-dynamo-backend:
+    description: "Test Dynamo backend tests"
     steps:
       - run:
-          name: Run Dynamo torch_compile tests
+          name: Run Dynamo backend tests
           command: |
             cd tests/py/dynamo/backend/
-            pytest --junitxml=/tmp/artifacts/test_results/dynamo/torch_compile/test_results.xml
+            TESTS_TO_RUN=$(circleci tests glob "test_*.py" | circleci tests split --split-by=timings)
+            pytest --junitxml=/tmp/artifacts/test_results/dynamo/backend/test_results.xml $TESTS_TO_RUN
+
+      - store_test_results:
+          path: /tmp/artifacts
+      - store_artifacts:
+          path: /tmp/testlogs
+
+  test-dynamo-shared_utilities:
+    description: "Test Dynamo shared utilities tests"
+    steps:
+      - run:
+          name: Run Dynamo lowering, partitioning, runtime tests
+          command: |
+            cd tests/py/dynamo/
+            TESTS_TO_RUN=$(circleci tests glob "runtime/test_*.py" "partitioning/test_*.py" "lowering/test_*.py" | circleci tests split --split-by=timings)
+            pytest --junitxml=/tmp/artifacts/test_results/dynamo/shared_utilities/test_results.xml $TESTS_TO_RUN
 
       - store_test_results:
           path: /tmp/artifacts
@@ -808,9 +824,9 @@ commands:
       - run:
           name: Run Dynamo converter tests
           command: |
-            cd tests/py/dynamo/converters
+            cd tests/py/dynamo/conversion
             TESTS_TO_RUN=$(circleci tests glob "test_*.py" | circleci tests split --split-by=timings)
-            pytest --junitxml=/tmp/artifacts/test_results/dynamo/converters/test_results.xml $TESTS_TO_RUN
+            pytest --junitxml=/tmp/artifacts/test_results/dynamo/conversion/test_results.xml $TESTS_TO_RUN
 
       - store_test_results:
           path: /tmp/artifacts
@@ -1103,7 +1119,8 @@ jobs:
       # We install torch after torch-trt because pip automatically enforces the version constraint otherwise
       - dump-test-env
       - test-dynamo-converters
-      - test-dynamo-torch_compile
+      - test-dynamo-backend
+      - test-dynamo-shared_utilities
       - test-dynamo-models_torch_compile
       - test-dynamo-models_torch_export
 

tests/py/dynamo/__init__.py

@@ -1,9 +1,11 @@
+from copy import deepcopy
+
 import torch
 import torch_tensorrt
+from torch.testing._internal.common_utils import TestCase, run_tests
 from torch_tensorrt.dynamo.partitioning import fast_partition
-from torch.testing._internal.common_utils import run_tests, TestCase
-from copy import deepcopy
-from utils import lower_graph_testing, DECIMALS_OF_AGREEMENT
+
+from ..testing_utilities import DECIMALS_OF_AGREEMENT, lower_graph_testing
 
 
 class TestTRTModuleNextCompilation(TestCase):

tests/py/dynamo/backend/__init__.py

@@ -1,7 +1,8 @@
 import torch
 import torch_tensorrt
-from utils import lower_graph_testing
-from torch.testing._internal.common_utils import run_tests, TestCase
+from torch.testing._internal.common_utils import TestCase, run_tests
+
+from ..testing_utilities import lower_graph_testing
 
 
 class TestMaxPool1D(TestCase):

tests/py/dynamo/backend/test_backend_compiler.py

@@ -1,7 +1,8 @@
 import torch
 import torch_tensorrt
 from torch.testing._internal.common_utils import TestCase, run_tests
-from utils import lower_graph_testing
+
+from ..testing_utilities import lower_graph_testing
 
 
 class TestFakeTensors(TestCase):

tests/py/dynamo/backend/test_pre_aot_lowering.py

@@ -1,9 +1,9 @@
 import torch
 import torch.nn as nn
-from harness import DispatchTestCase
 from parameterized import parameterized
 from torch.testing._internal.common_utils import run_tests
-from torch_tensorrt import Input
+
+from .harness import DispatchTestCase
 
 
 class TestAbsConverter(DispatchTestCase):

tests/py/dynamo/backend/test_specialized_models.py

@@ -1,9 +1,9 @@
 import torch
 import torch.nn as nn
-from harness import DispatchTestCase
 from parameterized import parameterized
 from torch.testing._internal.common_utils import run_tests
-from torch_tensorrt import Input
+
+from .harness import DispatchTestCase
 
 
 class TestAcosConverter(DispatchTestCase):

tests/py/dynamo/conversion/__init__.py

@@ -1,9 +1,9 @@
 import torch
 import torch.nn as nn
-from harness import DispatchTestCase
 from parameterized import parameterized
 from torch.testing._internal.common_utils import run_tests
-from torch_tensorrt import Input
+
+from .harness import DispatchTestCase
 
 
 class TestAcoshConverter(DispatchTestCase):

tests/py/dynamo/converters/harness.py renamed to tests/py/dynamo/conversion/harness.py

@@ -3,7 +3,7 @@
 from torch.testing._internal.common_utils import run_tests
 from torch_tensorrt import Input
 
-from harness import DispatchTestCase
+from .harness import DispatchTestCase
 
 
 class TestAdaptiveAvgPoolConverter(DispatchTestCase):

tests/py/dynamo/converters/test_abs_aten.py renamed to tests/py/dynamo/conversion/test_abs_aten.py

@@ -1,9 +1,10 @@
 import torch
 import torch.nn as nn
-from harness import DispatchTestCase
 from parameterized import parameterized
 from torch.testing._internal.common_utils import run_tests
 
+from .harness import DispatchTestCase
+
 
 class TestAmaxConverter(DispatchTestCase):
     @parameterized.expand(

tests/py/dynamo/converters/test_acos_aten.py renamed to tests/py/dynamo/conversion/test_acos_aten.py

@@ -1,9 +1,9 @@
 import torch
 import torch.nn as nn
-from harness import DispatchTestCase
 from parameterized import parameterized
 from torch.testing._internal.common_utils import run_tests
-from torch_tensorrt import Input
+
+from .harness import DispatchTestCase
 
 
 class TestAsinConverter(DispatchTestCase):

tests/py/dynamo/converters/test_acosh_aten.py renamed to tests/py/dynamo/conversion/test_acosh_aten.py

@@ -1,9 +1,9 @@
 import torch
 import torch.nn as nn
-from harness import DispatchTestCase
 from parameterized import parameterized
 from torch.testing._internal.common_utils import run_tests
-from torch_tensorrt import Input
+
+from .harness import DispatchTestCase
 
 
 class TestAsinhConverter(DispatchTestCase):

tests/py/dynamo/converters/test_adaptive_avgpool_aten.py renamed to tests/py/dynamo/conversion/test_adaptive_avgpool_aten.py

@@ -1,9 +1,9 @@
 import torch
 import torch.nn as nn
-from harness import DispatchTestCase
 from parameterized import parameterized
 from torch.testing._internal.common_utils import run_tests
-from torch_tensorrt import Input
+
+from .harness import DispatchTestCase
 
 
 class TestAtanConverter(DispatchTestCase):

tests/py/dynamo/converters/test_amax_aten.py renamed to tests/py/dynamo/conversion/test_amax_aten.py

@@ -1,9 +1,9 @@
 import torch
 import torch.nn as nn
-from harness import DispatchTestCase
 from parameterized import parameterized
 from torch.testing._internal.common_utils import run_tests
-from torch_tensorrt import Input
+
+from .harness import DispatchTestCase
 
 
 class TestAtanhConverter(DispatchTestCase):

tests/py/dynamo/converters/test_asin_aten.py renamed to tests/py/dynamo/conversion/test_asin_aten.py

@@ -1,8 +1,9 @@
 import torch
 from torch.testing._internal.common_utils import run_tests
-from harness import DispatchTestCase
 from torch_tensorrt import Input
 
+from .harness import DispatchTestCase
+
 
 class TestBatchNormConverter(DispatchTestCase):
     def test_batchnorm(self):

tests/py/dynamo/converters/test_asinh_aten.py renamed to tests/py/dynamo/conversion/test_asinh_aten.py

@@ -1,14 +1,14 @@
-from typing import Callable
 import unittest
+from typing import Callable
 
 import torch
 import torch.nn as nn
-
 from parameterized import parameterized
 from torch.testing._internal.common_utils import run_tests
-from harness import DispatchTestCase
 from torch_tensorrt import Input
 
+from .harness import DispatchTestCase
+
 NEED_TEST_BOTH_CONSTANTS_CASE = True
 
 elementwise_ops = [

tests/py/dynamo/converters/test_atan_aten.py renamed to tests/py/dynamo/conversion/test_atan_aten.py

@@ -1,9 +1,10 @@
 import torch
 import torch.nn as nn
-from harness import DispatchTestCase
 from torch.testing._internal.common_utils import run_tests
 from torch_tensorrt.dynamo.conversion import UnsupportedOperatorException
 
+from .harness import DispatchTestCase
+
 
 class TestCloneConverter(DispatchTestCase):
     def test_clone_contiguous(self):

tests/py/dynamo/converters/test_atanh_aten.py renamed to tests/py/dynamo/conversion/test_atanh_aten.py

@@ -2,9 +2,10 @@
 import torch.nn as nn
 from parameterized import parameterized
 from torch.testing._internal.common_utils import run_tests
-from harness import DispatchTestCase
 from torch_tensorrt import Input
 
+from .harness import DispatchTestCase
+
 
 class TestCatConverter(DispatchTestCase):
     @parameterized.expand(

tests/py/dynamo/converters/test_batchnorm_aten.py renamed to tests/py/dynamo/conversion/test_batchnorm_aten.py

@@ -1,9 +1,9 @@
 import torch
 import torch.nn as nn
-from harness import DispatchTestCase
 from parameterized import parameterized
 from torch.testing._internal.common_utils import run_tests
-from torch_tensorrt import Input
+
+from .harness import DispatchTestCase
 
 
 class TestCeilConverter(DispatchTestCase):

tests/py/dynamo/converters/test_binary_ops_aten.py renamed to tests/py/dynamo/conversion/test_binary_ops_aten.py

@@ -1,9 +1,10 @@
 import torch
 from parameterized import param, parameterized
 from torch.testing._internal.common_utils import run_tests
-from harness import DispatchTestCase
 from torch_tensorrt import Input
 
+from .harness import DispatchTestCase
+
 
 class TestClampConverter(DispatchTestCase):
     @parameterized.expand(

tests/py/dynamo/converters/test_casts.py renamed to tests/py/dynamo/conversion/test_casts.py

@@ -1,9 +1,10 @@
 import torch
 from parameterized import param, parameterized
 from torch.testing._internal.common_utils import run_tests
-from harness import DispatchTestCase
 from torch_tensorrt import Input
 
+from .harness import DispatchTestCase
+
 
 class TestConvolutionConverter(DispatchTestCase):
     @parameterized.expand(

tests/py/dynamo/converters/test_cat_aten.py renamed to tests/py/dynamo/conversion/test_cat_aten.py

@@ -1,9 +1,9 @@
 import torch
 import torch.nn as nn
-from harness import DispatchTestCase
 from parameterized import parameterized
 from torch.testing._internal.common_utils import run_tests
-from torch_tensorrt import Input
+
+from .harness import DispatchTestCase
 
 
 class TestCosConverter(DispatchTestCase):

tests/py/dynamo/converters/test_ceil_aten.py renamed to tests/py/dynamo/conversion/test_ceil_aten.py

@@ -1,9 +1,9 @@
 import torch
 import torch.nn as nn
-from harness import DispatchTestCase
 from parameterized import parameterized
 from torch.testing._internal.common_utils import run_tests
-from torch_tensorrt import Input
+
+from .harness import DispatchTestCase
 
 
 class TestCoshConverter(DispatchTestCase):

tests/py/dynamo/converters/test_clamp_aten.py renamed to tests/py/dynamo/conversion/test_clamp_aten.py

@@ -1,9 +1,10 @@
 import torch
 import torch.nn as nn
 from torch.testing._internal.common_utils import run_tests
-from harness import DispatchTestCase
 from torch_tensorrt import Input
 
+from .harness import DispatchTestCase
+
 
 class TestELUConverter(DispatchTestCase):
     def test_elu(self):

tests/py/dynamo/converters/test_convolution_aten.py renamed to tests/py/dynamo/conversion/test_convolution_aten.py

@@ -1,10 +1,11 @@
 import torch
 import torch.nn as nn
-from torch.testing._internal.common_utils import run_tests
-from harness import DispatchTestCase
 from parameterized import param, parameterized
+from torch.testing._internal.common_utils import run_tests
 from torch_tensorrt import Input
 
+from .harness import DispatchTestCase
+
 
 class TestEmbeddingConverter(DispatchTestCase):
     @parameterized.expand(

tests/py/dynamo/converters/test_cos_aten.py renamed to tests/py/dynamo/conversion/test_cos_aten.py

@@ -3,9 +3,10 @@
 
 import torch
 import torch.nn as nn
-from harness import DispatchTestCase
 from torch.testing._internal.common_utils import run_tests
 
+from .harness import DispatchTestCase
+
 
 # TODO: Switch this test back to self.run_test once an implementation exists
 # for a converter that returns a list, such as aten.split

tests/py/dynamo/converters/test_cosh_aten.py renamed to tests/py/dynamo/conversion/test_cosh_aten.py

@@ -1,9 +1,9 @@
 import torch
 import torch.nn as nn
-from harness import DispatchTestCase
 from parameterized import parameterized
 from torch.testing._internal.common_utils import run_tests
-from torch_tensorrt import Input
+
+from .harness import DispatchTestCase
 
 
 class TestExpConverter(DispatchTestCase):

tests/py/dynamo/converters/test_elu_aten.py renamed to tests/py/dynamo/conversion/test_elu_aten.py

@@ -1,9 +1,10 @@
 import torch
 import torch.nn as nn
-from harness import DispatchTestCase
 from parameterized import parameterized
 from torch.testing._internal.common_utils import run_tests
 
+from .harness import DispatchTestCase
+
 
 class TestExpandConverter(DispatchTestCase):
     @parameterized.expand(

tests/py/dynamo/converters/test_embedding_aten.py renamed to tests/py/dynamo/conversion/test_embedding_aten.py

@@ -1,9 +1,9 @@
 import torch
 import torch.nn as nn
-from harness import DispatchTestCase
 from parameterized import parameterized
 from torch.testing._internal.common_utils import run_tests
-from torch_tensorrt import Input
+
+from .harness import DispatchTestCase
 
 
 class TestFloorConverter(DispatchTestCase):

tests/py/dynamo/converters/test_evaluators.py renamed to tests/py/dynamo/conversion/test_evaluators.py

@@ -1,9 +1,10 @@
 import torch
 import torch.nn as nn
 from torch.testing._internal.common_utils import run_tests
-from harness import DispatchTestCase
 from torch_tensorrt import Input
 
+from .harness import DispatchTestCase
+
 
 class TestGeLUConverter(DispatchTestCase):
     def test_gelu(self):