chore: Nest it to dynamo/fx_ts_compat

Signed-off-by: Dheeraj Peri <[email protected]>

Author: peri044

.circleci/config.yml

@@ -711,13 +711,13 @@ commands:
 # =================== FX tests end ======================== #
 
 # =================== Dynamo tests start ======================== #
-  test-dynamo_core:
+  test-dynamo-fx_ts_core:
     description: "Test the Dynamo core"
     steps:
       - run:
           name: Run Dynamo core tests
           command: |
-            cd py/torch_tensorrt/dynamo/test
+            cd py/torch_tensorrt/dynamo/fx_ts_compat/test
             pushd core/
             pytest --junitxml=/tmp/artifacts/test_results/dynamo/core/test_results.xml
             popd
@@ -727,13 +727,13 @@ commands:
       - store_artifacts:
           path: /tmp/testlogs
 
-  test-dynamo_converters_acc:
+  test-dynamo-fx_ts_converters_acc:
     description: "Test the Dynamo acc converters"
     steps:
       - run:
           name: Run FX converter tests
           command: |
-            cd py/torch_tensorrt/dynamo/test
+            cd py/torch_tensorrt/dynamo/fx_ts_compat/test
             pushd converters/acc_op/
             pytest --junitxml=/tmp/artifacts/test_results/dynamo/converters/acc_op/test_results.xml
             popd
@@ -743,13 +743,13 @@ commands:
       - store_artifacts:
           path: /tmp/testlogs
 
-  test-dynamo_converters_aten:
+  test-dynamo-fx_ts_converters_aten:
     description: "Test the dynamo aten converters"
     steps:
       - run:
           name: Run dynamo converter tests
           command: |
-            cd py/torch_tensorrt/dynamo/test
+            cd py/torch_tensorrt/dynamo/fx_ts_compat/test
             pushd converters/aten_op/
             pytest --junitxml=/tmp/artifacts/test_results/dynamo/converters/aten_op/test_results.xml
             popd
@@ -759,13 +759,13 @@ commands:
       - store_artifacts:
           path: /tmp/testlogs
 
-  test-dynamo_converters_vanilla:
+  test-dynamo-fx_ts_converters_vanilla:
     description: "Test the dynamo vanilla converters"
     steps:
       - run:
           name: Run dynamo converter tests
           command: |
-            cd py/torch_tensorrt/dynamo/test
+            cd py/torch_tensorrt/dynamo/fx_ts_compat/test
             pushd converters/vanilla/
             pytest --junitxml=/tmp/artifacts/test_results/dynamo/converters/vanilla/test_results.xml
             popd
@@ -775,13 +775,13 @@ commands:
       - store_artifacts:
           path: /tmp/testlogs
 
-  test-dynamo_passes:
+  test-dynamo-fx_ts_passes:
     description: "Test the dynamo passes"
     steps:
       - run:
           name: Run dynamo passes
           command: |
-            cd py/torch_tensorrt/dynamo/test
+            cd py/torch_tensorrt/dynamo/fx_ts_compat/test
             pushd passes
             list_passes=$(ls | grep -v test_setitem*)
             pytest $list_passes --junitxml=/tmp/artifacts/test_results/dynamo/passes/test_results.xml
@@ -791,13 +791,13 @@ commands:
       - store_artifacts:
           path: /tmp/testlogs
 
-  test-dynamo_tools:
+  test-dynamo-fx_ts_tools:
     description: "Test the dynamo tools"
     steps:
       - run:
           name: Run dynamo tools
           command: |
-            cd py/torch_tensorrt/dynamo/test
+            cd py/torch_tensorrt/dynamo/fx_ts_compat/test
             pushd tools
             pytest --junitxml=/tmp/artifacts/test_results/dynamo/tools/test_results.xml
             popd
@@ -806,13 +806,13 @@ commands:
       - store_artifacts:
           path: /tmp/testlogs
 
-  test-dynamo_trt_lower:
+  test-dynamo-fx_ts_trt_lower:
     description: "Test the dynamo TRT lowering"
     steps:
       - run:
           name: Run dynamo TRT lowering
           command: |
-            cd py/torch_tensorrt/dynamo/test
+            cd py/torch_tensorrt/dynamo/fx_ts_compat/test
             pushd trt_lower
             pytest --junitxml=/tmp/artifacts/test_results/dynamo/trt_lower/test_results.xml
             popd
