Skip to content

Make plugin type check more flexible (Fabric) #20452

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 26, 2024
Merged

Make plugin type check more flexible (Fabric) #20452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
148586e
make plugin type check more flexible
jedyang97 Aug 10, 2024
71c48b2
Merge branch 'master' into patch-1
Borda Sep 30, 2024
a771423
Merge branch 'master' into patch-1
lantiga Nov 26, 2024
26b5e80
Change signature and make the equivalent changes to Fabric connector
lantiga Nov 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions src/lightning/fabric/connector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
# limitations under the License.
import os
from collections import Counter
from collections.abc import Iterable
from typing import Any, Optional, Union, cast

import torch
Expand Down Expand Up @@ -102,7 +103,7 @@ def __init__(
devices: Union[list[int], str, int] = "auto",
num_nodes: int = 1,
precision: Optional[_PRECISION_INPUT] = None,
plugins: Optional[Union[_PLUGIN_INPUT, list[_PLUGIN_INPUT]]] = None,
plugins: Optional[Union[_PLUGIN_INPUT, Iterable[_PLUGIN_INPUT]]] = None,
) -> None:
# These arguments can be set through environment variables set by the CLI
accelerator = self._argument_from_env("accelerator", accelerator, default="auto")
Expand Down Expand Up @@ -165,7 +166,7 @@ def _check_config_and_set_final_flags(
strategy: Union[str, Strategy],
accelerator: Union[str, Accelerator],
precision: Optional[_PRECISION_INPUT],
plugins: Optional[Union[_PLUGIN_INPUT, list[_PLUGIN_INPUT]]],
plugins: Optional[Union[_PLUGIN_INPUT, Iterable[_PLUGIN_INPUT]]],
) -> None:
"""This method checks:

Expand All @@ -180,7 +181,7 @@ def _check_config_and_set_final_flags(

"""
if plugins is not None:
plugins = [plugins] if not isinstance(plugins, list) else plugins
plugins = [plugins] if not isinstance(plugins, Iterable) else plugins

if isinstance(strategy, str):
strategy = strategy.lower()
Expand Down
7 changes: 4 additions & 3 deletions src/lightning/pytorch/trainer/connectors/accelerator_connector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import logging
import os
from collections import Counter
from collections.abc import Iterable
from typing import Literal, Optional, Union

import torch
Expand Down Expand Up @@ -78,7 +79,7 @@ def __init__(
num_nodes: int = 1,
accelerator: Union[str, Accelerator] = "auto",
strategy: Union[str, Strategy] = "auto",
plugins: Optional[Union[_PLUGIN_INPUT, list[_PLUGIN_INPUT]]] = None,
plugins: Optional[Union[_PLUGIN_INPUT, Iterable[_PLUGIN_INPUT]]] = None,
precision: Optional[_PRECISION_INPUT] = None,
sync_batchnorm: bool = False,
benchmark: Optional[bool] = None,
Expand Down Expand Up @@ -166,7 +167,7 @@ def _check_config_and_set_final_flags(
strategy: Union[str, Strategy],
accelerator: Union[str, Accelerator],
precision: Optional[_PRECISION_INPUT],
plugins: Optional[Union[_PLUGIN_INPUT, list[_PLUGIN_INPUT]]],
plugins: Optional[Union[_PLUGIN_INPUT, Iterable[_PLUGIN_INPUT]]],
sync_batchnorm: bool,
) -> None:
"""This method checks:
Expand All @@ -182,7 +183,7 @@ def _check_config_and_set_final_flags(

"""
if plugins is not None:
plugins = [plugins] if not isinstance(plugins, list) else plugins
plugins = [plugins] if not isinstance(plugins, Iterable) else plugins

if isinstance(strategy, str):
strategy = strategy.lower()
Expand Down
Loading