Skip to content

Commit d6a1e8e

Browse files
committed
Merge branch 'feat/dynamo_export_onnx' of https://github.com/GdoongMathew/pytorch-lightning into feat/dynamo_export_onnx
2 parents 0493e13 + 3d9ecc8 commit d6a1e8e

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

src/lightning/pytorch/core/module.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
from lightning.pytorch.trainer.connectors.logger_connector.result import _get_default_dtype
6262
from lightning.pytorch.utilities import GradClipAlgorithmType
6363
from lightning.pytorch.utilities.exceptions import MisconfigurationException
64-
from lightning.pytorch.utilities.imports import _TORCHMETRICS_GREATER_EQUAL_0_9_1, _TORCH_GREATER_EQUAL_2_6
64+
from lightning.pytorch.utilities.imports import _TORCH_GREATER_EQUAL_2_6, _TORCHMETRICS_GREATER_EQUAL_0_9_1
6565
from lightning.pytorch.utilities.model_helpers import _restricted_classmethod
6666
from lightning.pytorch.utilities.rank_zero import WarningCache, rank_zero_warn
6767
from lightning.pytorch.utilities.signature_utils import is_param_in_hook_signature

src/lightning/pytorch/utilities/imports.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import operator
1818
import sys
1919

20-
from lightning_utilities.core.imports import RequirementCache, package_available, compare_version
20+
from lightning_utilities.core.imports import RequirementCache, compare_version, package_available
2121

2222
from lightning.pytorch.utilities.rank_zero import rank_zero_warn
2323

tests/tests_pytorch/models/test_onnx.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525
from lightning_utilities import compare_version
2626

2727
import tests_pytorch.helpers.pipelines as tpipes
28-
from lightning.pytorch.utilities.imports import _TORCH_GREATER_EQUAL_2_6
2928
from lightning.pytorch import Trainer
3029
from lightning.pytorch.core.module import _ONNXSCRIPT_AVAILABLE
3130
from lightning.pytorch.demos.boring_classes import BoringModel
31+
from lightning.pytorch.utilities.imports import _TORCH_GREATER_EQUAL_2_6
3232
from tests_pytorch.helpers.runif import RunIf
3333
from tests_pytorch.utilities.test_model_summary import UnorderedModel
3434

0 commit comments

Comments
 (0)