Skip to content

Commit

Permalink
Bump version to 0.16.4 (mosaicml#2627)
Browse files Browse the repository at this point in the history
* bump version

* filter warning

* remove slack failure

* composer

* ckdn

* commit change

* commit change

* commit change

* commit change

* rename

* revert

* cleanup

* move around tests

* log

* fix slack

* clean test

* composer

* rearrange

* remove logs

* skip

* remove log

---------

Co-authored-by: Chuck Tang <[email protected]>
  • Loading branch information
mvpatel2000 and j316chuck authored Oct 11, 2023
1 parent 0a8cf18 commit 1c9d8d1
Show file tree
Hide file tree
Showing 12 changed files with 23 additions and 23 deletions.
5 changes: 5 additions & 0 deletions .github/workflows/daily.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,11 @@ jobs:
markers: 'not daily and (remote or not remote) and not gpu and not vision and not doctest'
pytest_command: 'coverage run -m pytest'
composer_package_name: 'mosaicml'
- name: 'cpu-3.10-2.1-composer'
container: mosaicml/pytorch:2.1.0_cpu-python3.10-ubuntu20.04
markers: 'not daily and (remote or not remote) and not gpu and not vision and not doctest'
pytest_command: 'coverage run -m pytest'
composer_package_name: 'composer'
- name: 'cpu-vision'
container: mosaicml/pytorch_vision:1.13.1_cpu-python3.10-ubuntu20.04
markers: 'not daily and (remote or not remote) and not gpu and vision and not doctest'
Expand Down
5 changes: 0 additions & 5 deletions .github/workflows/pr-cpu.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,6 @@ jobs:
markers: 'not daily and not remote and not gpu and not vision and not doctest'
pytest_command: 'coverage run -m pytest'
composer_package_name: 'mosaicml'
- name: 'cpu-3.10-2.1-composer'
container: mosaicml/pytorch:2.1.0_cpu-python3.10-ubuntu20.04
markers: 'not daily and not remote and not gpu and not vision and not doctest'
pytest_command: 'coverage run -m pytest'
composer_package_name: 'composer'
- name: 'cpu-vision'
container: mosaicml/pytorch_vision:1.13.1_cpu-python3.10-ubuntu20.04
markers: 'not daily and not remote and not gpu and vision and not doctest'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pytest-cpu.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ jobs:
name: coverage-${{ github.sha }}-${{ inputs.name }}
path: .coverage
- name: Notify slack fail
if: failure() && !cancelled() && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev') && (github.event_name != 'pull_request' || github.event_name != 'pull_request_target')
if: failure() && !cancelled() && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev') && (github.event_name != 'pull_request' && github.event_name != 'pull_request_target')
env:
SLACK_BOT_TOKEN: ${{ secrets.slack-notifications-bot-token }}
uses: voxmedia/github-action-slack-notify-build@v1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pytest-gpu.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ jobs:
python .github/mcli/mcli_pytest.py --image '${{ inputs.container }}' --pip_package_name '${{ inputs.composer_package_name }}' --pytest_markers '${{ inputs.pytest-markers }}' --pytest_command '${{ inputs.pytest-command }}' --timeout ${{ inputs.mcloud-timeout }} ${REF_ARGS}
- name: Notify slack fail
if: failure() && !cancelled() && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev') && (github.event_name != 'pull_request' || github.event_name != 'pull_request_target')
if: failure() && !cancelled() && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev') && (github.event_name != 'pull_request' && github.event_name != 'pull_request_target')
env:
SLACK_BOT_TOKEN: ${{ secrets.slack-notifications-bot-token }}
uses: voxmedia/github-action-slack-notify-build@v1
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ Composer is designed for users who are comfortable with Python and have basic fa

Composer can be installed with `pip`:

<!--pytest.mark.skip-->
```bash
pip install mosaicml
```
Expand Down
2 changes: 1 addition & 1 deletion composer/_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@

"""The Composer Version."""

__version__ = '0.16.3'
__version__ = '0.16.4'
4 changes: 2 additions & 2 deletions docker/README.md
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.16.3 | Yes | `mosaicml/composer:latest`, `mosaicml/composer:0.16.3` |
| 0.16.3 | No | `mosaicml/composer:latest_cpu`, `mosaicml/composer:0.16.3_cpu` |
| 0.16.4 | Yes | `mosaicml/composer:latest`, `mosaicml/composer:0.16.4` |
| 0.16.4 | No | `mosaicml/composer:latest_cpu`, `mosaicml/composer:0.16.4_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
Original file line number Diff line number Diff line change
Expand Up @@ -121,31 +121,31 @@
TORCHVISION_VERSION: 0.14.1
- AWS_OFI_NCCL_VERSION: ''
BASE_IMAGE: nvidia/cuda:11.7.1-cudnn8-devel-ubuntu20.04
COMPOSER_INSTALL_COMMAND: mosaicml[all]==0.16.3
COMPOSER_INSTALL_COMMAND: mosaicml[all]==0.16.4
CUDA_VERSION: 11.7.1
IMAGE_NAME: composer-0-16-3
IMAGE_NAME: composer-0-16-4
MOFED_VERSION: 5.5-1.0.3.2
PYTHON_VERSION: '3.10'
PYTORCH_NIGHTLY_URL: ''
PYTORCH_NIGHTLY_VERSION: ''
PYTORCH_VERSION: 1.13.1
TAGS:
- mosaicml/composer:0.16.3
- mosaicml/composer:0.16.4
- mosaicml/composer:latest
TARGET: composer_stage
TORCHVISION_VERSION: 0.14.1
- AWS_OFI_NCCL_VERSION: ''
BASE_IMAGE: ubuntu:20.04
COMPOSER_INSTALL_COMMAND: mosaicml[all]==0.16.3
COMPOSER_INSTALL_COMMAND: mosaicml[all]==0.16.4
CUDA_VERSION: ''
IMAGE_NAME: composer-0-16-3-cpu
IMAGE_NAME: composer-0-16-4-cpu
MOFED_VERSION: 5.5-1.0.3.2
PYTHON_VERSION: '3.10'
PYTORCH_NIGHTLY_URL: ''
PYTORCH_NIGHTLY_VERSION: ''
PYTORCH_VERSION: 1.13.1
TAGS:
- mosaicml/composer:0.16.3_cpu
- mosaicml/composer:0.16.4_cpu
- mosaicml/composer:latest_cpu
TARGET: composer_stage
TORCHVISION_VERSION: 0.14.1
2 changes: 1 addition & 1 deletion docker/generate_build_matrix.py
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,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.16.3'] # Only build images for the latest composer version
composer_versions = ['0.16.4'] # Only build images for the latest composer version
composer_python_versions = [LATEST_PYTHON_VERSION] # just build composer against the latest

for product in itertools.product(composer_python_versions, composer_versions, cuda_options):
Expand Down
2 changes: 2 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,8 @@ filterwarnings = [
'''ignore:'has_mkldnn' is deprecated, please use 'torch.backends.mkldnn.is_available():UserWarning''',
# Ignore torch distributed deprecated warnings
'''ignore:torch.distributed.reduce_op is deprecated, please use torch.distributed.ReduceOp instead:UserWarning''',
# Ignore torch sharded tensor deprecated warnings
'''ignore:Please use DTensor instead and we are deprecating ShardedTensor.:UserWarning''',
]

# Coverage
Expand Down
2 changes: 0 additions & 2 deletions tests/cli/__init__.py

This file was deleted.

7 changes: 3 additions & 4 deletions tests/cli/test_cli.py → tests/test_cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
# SPDX-License-Identifier: Apache-2.0

import subprocess
import sys
from typing import List

import pytest
Expand All @@ -12,9 +11,9 @@

@pytest.mark.parametrize('args', [
['composer', '--version'],
[sys.executable, '-m', 'composer', '--version'],
[sys.executable, '-m', 'composer.cli', '--version'],
[sys.executable, '-m', 'composer.cli.launcher', '--version'],
['python', '-m', 'composer', '--version'],
['python', '-m', 'composer.cli', '--version'],
['python', '-m', 'composer.cli.launcher', '--version'],
])
def test_cli_version(args: List[str]):
version_str = subprocess.check_output(args, text=True)
Expand Down

0 comments on commit 1c9d8d1

Please sign in to comment.