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

Bump Composer to 0.23.0 #1259

Merged
merged 6 commits into from
Jun 6, 2024
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
2 changes: 1 addition & 1 deletion scripts/train/train.py
Original file line number Diff line number Diff line change
Expand Up @@ -504,7 +504,7 @@ def main(cfg: DictConfig) -> Trainer:
precision=train_cfg.precision,
algorithms=algorithms,
device_train_microbatch_size=train_cfg.device_train_microbatch_size,
fsdp_config=fsdp_config,
parallelism_config={'fsdp': fsdp_config},
save_folder=train_cfg.save_folder,
save_filename=save_filename,
save_latest_filename=save_latest_filename,
Expand Down
8 changes: 4 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
]

install_requires = [
'mosaicml[libcloud,wandb,oci,gcs]>=0.22.0,<0.23',
'mosaicml[libcloud,wandb,oci,gcs]>=0.23.0,<0.24',
'mlflow>=2.12.1,<2.13',
'accelerate>=0.25,<0.26', # for HF inference `device_map`
'transformers>=4.40,<4.41',
Expand Down Expand Up @@ -92,14 +92,14 @@
]

extra_deps['databricks'] = [
'mosaicml[databricks]>=0.22.0,<0.23',
'mosaicml[databricks]>=0.23.0,<0.24',
'databricks-sql-connector>=3,<4',
'databricks-connect==14.1.0',
'lz4>=4,<5',
]

extra_deps['tensorboard'] = [
'mosaicml[tensorboard]>=0.22.0,<0.23',
'mosaicml[tensorboard]>=0.23.0,<0.24',
]

# Flash 2 group kept for backwards compatibility
Expand All @@ -110,7 +110,7 @@
extra_deps['gpu'] = copy.deepcopy(extra_deps['gpu-flash2'])

extra_deps['peft'] = [
'mosaicml[peft]>=0.22.0,<0.23',
'mosaicml[peft]>=0.23.0,<0.24',
]

extra_deps['openai'] = [
Expand Down
18 changes: 15 additions & 3 deletions tests/models/test_model.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,15 @@
import torch.nn as nn
from accelerate import init_empty_weights
from composer.core.precision import Precision, get_precision_context
from composer.distributed.dist_strategy import prepare_fsdp_module
from composer.models.huggingface import maybe_get_underlying_model
from composer.optim import DecoupledAdamW
from composer.trainer.dist_strategy import prepare_fsdp_module
from composer.utils import dist, get_device, reproducibility
from composer.utils import (
FSDPConfig,
dist,
get_device,
reproducibility,
)
from omegaconf import DictConfig, ListConfig
from omegaconf import OmegaConf as om
from transformers import (
Expand Down Expand Up @@ -2538,7 +2543,14 @@ def test_hf_init(
betas=(0.9, 0.99),
)

prepare_fsdp_module(model, optimizer, fsdp_config, precision, device, False)
prepare_fsdp_module(
model,
optimizer,
FSDPConfig(**fsdp_config),
precision,
device,
False,
)

model = HuggingFaceModelWithFSDP(model, tokenizer)

Expand Down
Loading