From d47db765bfe67b5458442d896084e4c3e2650af6 Mon Sep 17 00:00:00 2001 From: Dheeraj Peri Date: Thu, 12 Dec 2024 17:30:30 -0800 Subject: [PATCH 1/4] fix: Fix meta kernel import in python builds --- py/torch_tensorrt/dynamo/runtime/__init__.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/py/torch_tensorrt/dynamo/runtime/__init__.py b/py/torch_tensorrt/dynamo/runtime/__init__.py index 762345d50f..cb85db2c97 100644 --- a/py/torch_tensorrt/dynamo/runtime/__init__.py +++ b/py/torch_tensorrt/dynamo/runtime/__init__.py @@ -1,7 +1,10 @@ +import torch_tensorrt from torch_tensorrt.dynamo.runtime._PythonTorchTensorRTModule import ( # noqa: F401 PythonTorchTensorRTModule, ) from torch_tensorrt.dynamo.runtime._TorchTensorRTModule import ( # noqa: F401 TorchTensorRTModule, ) -from torch_tensorrt.dynamo.runtime.register_fake_class import * + +if torch_tensorrt.ENABLED_FEATURES.torch_tensorrt_runtime: + from torch_tensorrt.dynamo.runtime.register_fake_class import * From 986793db099a75fc910c93daefeefb8b258bb54a Mon Sep 17 00:00:00 2001 From: Dheeraj Peri Date: Thu, 12 Dec 2024 22:53:04 -0800 Subject: [PATCH 2/4] fix: Fix meta kernel import in python builds --- py/torch_tensorrt/dynamo/runtime/__init__.py | 2 +- .../register_meta_ops.py} | 0 setup.py | 8 ++++++++ 3 files changed, 9 insertions(+), 1 deletion(-) rename py/torch_tensorrt/dynamo/runtime/{register_fake_class.py => meta_ops/register_meta_ops.py} (100%) diff --git a/py/torch_tensorrt/dynamo/runtime/__init__.py b/py/torch_tensorrt/dynamo/runtime/__init__.py index cb85db2c97..ee265107be 100644 --- a/py/torch_tensorrt/dynamo/runtime/__init__.py +++ b/py/torch_tensorrt/dynamo/runtime/__init__.py @@ -7,4 +7,4 @@ ) if torch_tensorrt.ENABLED_FEATURES.torch_tensorrt_runtime: - from torch_tensorrt.dynamo.runtime.register_fake_class import * + from torch_tensorrt.dynamo.runtime.meta_ops.register_meta_ops.py import * diff --git a/py/torch_tensorrt/dynamo/runtime/register_fake_class.py b/py/torch_tensorrt/dynamo/runtime/meta_ops/register_meta_ops.py similarity index 100% rename from py/torch_tensorrt/dynamo/runtime/register_fake_class.py rename to py/torch_tensorrt/dynamo/runtime/meta_ops/register_meta_ops.py diff --git a/setup.py b/setup.py index 0b8f47fb6f..8620dc5055 100644 --- a/setup.py +++ b/setup.py @@ -444,6 +444,7 @@ def run(self): "torch_tensorrt.dynamo.lowering.passes", "torch_tensorrt.dynamo.partitioning", "torch_tensorrt.dynamo.runtime", + "torch_tensorrt.dynamo.runtime.meta_ops", "torch_tensorrt.dynamo.tools", "torch_tensorrt.fx", "torch_tensorrt.fx.converters", @@ -484,6 +485,13 @@ def run(self): "torch_tensorrt.runtime": "py/torch_tensorrt/runtime", } +if not PY_ONLY: + package_dir.update( + { + "torch_tensorrt.dynamo.runtime.meta_ops": "py/torch_tensorrt/dynamo/runtime/meta_ops" + } + ) + package_data = {} if not (PY_ONLY or NO_TS): From 1b08c32d0a0971f5297eadc28168f4aee8786db3 Mon Sep 17 00:00:00 2001 From: Dheeraj Peri Date: Fri, 13 Dec 2024 09:09:42 -0800 Subject: [PATCH 3/4] chore: minor fixes --- py/torch_tensorrt/dynamo/runtime/__init__.py | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/py/torch_tensorrt/dynamo/runtime/__init__.py b/py/torch_tensorrt/dynamo/runtime/__init__.py index ee265107be..de47d942e9 100644 --- a/py/torch_tensorrt/dynamo/runtime/__init__.py +++ b/py/torch_tensorrt/dynamo/runtime/__init__.py @@ -7,4 +7,4 @@ ) if torch_tensorrt.ENABLED_FEATURES.torch_tensorrt_runtime: - from torch_tensorrt.dynamo.runtime.meta_ops.register_meta_ops.py import * + from torch_tensorrt.dynamo.runtime.meta_ops.register_meta_ops import * diff --git a/setup.py b/setup.py index 8620dc5055..70fdddc55d 100644 --- a/setup.py +++ b/setup.py @@ -444,7 +444,6 @@ def run(self): "torch_tensorrt.dynamo.lowering.passes", "torch_tensorrt.dynamo.partitioning", "torch_tensorrt.dynamo.runtime", - "torch_tensorrt.dynamo.runtime.meta_ops", "torch_tensorrt.dynamo.tools", "torch_tensorrt.fx", "torch_tensorrt.fx.converters", @@ -486,6 +485,7 @@ def run(self): } if not PY_ONLY: + packages.append("torch_tensorrt.dynamo.runtime.meta_ops") package_dir.update( { "torch_tensorrt.dynamo.runtime.meta_ops": "py/torch_tensorrt/dynamo/runtime/meta_ops" From 7408664bb1c6ef84841690e1bbed4ca3a42ea252 Mon Sep 17 00:00:00 2001 From: Dheeraj Peri Date: Tue, 17 Dec 2024 10:13:03 -0800 Subject: [PATCH 4/4] chore: updates --- setup.py | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/setup.py b/setup.py index f109f53ba6..5b46ccb585 100644 --- a/setup.py +++ b/setup.py @@ -486,14 +486,6 @@ def run(self): "torch_tensorrt.runtime": "py/torch_tensorrt/runtime", } -if not PY_ONLY: - packages.append("torch_tensorrt.dynamo.runtime.meta_ops") - package_dir.update( - { - "torch_tensorrt.dynamo.runtime.meta_ops": "py/torch_tensorrt/dynamo/runtime/meta_ops" - } - ) - package_data = {} if not (PY_ONLY or NO_TS): @@ -601,13 +593,12 @@ def run(self): ) ] - packages += [ - "torch_tensorrt.ts", - ] + packages += ["torch_tensorrt.ts", "torch_tensorrt.dynamo.runtime.meta_ops"] package_dir.update( { "torch_tensorrt.ts": "py/torch_tensorrt/ts", + "torch_tensorrt.dynamo.runtime.meta_ops": "py/torch_tensorrt/dynamo/runtime/meta_ops", } )