deprecate and bump version

mosaicml · Apr 30, 2024 · f312937 · f312937
1 parent fbe533a
commit f312937
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 22 deletions.
diff --git a/composer/_version.py b/composer/_version.py
@@ -3,4 +3,4 @@
 
 """The Composer Version."""
 
-__version__ = '0.22.0.dev0'
+__version__ = '0.23.0.dev0'
diff --git a/composer/models/huggingface.py b/composer/models/huggingface.py
@@ -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'],

diff --git a/docker/README.md b/docker/README.md
@@ -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

diff --git a/docker/build_matrix.yaml b/docker/build_matrix.yaml
@@ -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
@@ -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
diff --git a/docker/generate_build_matrix.py b/docker/generate_build_matrix.py
@@ -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):
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'