update typing

Author: zewenli98

py/torch_tensorrt/dynamo/_compiler.py

@@ -96,8 +96,8 @@ def cross_compile_for_windows(
     strip_engine_weights: bool = _defaults.STRIP_ENGINE_WEIGHTS,
     immutable_weights: bool = _defaults.IMMUTABLE_WEIGHTS,
     enable_weight_streaming: bool = _defaults.ENABLE_WEIGHT_STREAMING,
-    tiling_optimization_level: Optional[int] = _defaults.TILING_OPTIMIZATION_LEVEL,
-    l2_limit_for_tiling: Optional[int] = _defaults.L2_LIMIT_FOR_TILING,
+    tiling_optimization_level: int = _defaults.TILING_OPTIMIZATION_LEVEL,
+    l2_limit_for_tiling: int = _defaults.L2_LIMIT_FOR_TILING,
     **kwargs: Any,
 ) -> torch.fx.GraphModule:
     """Compile an ExportedProgram module using TensorRT in Linux for Inference in Windows
@@ -171,8 +171,8 @@ def cross_compile_for_windows(
         strip_engine_weights (bool): Strip engine weights from the serialized engine. This is useful when the engine is to be deployed in an environment where the weights are not required.
         immutable_weights (bool): Build non-refittable engines. This is useful for some layers that are not refittable. If this argument is set to true, `strip_engine_weights` and `refit_identical_engine_weights` will be ignored.
         enable_weight_streaming (bool): Enable weight streaming.
-        tiling_optimization_level (Optional[int]): The optimization level of tiling strategies. A Higher level allows TensorRT to spend more time searching for better optimization strategy. (We currently support [0, 1, 2, 3], default is 0)
-        l2_limit_for_tiling (Optional[int]): The target L2 cache usage limit (in bytes) for tiling optimization (default is -1 which means no limit).
+        tiling_optimization_level (int): The optimization level of tiling strategies. A Higher level allows TensorRT to spend more time searching for better optimization strategy. (We currently support [0, 1, 2, 3], default is 0)
+        l2_limit_for_tiling (int): The target L2 cache usage limit (in bytes) for tiling optimization (default is -1 which means no limit).
         **kwargs: Any,
     Returns:
         torch.fx.GraphModule: Compiled FX Module, when run it will execute via TensorRT
@@ -419,8 +419,8 @@ def compile(
     strip_engine_weights: bool = _defaults.STRIP_ENGINE_WEIGHTS,
     immutable_weights: bool = _defaults.IMMUTABLE_WEIGHTS,
     enable_weight_streaming: bool = _defaults.ENABLE_WEIGHT_STREAMING,
-    tiling_optimization_level: Optional[int] = _defaults.TILING_OPTIMIZATION_LEVEL,
-    l2_limit_for_tiling: Optional[int] = _defaults.L2_LIMIT_FOR_TILING,
+    tiling_optimization_level: int = _defaults.TILING_OPTIMIZATION_LEVEL,
+    l2_limit_for_tiling: int = _defaults.L2_LIMIT_FOR_TILING,
     **kwargs: Any,
 ) -> torch.fx.GraphModule:
     """Compile an ExportedProgram module for NVIDIA GPUs using TensorRT