@@ -821,13 +821,13 @@ commands:
       - store_artifacts:
           path: /tmp/testlogs
 
-  test-dynamo_tracer:
+  test-dynamo-fx_ts_tracer:
     description: "Test all dynamo tracers"
     steps:
       - run:
           name: Run dynamo tracer
           command: |
-            cd py/torch_tensorrt/dynamo/test
+            cd py/torch_tensorrt/dynamo/fx_ts_compat/test
             pushd tracer
             list_tracer=$(ls | grep -v test_dispatch_*)
             pytest $list_tracer --junitxml=/tmp/artifacts/test_results/fx/tracer/test_results.xml
@@ -837,13 +837,13 @@ commands:
       - store_artifacts:
           path: /tmp/testlogs
 
-  test-dynamo_tracer_acc:
+  test-dynamo-fx_ts_tracer_acc:
     description: "Test the dynamo acc tracer only"
     steps:
       - run:
           name: Run dynamo tracer
           command: |
-            cd py/torch_tensorrt/dynamo/test
+            cd py/torch_tensorrt/dynamo/fx_ts_compat/test
             pushd tracer
             list_tracer=$(ls | grep test_acc)
             pytest $list_tracer --junitxml=/tmp/artifacts/test_results/dynamo/tracer/test_results.xml
@@ -853,13 +853,13 @@ commands:
       - store_artifacts:
           path: /tmp/testlogs
 
-  test-dynamo_quant:
+  test-dynamo-fx_ts_quant:
     description: "Test the dynamo quant"
     steps:
       - run:
           name: Run dynamo quant tests
           command: |
-            cd py/torch_tensorrt/dynamo/test
+            cd py/torch_tensorrt/dynamo/fx_ts_compat/test
             pushd quant/
             pytest --junitxml=/tmp/artifacts/test_results/dynamo/quant/test_results.xml
             popd
@@ -869,42 +869,42 @@ commands:
       - store_artifacts:
           path: /tmp/testlogs
 
-  test-dynamo:
+  test-dynamo-fx_ts:
     description: "Test the dynamo backend"
     steps:
       - run:
           name: Run dynamo tests
           command: |
             mkdir -p /tmp/artifacts/test_results
-      - test-dynamo_converters_acc
-      - test-dynamo_converters_aten
-      - test-dynamo_converters_vanilla
-      - test-dynamo_passes
-      - test-dynamo_tools
-      - test-dynamo_trt_lower
-      - test-dynamo_tracer
-      - test-dynamo_core
-      - test-dynamo_quant
+      - test-dynamo-fx_ts_converters_acc
+      - test-dynamo-fx_ts_converters_aten
+      - test-dynamo-fx_ts_converters_vanilla
+      - test-dynamo-fx_ts_passes
+      - test-dynamo-fx_ts_tools
+      - test-dynamo-fx_ts_trt_lower
+      - test-dynamo-fx_ts_tracer
+      - test-dynamo-fx_ts_core
+      - test-dynamo-fx_ts_quant
       - store_test_results:
           path: /tmp/artifacts
       - store_artifacts:
           path: /tmp/testlogs
 
-  test-dynamo-no-aten:
+  test-dynamo-fx_ts-no-aten:
     description: "Test the dynamo backend without aten operators"
     steps:
       - run:
           name: Run dynamo tests without aten ops
           command: |
             mkdir -p /tmp/artifacts/test_results
-      - test-dynamo_converters_acc
-      - test-dynamo_converters_vanilla
-      - test-dynamo_passes
-      - test-dynamo_tools
-      - test-dynamo_trt_lower
-      - test-dynamo_tracer_acc
-      - test-dynamo_core
-      - test-dynamo_quant
+      - test-dynamo-fx_ts_converters_acc
+      - test-dynamo-fx_ts_converters_vanilla
+      - test-dynamo-fx_ts_passes
+      - test-dynamo-fx_ts_tools
+      - test-dynamo-fx_ts_trt_lower
+      - test-dynamo-fx_ts_tracer_acc
+      - test-dynamo-fx_ts_core
+      - test-dynamo-fx_ts_quant
       - store_test_results:
           path: /tmp/artifacts
       - store_artifacts:
