fix: Reorganize testing directories

Author: gs-olive

.circleci/config.yml

@@ -754,14 +754,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
@@ -806,9 +822,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
@@ -1079,7 +1095,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 @@
-from utils import lower_graph_testing
-from torch.testing._internal.common_utils import run_tests, TestCase
 import torch
 import torch_tensorrt
+from torch.testing._internal.common_utils import TestCase, run_tests
+
+from ..testing_utilities import lower_graph_testing
 
 
 class TestFakeTensors(TestCase):

tests/py/dynamo/backend/test_pre_aot_lowering.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/backend/test_specialized_models.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):