@@ -496,8 +496,8 @@ def compile(
         strip_engine_weights (bool): Strip engine weights from the serialized engine. This is useful when the engine is to be deployed in an environment where the weights are not required.
         immutable_weights (bool): Build non-refittable engines. This is useful for some layers that are not refittable. If this argument is set to true, `strip_engine_weights` and `refit_identical_engine_weights` will be ignored.
         enable_weight_streaming (bool): Enable weight streaming.
-        tiling_optimization_level (Optional[int]): The optimization level of tiling strategies. A Higher level allows TensorRT to spend more time searching for better optimization strategy. (We currently support [0, 1, 2, 3], default is 0)
-        l2_limit_for_tiling (Optional[int]): The target L2 cache usage limit (in bytes) for tiling optimization (default is -1 which means no limit).
+        tiling_optimization_level (int): The optimization level of tiling strategies. A Higher level allows TensorRT to spend more time searching for better optimization strategy. (We currently support [0, 1, 2, 3], default is 0)
+        l2_limit_for_tiling (int): The target L2 cache usage limit (in bytes) for tiling optimization (default is -1 which means no limit).
         **kwargs: Any,
     Returns:
         torch.fx.GraphModule: Compiled FX Module, when run it will execute via TensorRT
@@ -962,8 +962,8 @@ def convert_exported_program_to_serialized_trt_engine(
     strip_engine_weights: bool = _defaults.STRIP_ENGINE_WEIGHTS,
     immutable_weights: bool = _defaults.IMMUTABLE_WEIGHTS,
     enable_weight_streaming: bool = _defaults.ENABLE_WEIGHT_STREAMING,
-    tiling_optimization_level: Optional[int] = _defaults.TILING_OPTIMIZATION_LEVEL,
-    l2_limit_for_tiling: Optional[int] = _defaults.L2_LIMIT_FOR_TILING,
+    tiling_optimization_level: int = _defaults.TILING_OPTIMIZATION_LEVEL,
+    l2_limit_for_tiling: int = _defaults.L2_LIMIT_FOR_TILING,
     **kwargs: Any,
 ) -> bytes:
     """Convert an ExportedProgram to a serialized TensorRT engine
@@ -1027,8 +1027,8 @@ def convert_exported_program_to_serialized_trt_engine(
         strip_engine_weights (bool): Strip engine weights from the serialized engine. This is useful when the engine is to be deployed in an environment where the weights are not required.
         immutable_weights (bool): Build non-refittable engines. This is useful for some layers that are not refittable. If this argument is set to true, `strip_engine_weights` and `refit_identical_engine_weights` will be ignored.
         enable_weight_streaming (bool): Enable weight streaming.
-        tiling_optimization_level (Optional[int]): The optimization level of tiling strategies. A Higher level allows TensorRT to spend more time searching for better optimization strategy. (We currently support [0, 1, 2, 3], default is 0)
-        l2_limit_for_tiling (Optional[int]): The target L2 cache usage limit (in bytes) for tiling optimization (default is -1 which means no limit).
+        tiling_optimization_level (int): The optimization level of tiling strategies. A Higher level allows TensorRT to spend more time searching for better optimization strategy. (We currently support [0, 1, 2, 3], default is 0)
+        l2_limit_for_tiling (int): The target L2 cache usage limit (in bytes) for tiling optimization (default is -1 which means no limit).
     Returns:
         bytes: Serialized TensorRT engine, can either be saved to a file or deserialized via TensorRT APIs
     """

py/torch_tensorrt/dynamo/_settings.py

@@ -95,8 +95,8 @@ class CompilationSettings:
         enable_cross_compile_for_windows (bool): By default this is False means TensorRT engines can only be executed on the same platform where they were built.
             True will enable cross-platform compatibility which allows the engine to be built on Linux and run on Windows
         use_aot_joint_export (bool): Use aot_export_joint_simple, else wrap backend with AOT_autograd, required for distributed tensors
-        tiling_optimization_level (Optional[int]): The optimization level of tiling strategies. A Higher level allows TensorRT to spend more time searching for better optimization strategy. (We currently support [0, 1, 2, 3], default is 0)
-        l2_limit_for_tiling (Optional[int]): The target L2 cache usage limit (in bytes) for tiling optimization (default is -1 which means no limit).
+        tiling_optimization_level (int): The optimization level of tiling strategies. A Higher level allows TensorRT to spend more time searching for better optimization strategy. (We currently support [0, 1, 2, 3], default is 0)
+        l2_limit_for_tiling (int): The target L2 cache usage limit (in bytes) for tiling optimization (default is -1 which means no limit).
     """
 
     enabled_precisions: Set[dtype] = field(default_factory=lambda: ENABLED_PRECISIONS)
@@ -138,8 +138,8 @@ class CompilationSettings:
     enable_weight_streaming: bool = ENABLE_WEIGHT_STREAMING
     enable_cross_compile_for_windows: bool = ENABLE_CROSS_COMPILE_FOR_WINDOWS
     use_aot_joint_export: bool = USE_AOT_JOINT_EXPORT
-    tiling_optimization_level: Optional[int] = TILING_OPTIMIZATION_LEVEL
-    l2_limit_for_tiling: Optional[int] = L2_LIMIT_FOR_TILING
+    tiling_optimization_level: int = TILING_OPTIMIZATION_LEVEL
+    l2_limit_for_tiling: int = L2_LIMIT_FOR_TILING
 
 
 _SETTINGS_TO_BE_ENGINE_INVARIANT = (

py/torch_tensorrt/dynamo/conversion/_TRTInterpreter.py

@@ -329,40 +329,24 @@ def _populate_trt_builder_config(
         if self.compilation_settings.enable_weight_streaming:
             builder_config.set_flag(trt.BuilderFlag.WEIGHT_STREAMING)
 
-        if version.parse(trt.__version__) >= version.parse("10.8"):
-            if (
-                self.compilation_settings.tiling_optimization_level is None
-                or self.compilation_settings.tiling_optimization_level == 0
-            ):
-                builder_config.tiling_optimization_level = (
-                    trt.TilingOptimizationLevel.NONE
-                )
-            elif self.compilation_settings.tiling_optimization_level == 1:
-                builder_config.tiling_optimization_level = (
-                    trt.TilingOptimizationLevel.FAST
-                )
-            elif self.compilation_settings.tiling_optimization_level == 2:
-                builder_config.tiling_optimization_level = (
-                    trt.TilingOptimizationLevel.MODERATE
-                )
-            elif self.compilation_settings.tiling_optimization_level == 3:
-                builder_config.tiling_optimization_level = (
-                    trt.TilingOptimizationLevel.FULL
-                )
-            else:
-                raise ValueError(
-                    f"Invalid tiling optimization level: {self.compilation_settings.tiling_optimization_level}. A valid value should be in [0, 1, 2, 3]."
-                )
+        if self.compilation_settings.tiling_optimization_level == 0:
+            builder_config.tiling_optimization_level = trt.TilingOptimizationLevel.NONE
+        elif self.compilation_settings.tiling_optimization_level == 1:
+            builder_config.tiling_optimization_level = trt.TilingOptimizationLevel.FAST
+        elif self.compilation_settings.tiling_optimization_level == 2:
+            builder_config.tiling_optimization_level = (
+                trt.TilingOptimizationLevel.MODERATE
+            )
+        elif self.compilation_settings.tiling_optimization_level == 3:
+            builder_config.tiling_optimization_level = trt.TilingOptimizationLevel.FULL
+        else:
+            raise ValueError(
+                f"Invalid tiling optimization level: {self.compilation_settings.tiling_optimization_level}. A valid value should be in [0, 1, 2, 3]."
+            )
 
-            if (
-                self.compilation_settings.l2_limit_for_tiling is None
-                or self.compilation_settings.l2_limit_for_tiling == -1
-            ):
-                builder_config.l2_limit_for_tiling = -1
-            else:
-                builder_config.l2_limit_for_tiling = (
-                    self.compilation_settings.l2_limit_for_tiling
-                )
+        builder_config.l2_limit_for_tiling = (
+            self.compilation_settings.l2_limit_for_tiling
+        )
 
         return builder_config
 

py/torch_tensorrt/dynamo/runtime/_MutableTorchTensorRTModule.py

@@ -92,8 +92,8 @@ def __init__(
         dryrun: bool = _defaults.DRYRUN,
         hardware_compatible: bool = _defaults.HARDWARE_COMPATIBLE,
         timing_cache_path: str = _defaults.TIMING_CACHE_PATH,
-        tiling_optimization_level: Optional[int] = _defaults.TILING_OPTIMIZATION_LEVEL,
-        l2_limit_for_tiling: Optional[int] = _defaults.L2_LIMIT_FOR_TILING,
+        tiling_optimization_level: int = _defaults.TILING_OPTIMIZATION_LEVEL,
+        l2_limit_for_tiling: int = _defaults.L2_LIMIT_FOR_TILING,
         **kwargs: Any,
     ) -> None:
         """
@@ -135,8 +135,8 @@ def __init__(
             hardware_compatible (bool): Build the TensorRT engines compatible with GPU architectures other than that of the GPU on which the engine was built (currently works for NVIDIA Ampere and newer)
             timing_cache_path (str): Path to the timing cache if it exists (or) where it will be saved after compilation
             lazy_engine_init (bool): Defer setting up engines until the compilation of all engines is complete. Can allow larger models with multiple graph breaks to compile but can lead to oversubscription of GPU memory at runtime.
-            tiling_optimization_level (Optional[int]): The optimization level of tiling strategies. A Higher level allows TensorRT to spend more time searching for better optimization strategy. (We currently support [0, 1, 2, 3], default is 0)
-            l2_limit_for_tiling (Optional[int]): The target L2 cache usage limit (in bytes) for tiling optimization (default is -1 which means no limit).
+            tiling_optimization_level (int): The optimization level of tiling strategies. A Higher level allows TensorRT to spend more time searching for better optimization strategy. (We currently support [0, 1, 2, 3], default is 0)
+            l2_limit_for_tiling (int): The target L2 cache usage limit (in bytes) for tiling optimization (default is -1 which means no limit).
             **kwargs: Any,
         Returns:
             MutableTorchTensorRTModule