@@ -1117,7 +1117,7 @@ jobs:
           command: pip3 install --pre /tmp/dist/x86_64-linux/*cp39-cp39*.whl
       # We install torch after torch-trt because pip automatically enforces the version constraint otherwise
       - dump-test-env
-      - test-dynamo
+      - test-dynamo-fx_ts
 
   test-py-dynamo-x86_64-linux-no-aten:
     parameters:
@@ -1148,7 +1148,7 @@ jobs:
           command: pip3 install --pre /tmp/dist/x86_64-linux/*cp39-cp39*.whl
       # We install torch after torch-trt because pip automatically enforces the version constraint otherwise
       - dump-test-env
-      - test-dynamo-no-aten
+      - test-dynamo-fx_ts-no-aten
 
   package-x86_64-linux:
     parameters:

py/torch_tensorrt/dynamo/fx_ts_compat/Dynamic_Shape_Support.md

@@ -0,0 +1,137 @@
+# PyTorch Operations Dynamic Shape Support Summary
+
+
+
+ | Operation | Test Method | Supports Dynamic Shape | Shape | Num of dimensions | Reason |
+| --- | --- | --- | --- | --- | --- |
+| adaptive_avgpool |     | partially | (-1, -1, 256, 256) | 2   | AdaptiveAvgPool2d and AdaptiveAvgPool3d currently doesn't support dynamic shapes for last two dims. |
+| any |     | no  |     |     | torch.zeros(tuple(\[*input_t.shape\])). Trying to create tensor with negative dimension -1: \[-1, -1, -1, -1\] |
+| as_strided |     | no  |     |     | RuntimeError: setStorage: sizes \[2, 3\], strides \[1, 2\], storage offset 0, and itemsize 8 requiring a storage size of 48 are out of bounds for storage of size 16 |
+| avg_pool | avg_pool2d | yes | (-1,-,1,-1,-1) | 4   |     |
+|     | avg_pool1d | partially | (-1, 3, 3) | 1   |     |
+| batchnorm |     | partially | (-1, 3, -1, -1) | 3   | "Channel dim can't be dynamic for batch norm." |
+| binary_ops |     | yes | (-1,-,1,-1,-1) | 4   |     |
+| cat |     | yes | (-1,-,1,-1,-1) | 4   |     |
+| chunk |     | partially | (-1, 1, 3, -1) | any (not chunk dim) | AssertionError: Can't chunk on dynamic shape dimension! |
+| clamp |     | yes | (-1,-,1,-1,-1) |     |     |
+| convolution | conv2d | partially | (-1, 3, -1, -1) | 3   | AssertionError: Channel dim can't be dynamic for convolution. |
+|     | conv1d | partially | (-1, 3, 3) | 1   |     |
+|     | conv3d | partially | (-1,-,1,-1,-1) | 4   | AssertionError: Channel dim can't be dynamic for convolution. |
+| dequantize |     | yes | (-1,-,1,-1,-1) | 4   |     |
+| eimsum |     | yes | (-1,-,1,-1,-1) | 4   |     |
+| elu |     | yes | (-1,-,1,-1,-1) | 4   |     |
+| embedding |     | yes | (-1,-,1,-1,-1) | 4   |     |
+| eq  | SimpleConverter | yes | (-1,-,1,-1,-1) | 4   |     |
+|     | ConstInputConverter | yes | (-1,-,1,-1,-1) | 4   |     |
+|     | EqMethodConverter | no  | limitation in converter |     | RuntimeError: Trying to create tensor with negative dimension -1: \[-1, -1, -1, -1\] |
+|     | EqOperatorConverter | no  | limitation in converter |     | RuntimeError: Trying to create tensor with negative dimension -1: \[-1, -1, -1, -1\] |
+|     | EqOperatorConstant | partially | (3,-1) | 1   |     |
+|     | EqConverter | no  | limitation in converter |     | RuntimeError: Trying to create tensor with negative dimension -1: \[-1, -1, -1, -1\] |
+| expand |     | no  |     |     | Dynamic shape is not suitable for the expand operation. |
+| flatten |     | yes | (-1, -1, -1, -1, -1) | 5   |     |
+| gelu |     | yes | (-1,-,1,-1,-1) | 4   |     |
+| getitem |     | yes | (-1,-,1,-1,-1) | 4   |     |
+| gt  | EqOperatorSimpleConverter | yes | (-1,-,1,-1,-1) | 4   |     |
+|     | ConstInputConverter | yes | (-1,-,1,-1,-1) | 4   |     |
+|     | GtConverter | no  | limitation in converter |     | RuntimeError: Trying to create tensor with negative dimension -1: \[-1, -1, -1, -1\] |
+|     | GtMethodConverter | no  | limitation in converter |     | RuntimeError: Trying to create tensor with negative dimension -1: \[-1, -1, -1, -1\] |
+|     | GtOperator | no  | limitation in converter |     | RuntimeError: Trying to create tensor with negative dimension -1: \[-1, -1, -1, -1\] |
+|     | EqOperator | no  | limitation in converter |     | RuntimeError: Trying to create tensor with negative dimension -1: \[-1, -1, -1, -1\] |
+| hardsigmoid |     | yes | (-1,-,1,-1,-1) | 4   |     |
+| hardtanh |     | yes | (-1,-,1,-1,-1) | 4   |     |
+| interpolate |     | yes | (-1,-,1,-1,-1) | 4   |     |
+| isinf |     | yes | (-1,-,1,-1,-1) | 4   |     |
+| leaky_relu |     | yes | (-1,-,1,-1,-1) | 4   |     |
+| linear |     | partially | (-1, 3, 5) | 1   | AssertionError: Currently we only support one dynmaic dim for linear and it can't be the last dim. |
+| logical_and |     | yes | (-1, -1, -1, -1) | 4   |     |
+| logical_or |     | yes | (-1, -1, -1, -1) | 4   |     |
+| logical_xor |     | yes | (-1, -1, -1, -1) | 4   |     |
+| lt  |     | yes | (-1, -1, -1, -1) | 4   |     |
+| masked_fill |     | no  | limitation in converter |     | RuntimeError: Trying to create tensor with negative dimension -1: \[-1, -1, -1, -1\] |
+| mat_mul |     | yes | batch dim |     |     |
+| max | MaxFullReduce | yes | (-1, -1, -1, -1) | 4   |     |
+|     | MaxDimReduce | yes | (-1, -1, -1, -1) | 4   |     |
+|     | MaxMethod | yes | (-1, -1, -1, -1) | 4   |     |
+| maximum |     | yes | (-1, -1, -1, -1) | 4   |     |
+| maxpool | max_pool1d | partially | (1, 1, -1) | 1   | shape is not set to (-1, -1, -1) as reshape dimension with, more than one -1 wildcard is not allowed while adding unsqueeze layer |
+|     | max_pool2d | yes | (-1, -1, -1, -1) | 4   |     |
+|     | max_pool3d | yes | (-1, -1, -1, -1, -1) | 5   |     |
+| min | MinFullReduce | yes | (-1, -1, -1, -1) | 4   |     |
+|     | MinDimReduce | yes | (-1, -1, -1, -1) | 4   |     |
+|     | MinMethod | yes | (-1, -1, -1, -1) | 4   |     |
+| minimum |     | yes | (-1, -1, -1, -1) | 4   |     |
+| narrow |     | partially | (-1, 3, -1, -1) | 3   | AssertionError: Can't chunk on dynamic shape dimension! |
+| ne  | NeFunctionConverter | yes | (-1, -1, -1, -1) | 4   |     |
+|     | NeMethodConverter | yes | (-1, -1, -1, -1) | 4   |     |
+|     | NeOperatorConverter | yes | (-1, -1, -1, -1) | 4   |     |
+|     | ConstInputConverter | yes | (-1, -1, -1, -1) | 4   |     |
+|     | NeOperatorConstantConverter | partially | (3, -1) | 1   |     |
+| new_ones |     | yes | (-1, -1, -1, -1) | 4   |     |
+| numel |     | no  | limitation in converter |     | RuntimeError: numel does not support dynamic shapes. |
+| pad |     | no  | limitation in converter |     | test\_pad\_with\_dynamic\_shape\_four\_dimensions\_0\_2d (deeplearning.trt.torch\_tensorrt.py.torch\_tensorrt.fx.test.converters.acc\_op.test\_pad.TestPadConverter) ... \[07/15/2022-09:23:18\] \[TRT\] \[E\] 2: \[intInterval.cpp::max::26\] Error Code 2: Internal Error (Assertion !empty() failed. |
+| permute |     | yes | (-1, -1, -1, -1) | 4   |     |
+| prod |     | yes | (-1, -1, -1, -1) | 4   |     |
+| quantize\_per\_tensor |     | yes | (-1, -1, -1, -1) | 4   |     |
+| reduce op |     | yes | (-1, -1, -1, -1) | 4   |     |
+| relu |     | yes | (-1, -1, -1, -1) | 4   |     |
+| repeat interleave |     | partially | (-1, 3, 2) | 1   | AssertionError: Currently we don't support unsqueeze with more than one dynamic dims. |
+| reshape |     | yes | (-1, -1, -1, -1) | 4   |     |
+| selu |     | yes | (-1, -1, -1, -1) | 4   |     |
+| sigmoid |     | yes | (-1,-,1,-1,-1) | 4   |     |
+| silu |     | yes | (-1,-,1,-1,-1) | 4   |     |
+| size |     | yes | (-1, -1, -1, -1) | 4   |     |
+| softmax |     | yes | (-1, -1, -1, -1) | 4   |     |
+| softsign |     | yes | (-1, -1, -1, -1) | 4   |     |
+| split |     | partially | (-1, 10, -1) | 2   | AssertionError: Can't chunk on dynamic shape dimension! |
+| squeeze |     | partially | (1, -1, 2) | 1   | AssertionError: Currently more than one dynamic dim for input to squeeze is not supported. |
+| std |     | yes | (-1, -1, -1, -1) | 4   |     |
+| tanh |     | yes | (-1, -1, -1, -1) | 4   |     |
+| tile |     | yes | (-1, -1, -1, -1) | 4   |     |
+| to_dtype | int | yes | (-1, -1, -1, -1) | 4   |     |
+|     | float | yes | (-1, -1, -1, -1) | 4   |     |
+| topk |     | yes | (-1, -1, -1, -1) | 4   |     |
+| transpose_convolution | conv_transpose2d | partially | (-1, 3, -1, -1) | 3   |     |
+|     | conv_transpose3d | partially | (-1, 3, -1, -1, -1) | 4   |     |
+| type_as |     | yes | (-1, -1, -1, -1) | 4   | RuntimeError: ShapeProp error for: node=%type\_1 : \[#users=1\] = call\_method\[target=type\](args = (%input_1,), kwargs = {dtype: torch.float32}) with meta={} |
+| unary ops |     | yes | (-1, -1, -1, -1) | 4   |     |
+| unsqueeze |     | partially | (-1, 2, 3) | 1   | AssertionError: Currently we don't support unsqueeze with more than one dynamic dims. |
+| where |     | no  | limitation in converter |     | torch.broadcast_shape can not handle -1 dimension in shape \[-1, 2, 2\] |
+
+
+
+Binary Ops Include following operations:
+|Binary Ops       |
+|----------|
+|add       |
+|sub       |
+|div       |
+|mul       |
+|floor_div |
+|fmod      |
+|floor_divide|
+|pow       |
+
+
+Unary Ops Include following operations:
+|Unary Ops     |
+|----------|
+|rsqrt     |
+|sin       |
+|cos       |
+|tan       |
+|sinh      |
+|cosh      |
+|asin      |
+|acos      |
+|atan      |
+|abs       |
+|neg       |
+|reciprocal|
+|sqrt      |
+|log       |
+|exp       |
+|floor     |
+|ceil      |
+|sign      |
+
+Note: For more information about the test method, please refer to the operation test files. Additionally, test files include information about errors encountered during dynamic shape testing.

py/torch_tensorrt/dynamo/README.md renamed to py/torch_tensorrt/dynamo/fx_ts_compat/README.md

@@ -13,7 +13,7 @@
 from torch.fx.node import _get_qualified_name
 from torch.fx.passes.shape_prop import TensorMetadata
 
-from torch_tensorrt.dynamo import CONVERTERS
+from torch_tensorrt.dynamo.fx_ts_compat import CONVERTERS
 from .input_tensor_spec import InputTensorSpec
 from torch_tensorrt.fx.observer import Observer
 from .utils import get_dynamic_dims, LowerPrecision, torch_dtype_to_trt

py/torch_tensorrt/dynamo/__init__.py renamed to py/torch_tensorrt/dynamo/fx_ts_compat/__init__.py

@@ -8,7 +8,7 @@
 from torch.fx.passes.pass_manager import inplace_wrapper, PassManager
 from torch.fx.passes.shape_prop import ShapeProp
 from torch.fx.passes.splitter_base import generate_inputs_for_submodules, SplitResult
-from torch_tensorrt.dynamo.utils import LowerPrecision
+from torch_tensorrt.dynamo.fx_ts_compat.utils import LowerPrecision
 from torch_tensorrt import _Input
 from ..input_tensor_spec import InputTensorSpec