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.

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

Jump to bottom

Deprecate and bump version to 0.22 #3230

Merged
merged 7 commits into from
Apr 30, 2024
Merged

Deprecate and bump version to 0.22 #3230

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f312937
deprecate and bump version
mvpatel2000 Apr 30, 2024
0dfbd99
Merge branch 'dev' into mvpatel2000/remove-deprecated-code
mvpatel2000 Apr 30, 2024
ba7c762
lint
mvpatel2000 Apr 30, 2024
237b340
Merge branch 'dev' into mvpatel2000/remove-deprecated-code
dakinggg Apr 30, 2024
461e424
remove deprecatio test
mvpatel2000 Apr 30, 2024
592f4e1
Merge branch 'mvpatel2000/remove-deprecated-code' of github.com-mvpat…
mvpatel2000 Apr 30, 2024
583d9e2
Merge branch 'dev' into mvpatel2000/remove-deprecated-code
mvpatel2000 Apr 30, 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
2 changes: 1 addition & 1 deletion composer/_version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@

"""The Composer Version."""

__version__ = '0.22.0.dev0'
__version__ = '0.23.0.dev0'
12 changes: 0 additions & 12 deletions composer/models/huggingface.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -510,18 +510,6 @@ def eval_forward(self, batch, outputs: Optional[Any] = None):
'Generation eval cannot be used without providing a tokenizer to the model constructor.',
)

if 'generation_length' in batch:
warnings.warn(
VersionedDeprecationWarning(
'`generation_length` has been deprecated in favor of passing `max_new_tokens` directly into `generation_kwargs`.',
remove_version='0.22.0',
),
)
if 'generation_kwargs' in batch:
batch['generation_kwargs']['max_new_tokens'] = batch['generation_length']
else:
batch['generation_kwargs'] = {'max_new_tokens': batch['generation_length']}

self.labels = batch.pop('labels')
generation = self.generate(
batch['input_ids'],
Expand Down
4 changes: 2 additions & 2 deletions docker/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ all dependencies for both NLP and Vision models. They are built on top of the
<!-- BEGIN_COMPOSER_BUILD_MATRIX -->
| Composer Version | CUDA Support | Docker Tag |
|--------------------|----------------|----------------------------------------------------------------|
| 0.21.3 | Yes | `mosaicml/composer:latest`, `mosaicml/composer:0.21.3` |
| 0.21.3 | No | `mosaicml/composer:latest_cpu`, `mosaicml/composer:0.21.3_cpu` |
| 0.22.0 | Yes | `mosaicml/composer:latest`, `mosaicml/composer:0.22.0` |
| 0.22.0 | No | `mosaicml/composer:latest_cpu`, `mosaicml/composer:0.22.0_cpu` |
<!-- END_COMPOSER_BUILD_MATRIX -->

**Note**: For a lightweight installation, we recommended using a [MosaicML PyTorch Image](#pytorch-images) and manually
Expand Down
12 changes: 6 additions & 6 deletions docker/build_matrix.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,9 +205,9 @@
TORCHVISION_VERSION: 0.16.2
- AWS_OFI_NCCL_VERSION: ''
BASE_IMAGE: nvidia/cuda:12.1.1-cudnn8-devel-ubuntu20.04
COMPOSER_INSTALL_COMMAND: mosaicml[all]==0.21.3
COMPOSER_INSTALL_COMMAND: mosaicml[all]==0.22.0
CUDA_VERSION: 12.1.1
IMAGE_NAME: composer-0-21-3
IMAGE_NAME: composer-0-22-0
MOFED_VERSION: 5.5-1.0.3.2
NVIDIA_REQUIRE_CUDA_OVERRIDE: cuda>=12.1 brand=tesla,driver>=450,driver<451 brand=tesla,driver>=470,driver<471
brand=unknown,driver>=470,driver<471 brand=nvidia,driver>=470,driver<471 brand=nvidiartx,driver>=470,driver<471
Expand All @@ -228,23 +228,23 @@
PYTORCH_NIGHTLY_VERSION: ''
PYTORCH_VERSION: 2.2.1
TAGS:
- mosaicml/composer:0.21.3
- mosaicml/composer:0.22.0
- mosaicml/composer:latest
TARGET: composer_stage
TORCHVISION_VERSION: 0.17.1
- AWS_OFI_NCCL_VERSION: ''
BASE_IMAGE: ubuntu:20.04
COMPOSER_INSTALL_COMMAND: mosaicml[all]==0.21.3
COMPOSER_INSTALL_COMMAND: mosaicml[all]==0.22.0
CUDA_VERSION: ''
IMAGE_NAME: composer-0-21-3-cpu
IMAGE_NAME: composer-0-22-0-cpu
MOFED_VERSION: 5.5-1.0.3.2
NVIDIA_REQUIRE_CUDA_OVERRIDE: ''
PYTHON_VERSION: '3.10'
PYTORCH_NIGHTLY_URL: ''
PYTORCH_NIGHTLY_VERSION: ''
PYTORCH_VERSION: 2.2.1
TAGS:
- mosaicml/composer:0.21.3_cpu
- mosaicml/composer:0.22.0_cpu
- mosaicml/composer:latest_cpu
TARGET: composer_stage
TORCHVISION_VERSION: 0.17.1
2 changes: 1 addition & 1 deletion docker/generate_build_matrix.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ def _main():
composer_entries = []

# The `GIT_COMMIT` is a placeholder and Jenkins will substitute it with the actual git commit for the `composer_staging` images
composer_versions = ['0.21.3'] # Only build images for the latest composer version
composer_versions = ['0.22.0'] # Only build images for the latest composer version
composer_python_versions = [PRODUCTION_PYTHON_VERSION] # just build composer against the latest

for product in itertools.product(composer_python_versions, composer_versions, cuda_options):
Expand Down
Loading