Skip to content
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.

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

[setup] make fairscale and deepspeed setup extras #11151

Merged
merged 5 commits into from
Apr 8, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 5 deletions .github/workflows/self-scheduled.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,7 @@ jobs:
run: |
apt -y update && apt install -y libsndfile1-dev
pip install --upgrade pip
pip install .[sklearn,testing,onnxruntime,sentencepiece,speech]
pip install deepspeed
pip install .[sklearn,testing,onnxruntime,sentencepiece,speech,deepspeed]

- name: Are GPUs recognized by our DL frameworks
run: |
Expand Down Expand Up @@ -156,9 +155,7 @@ jobs:
run: |
apt -y update && apt install -y libsndfile1-dev
pip install --upgrade pip
pip install .[sklearn,testing,onnxruntime,sentencepiece,speech]
pip install fairscale
pip install deepspeed
pip install .[sklearn,testing,onnxruntime,sentencepiece,speech,deepspeed,fairscale]

- name: Are GPUs recognized by our DL frameworks
run: |
Expand Down
16 changes: 16 additions & 0 deletions docs/source/main_classes/trainer.rst
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,14 @@ Install the library via pypi:

pip install fairscale

or via ``transformers``' ``extras``:

.. code-block:: bash

pip install transformers[fairscale]

(will become available starting from ``transformers==4.6.0``)

or find more details on `the FairScale's GitHub page <https://github.com/facebookresearch/fairscale/#installation>`__.

If you're still struggling with the build, first make sure to read :ref:`zero-install-notes`.
Expand Down Expand Up @@ -419,6 +427,14 @@ Install the library via pypi:

pip install deepspeed

or via ``transformers``' ``extras``:

.. code-block:: bash

pip install transformers[deepspeed]

(will become available starting from ``transformers==4.6.0``)

or find more details on `the DeepSpeed's GitHub page <https://github.com/microsoft/deepspeed#installation>`__ and
`advanced install <https://www.deepspeed.ai/tutorials/advanced-install/>`__.

Expand Down
4 changes: 4 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,9 @@
"cookiecutter==1.7.2",
"dataclasses",
"datasets",
"deepspeed>0.3.13",
"docutils==0.16.0",
"fairscale>0.3",
"faiss-cpu",
"fastapi",
"filelock",
Expand Down Expand Up @@ -233,6 +235,8 @@ def run(self):
extras["modelcreation"] = deps_list("cookiecutter")

extras["sagemaker"] = deps_list("sagemaker")
extras["deepspeed"] = deps_list("deepspeed")
extras["fairscale"] = deps_list("fairscale")

extras["serving"] = deps_list("pydantic", "uvicorn", "fastapi", "starlette")
extras["speech"] = deps_list("soundfile", "torchaudio")
Expand Down
6 changes: 5 additions & 1 deletion src/transformers/dependency_versions_check.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
import sys

from .dependency_versions_table import deps
from .utils.versions import require_version_core
from .utils.versions import require_version, require_version_core


# define which module versions we always want to check at run time
Expand All @@ -41,3 +41,7 @@
require_version_core(deps[pkg])
else:
raise ValueError(f"can't find {pkg} in {deps.keys()}, check dependency_versions_table.py")


def dep_version_check(pkg, hint=None):
require_version(deps[pkg], hint)
2 changes: 2 additions & 0 deletions src/transformers/dependency_versions_table.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@
"cookiecutter": "cookiecutter==1.7.2",
"dataclasses": "dataclasses",
"datasets": "datasets",
"deepspeed": "deepspeed>0.3.13",
"docutils": "docutils==0.16.0",
"fairscale": "fairscale>0.3",
"faiss-cpu": "faiss-cpu",
"fastapi": "fastapi",
"filelock": "filelock",
Expand Down
4 changes: 2 additions & 2 deletions src/transformers/integrations.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
from copy import deepcopy
from pathlib import Path

from .dependency_versions_check import dep_version_check
from .utils import logging
from .utils.versions import require_version


logger = logging.get_logger(__name__)
Expand Down Expand Up @@ -324,7 +324,7 @@ def deepspeed_parse_config(ds_config):

If it's already a dict, return a copy of it, so that we can freely modify it.
"""
require_version("deepspeed>0.3.13")
dep_version_check("deepspeed")

if isinstance(ds_config, dict):
# Don't modify user's data should they want to reuse it (e.g. in tests), because once we
Expand Down
10 changes: 4 additions & 6 deletions src/transformers/trainer.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
from torch.utils.data.sampler import RandomSampler, SequentialSampler

from .data.data_collator import DataCollator, DataCollatorWithPadding, default_data_collator
from .dependency_versions_check import dep_version_check
from .file_utils import (
WEIGHTS_NAME,
is_apex_available,
Expand Down Expand Up @@ -139,17 +140,14 @@
import torch_xla.distributed.parallel_loader as pl

if is_fairscale_available():
dep_version_check("fairscale")
import fairscale
from fairscale.nn.data_parallel import FullyShardedDataParallel as FullyShardedDDP
from fairscale.nn.data_parallel import ShardedDataParallel as ShardedDDP
from fairscale.nn.wrap import auto_wrap
from fairscale.optim import OSS
from fairscale.optim.grad_scaler import ShardedGradScaler

if version.parse(fairscale.__version__) >= version.parse("0.3"):
from fairscale.nn.data_parallel import FullyShardedDataParallel as FullyShardedDDP
from fairscale.nn.wrap import auto_wrap
else:
FullyShardedDDP = None

if is_sagemaker_dp_enabled():
import smdistributed.dataparallel.torch.distributed as dist
from smdistributed.dataparallel.torch.parallel.distributed import DistributedDataParallel as DDP
Expand Down
6 changes: 6 additions & 0 deletions src/transformers/utils/versions.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,12 @@ def require_version(requirement: str, hint: Optional[str] = None) -> None:
Args:
requirement (:obj:`str`): pip style definition, e.g., "tokenizers==0.9.4", "tqdm>=4.27", "numpy"
hint (:obj:`str`, `optional`): what suggestion to print in case of requirements not being met

Example::

require_version("pandas>1.1.2")
require_version("numpy>1.18.5", "this is important to have for whatever reason")

"""

hint = f"\n{hint}" if hint is not None else ""
Expand Down