Skip to content

Commit fd96579

Browse files
authored
Version bump to v0.30.0.dev0 (#3770)
1 parent 4127566 commit fd96579

File tree

5 files changed

+13
-34
lines changed

5 files changed

+13
-34
lines changed

composer/_version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33

44
"""The Composer Version."""
55

6-
__version__ = '0.29.0.dev0'
6+
__version__ = '0.30.0.dev0'

composer/core/data_spec.py

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import torch.utils.data
1515
from torch.utils.data.distributed import DistributedSampler
1616

17-
from composer.utils import VersionedDeprecationWarning, dist, ensure_tuple
17+
from composer.utils import dist, ensure_tuple
1818

1919
if TYPE_CHECKING:
2020
from composer.core.types import Batch
@@ -155,10 +155,6 @@ class DataSpec:
155155
num_tokens (int, optional): The total number of tokens in an epoch. This field is used by the
156156
:class:`.Timestamp` (training progress tracker).
157157
158-
device_transforms ((Batch) -> Batch, optional): Deprecated argument. Please use ``batch_transforms`` for batch
159-
level transformations on CPU and ``microbatch_transforms`` for microbatch level transformations on target
160-
device.
161-
162158
batch_transforms ((Batch) -> Batch, optional): Function called by the :class:`.Trainer` to modify the
163159
batch before it is moved onto the device. For example, this function can be used for CPU-based
164160
normalization. It can modify the batch in-place, and it should return the modified batch. If not specified,
@@ -194,7 +190,6 @@ def __init__(
194190
dataloader: Union[Iterable, torch.utils.data.DataLoader],
195191
num_samples: Optional[int] = None,
196192
num_tokens: Optional[int] = None,
197-
device_transforms: Optional[Callable[[Batch], Batch]] = None,
198193
batch_transforms: Optional[Callable[[Batch], Batch]] = None,
199194
microbatch_transforms: Optional[Callable[[Batch], Batch]] = None,
200195
split_batch: Optional[Callable[[Batch, Union[int, float]], Sequence[Batch]]] = None,
@@ -203,22 +198,6 @@ def __init__(
203198
) -> None:
204199
self.dataloader: Union[Iterable, torch.utils.data.DataLoader] = dataloader
205200
self.num_tokens = num_tokens
206-
if device_transforms is not None:
207-
if batch_transforms is not None:
208-
raise ValueError(
209-
'Cannot specify both `device_transforms` and `batch_transforms`. Please use `batch_transforms` for '
210-
'batch level transformations on CPU and `microbatch_transforms` for microbatch level transformations '
211-
'on target device.',
212-
)
213-
warnings.warn(
214-
VersionedDeprecationWarning(
215-
'The `device_transforms` argument is deprecated. Please use `batch_transforms` for batch level '
216-
'transformations on CPU and `microbatch_transforms` for microbatch level transformations on target '
217-
'device.',
218-
'v0.29.0',
219-
),
220-
)
221-
self.batch_transforms = device_transforms
222201
self.batch_transforms = self._default_transforms if batch_transforms is None else batch_transforms
223202
self.microbatch_transforms = self._default_transforms if microbatch_transforms is None else microbatch_transforms
224203
self.split_batch = default_split_batch if split_batch is None else split_batch

docker/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ all dependencies for both NLP and Vision models. They are built on top of the
1515
<!-- BEGIN_COMPOSER_BUILD_MATRIX -->
1616
| Composer Version | CUDA Support | Docker Tag |
1717
|--------------------|----------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------|
18-
| 0.28.0 | Yes | `mosaicml/composer:latest`, `mosaicml/composer:0.28.0` |
19-
| 0.28.0 | No | `mosaicml/composer:latest_cpu`, `mosaicml/composer:0.28.0_cpu` |
18+
| 0.29.0 | Yes | `mosaicml/composer:latest`, `mosaicml/composer:0.29.0` |
19+
| 0.29.0 | No | `mosaicml/composer:latest_cpu`, `mosaicml/composer:0.29.0_cpu` |
2020
<!-- END_COMPOSER_BUILD_MATRIX -->
2121

2222
**Note**: For a lightweight installation, we recommended using a [MosaicML PyTorch Image](#pytorch-images) and manually

docker/build_matrix.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -142,36 +142,36 @@
142142
TORCHVISION_VERSION: 0.19.1
143143
- AWS_OFI_NCCL_VERSION: ''
144144
BASE_IMAGE: nvidia/cuda:12.4.1-cudnn-devel-ubuntu22.04
145-
COMPOSER_INSTALL_COMMAND: mosaicml[all]==0.28.0
145+
COMPOSER_INSTALL_COMMAND: mosaicml[all]==0.29.0
146146
CUDA_VERSION: 12.4.1
147-
IMAGE_NAME: composer-0-28-0
147+
IMAGE_NAME: composer-0-29-0
148148
MOFED_VERSION: latest-23.10
149149
NVIDIA_REQUIRE_CUDA_OVERRIDE: ''
150150
PYTHON_VERSION: '3.11'
151151
PYTORCH_NIGHTLY_URL: ''
152152
PYTORCH_NIGHTLY_VERSION: ''
153153
PYTORCH_VERSION: 2.6.0
154154
TAGS:
155-
- mosaicml/composer:0.28.0
156-
- ghcr.io/databricks-mosaic/composer:0.28.0
155+
- mosaicml/composer:0.29.0
156+
- ghcr.io/databricks-mosaic/composer:0.29.0
157157
- mosaicml/composer:latest
158158
- ghcr.io/databricks-mosaic/composer:latest
159159
TARGET: composer_stage
160160
TORCHVISION_VERSION: 0.21.0
161161
- AWS_OFI_NCCL_VERSION: ''
162162
BASE_IMAGE: ubuntu:22.04
163-
COMPOSER_INSTALL_COMMAND: mosaicml[all]==0.28.0
163+
COMPOSER_INSTALL_COMMAND: mosaicml[all]==0.29.0
164164
CUDA_VERSION: ''
165-
IMAGE_NAME: composer-0-28-0-cpu
165+
IMAGE_NAME: composer-0-29-0-cpu
166166
MOFED_VERSION: latest-23.10
167167
NVIDIA_REQUIRE_CUDA_OVERRIDE: ''
168168
PYTHON_VERSION: '3.11'
169169
PYTORCH_NIGHTLY_URL: ''
170170
PYTORCH_NIGHTLY_VERSION: ''
171171
PYTORCH_VERSION: 2.6.0
172172
TAGS:
173-
- mosaicml/composer:0.28.0_cpu
174-
- ghcr.io/databricks-mosaic/composer:0.28.0_cpu
173+
- mosaicml/composer:0.29.0_cpu
174+
- ghcr.io/databricks-mosaic/composer:0.29.0_cpu
175175
- mosaicml/composer:latest_cpu
176176
- ghcr.io/databricks-mosaic/composer:latest_cpu
177177
TARGET: composer_stage

docker/generate_build_matrix.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ def _main():
244244
composer_entries = []
245245

246246
# The `GIT_COMMIT` is a placeholder and Jenkins will substitute it with the actual git commit for the `composer_staging` images
247-
composer_versions = ['0.28.0'] # Only build images for the latest composer version
247+
composer_versions = ['0.29.0'] # Only build images for the latest composer version
248248
composer_python_versions = [PRODUCTION_PYTHON_VERSION] # just build composer against the latest
249249

250250
for product in itertools.product(composer_python_versions, composer_versions, cuda_options):

0 commit comments

Comments
 (0)