Rooba
/
lightning
mirror of https://github.com/Lightning-AI/lightning.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove the deprecated `pytorch_lightning.profiler` module (#16359)

This commit is contained in:
Carlos Mocholí 2023-01-16 16:31:53 +01:00 committed by Luca Antiga
parent 5d648e4d77
commit 14933592f4
3 changed files with 2 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pytorch_lightning/CHANGELOG.md
View File

@ -54,6 +54,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
- Removed the deprecated `resume_from_checkpoint` Trainer argument ([#16167](https://github.com/Lightning-AI/lightning/pull/16167)) - Removed the deprecated `resume_from_checkpoint` Trainer argument ([#16167](https://github.com/Lightning-AI/lightning/pull/16167))
- Removed the deprecated `pytorch_lightning.profiler` module ([#16359](https://github.com/Lightning-AI/lightning/pull/16359))
- Removed the deprecated automatic GPU selection ([#16184](https://github.com/Lightning-AI/lightning/pull/16184)) - Removed the deprecated automatic GPU selection ([#16184](https://github.com/Lightning-AI/lightning/pull/16184))
* Removed the `Trainer(auto_select_gpus=...)` argument * Removed the `Trainer(auto_select_gpus=...)` argument
* Removed the `pytorch_lightning.tuner.auto_gpu_select.{pick_single_gpu,pick_multiple_gpus}` functions * Removed the `pytorch_lightning.tuner.auto_gpu_select.{pick_single_gpu,pick_multiple_gpus}` functions

86
src/pytorch_lightning/profiler/__init__.py
View File

@ -1,86 +0,0 @@
# Copyright The PyTorch Lightning team.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
from typing import Any
from pytorch_lightning.profilers.advanced import AdvancedProfiler as NewAdvancedProfiler
from pytorch_lightning.profilers.base import PassThroughProfiler as NewPassThroughProfiler
from pytorch_lightning.profilers.profiler import Profiler as NewProfiler
from pytorch_lightning.profilers.pytorch import PyTorchProfiler as NewPyTorchProfiler
from pytorch_lightning.profilers.simple import SimpleProfiler as NewSimpleProfiler
from pytorch_lightning.profilers.xla import XLAProfiler as NewXLAProfiler
from pytorch_lightning.utilities.rank_zero import rank_zero_deprecation
class AdvancedProfiler(NewAdvancedProfiler):
def __init__(self, *args: Any, **kwargs: Any) -> None:
rank_zero_deprecation(
"`pytorch_lightning.profiler.AdvancedProfiler` is deprecated in v1.9.0 and will be removed in v2.0.0."
" Use the equivalent `pytorch_lightning.profilers.AdvancedProfiler` class instead."
)
super().__init__(*args, **kwargs)
class PassThroughProfiler(NewPassThroughProfiler):
def __init__(self, *args: Any, **kwargs: Any) -> None:
rank_zero_deprecation(
"`pytorch_lightning.profiler.PassThroughProfiler` is deprecated in v1.9.0 and will be removed in v2.0.0."
" Use the equivalent `pytorch_lightning.profilers.PassThroughProfiler` class instead."
)
super().__init__(*args, **kwargs)
class Profiler(NewProfiler):
def __init__(self, *args: Any, **kwargs: Any) -> None:
rank_zero_deprecation(
"`pytorch_lightning.profiler.Profiler` is deprecated in v1.9.0 and will be removed in v2.0.0."
" Use the equivalent `pytorch_lightning.profilers.Profiler` class instead."
)
super().__init__(*args, **kwargs)
class PyTorchProfiler(NewPyTorchProfiler):
def __init__(self, *args: Any, **kwargs: Any) -> None:
rank_zero_deprecation(
"`pytorch_lightning.profiler.PyTorchProfiler` is deprecated in v1.9.0 and will be removed in v2.0.0."
" Use the equivalent `pytorch_lightning.profilers.PyTorchProfiler` class instead."
)
super().__init__(*args, **kwargs)
class SimpleProfiler(NewSimpleProfiler):
def __init__(self, *args: Any, **kwargs: Any) -> None:
rank_zero_deprecation(
"`pytorch_lightning.profiler.SimpleProfiler` is deprecated in v1.9.0 and will be removed in v2.0.0."
" Use the equivalent `pytorch_lightning.profilers.SimpleProfiler` class instead."
)
super().__init__(*args, **kwargs)
class XLAProfiler(NewXLAProfiler):
def __init__(self, *args: Any, **kwargs: Any) -> None:
rank_zero_deprecation(
"`pytorch_lightning.profiler.XLAProfiler` is deprecated in v1.9.0 and will be removed in v2.0.0."
" Use the equivalent `pytorch_lightning.profilers.XLAProfiler` class instead."
)
super().__init__(*args, **kwargs)
__all__ = [
"Profiler",
"AdvancedProfiler",
"PassThroughProfiler",
"PyTorchProfiler",
"SimpleProfiler",
"XLAProfiler",
]

19
tests/tests_pytorch/deprecated_api/test_remove_2-0.py
View File

@ -20,7 +20,6 @@ import torch
from lightning_utilities.test.warning import no_warning_call from lightning_utilities.test.warning import no_warning_call
from torch.utils.data import DataLoader from torch.utils.data import DataLoader
import pytorch_lightning.profiler as profiler
from pytorch_lightning import Trainer from pytorch_lightning import Trainer
from pytorch_lightning.accelerators.cpu import CPUAccelerator from pytorch_lightning.accelerators.cpu import CPUAccelerator
from pytorch_lightning.cli import LightningCLI from pytorch_lightning.cli import LightningCLI
@ -320,21 +319,3 @@ def test_v1_8_1_deprecated_rank_zero_only():
with pytest.deprecated_call(match="rank_zero_only` has been deprecated in v1.8.1"): with pytest.deprecated_call(match="rank_zero_only` has been deprecated in v1.8.1"):
rank_zero_only(lambda: None) rank_zero_only(lambda: None)
@pytest.mark.parametrize(
"cls",
[
profiler.AdvancedProfiler,
profiler.PassThroughProfiler,
profiler.PyTorchProfiler,
profiler.SimpleProfiler,
pytest.param(profiler.XLAProfiler, marks=RunIf(tpu=True)),
],
)
def test_profiler_classes_deprecated_warning(cls):
with pytest.deprecated_call(
match=f"profiler.{cls.__name__}` is deprecated in v1.9.0 and will be removed in v2.0.0."
f" Use .*profilers.{cls.__name__}` class instead."
):
cls()