Skip to content

Commit 0e502fa

Browse files
committed
fix(Rich): Update remaining imports to use centralized _RICH_AVAILABLE
Fixes import statements in files that were still importing _RICH_AVAILABLE from rich_progress.py instead of the centralized utilities.imports. Updated files: - src/lightning/pytorch/callbacks/rich_model_summary.py - src/lightning/pytorch/loops/evaluation_loop.py - src/lightning/pytorch/utilities/testing/_runif.py - tests/tests_pytorch/trainer/logging_/test_eval_loop_logging.py This completes the centralization of _RICH_AVAILABLE checks.
1 parent a85a11c commit 0e502fa

File tree

4 files changed

+5
-6
lines changed

4 files changed

+5
-6
lines changed

src/lightning/pytorch/callbacks/rich_model_summary.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
from typing_extensions import override
1717

1818
from lightning.pytorch.callbacks import ModelSummary
19-
from lightning.pytorch.callbacks.progress.rich_progress import _RICH_AVAILABLE
19+
from lightning.pytorch.utilities.imports import _RICH_AVAILABLE
2020
from lightning.pytorch.utilities.model_summary import get_human_readable_count
2121

2222

src/lightning/pytorch/loops/evaluation_loop.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525

2626
import lightning.pytorch as pl
2727
from lightning.fabric.utilities.data import _set_sampler_epoch
28-
from lightning.pytorch.callbacks.progress.rich_progress import _RICH_AVAILABLE
2928
from lightning.pytorch.loops.fetchers import _DataFetcher, _DataLoaderIterDataFetcher
3029
from lightning.pytorch.loops.loop import _Loop
3130
from lightning.pytorch.loops.progress import _BatchProgress
@@ -44,6 +43,7 @@
4443
from lightning.pytorch.utilities.combined_loader import CombinedLoader
4544
from lightning.pytorch.utilities.data import has_len_all_ranks
4645
from lightning.pytorch.utilities.exceptions import SIGTERMException
46+
from lightning.pytorch.utilities.imports import _RICH_AVAILABLE
4747
from lightning.pytorch.utilities.model_helpers import _ModuleMode, is_overridden
4848
from lightning.pytorch.utilities.signature_utils import is_param_in_hook_signature
4949

src/lightning/pytorch/utilities/testing/_runif.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,8 @@
1717

1818
from lightning.fabric.utilities.testing import _runif_reasons as fabric_run_if
1919
from lightning.pytorch.accelerators.cpu import _PSUTIL_AVAILABLE
20-
from lightning.pytorch.callbacks.progress.rich_progress import _RICH_AVAILABLE
2120
from lightning.pytorch.core.module import _ONNX_AVAILABLE
22-
from lightning.pytorch.utilities.imports import _OMEGACONF_AVAILABLE
21+
from lightning.pytorch.utilities.imports import _OMEGACONF_AVAILABLE, _RICH_AVAILABLE
2322

2423
_SKLEARN_AVAILABLE = RequirementCache("scikit-learn")
2524

tests/tests_pytorch/trainer/logging_/test_eval_loop_logging.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@
2727
from torch import Tensor
2828

2929
from lightning.pytorch import Trainer, callbacks
30-
from lightning.pytorch.callbacks.progress.rich_progress import _RICH_AVAILABLE
3130
from lightning.pytorch.demos.boring_classes import BoringModel, RandomDataset
3231
from lightning.pytorch.loggers import TensorBoardLogger
3332
from lightning.pytorch.loops import _EvaluationLoop
3433
from lightning.pytorch.trainer.states import RunningStage
3534
from lightning.pytorch.utilities.exceptions import MisconfigurationException
35+
from lightning.pytorch.utilities.imports import _RICH_AVAILABLE
3636
from tests_pytorch.helpers.runif import RunIf
3737

3838
if _RICH_AVAILABLE:
@@ -534,7 +534,7 @@ def test_step(self, batch, batch_idx):
534534
max_epochs=2,
535535
)
536536

537-
# Train the model
537+
# Train the model
538538
trainer.fit(model)
539539

540540
assert set(trainer.callback_metrics) == {

0 commit comments

Comments
 (0)