Merge branch 'main' into dev

Author: hanlint

Makefile

@@ -5,6 +5,7 @@ MASTER_PORT ?= 26000 # port for distributed tests
 PYTHON ?= python
 PYTEST ?= pytest
 EXTRA_ARGS ?=  # extra arguments for pytest
+PYRIGHT_PYTHON_FORCE_VERSION ?= 1.1.224
 
 # Force append the duration flag to extra args
 override EXTRA_ARGS += --duration $(DURATION)
@@ -22,7 +23,7 @@ lint:
 	$(PYTHON) -m isort -c --diff $(dirs)
 	$(PYTHON) -m yapf -dr $(dirs)
 	$(PYTHON) -m docformatter -r --wrap-summaries 120 --wrap-descriptions 120 $(dirs)
-	pyright $(dirs)
+	PYRIGHT_PYTHON_FORCE_VERSION=$(PYRIGHT_PYTHON_FORCE_VERSION) pyright $(dirs)
 
 test:
 	$(PYTHON) -m $(PYTEST) tests/ $(EXTRA_ARGS)

composer/__init__.py

@@ -23,4 +23,4 @@
 from composer.models import ComposerModel as ComposerModel
 from composer.trainer import Trainer as Trainer
 
-__version__ = "0.3.1"
+__version__ = "0.4.0"

composer/loggers/wandb_logger.py

@@ -81,6 +81,8 @@ def state_dict(self) -> StateDict:
 
         # Storing these fields in the state dict to support run resuming in the future.
         if self._enabled:
+            if wandb.run is None:
+                raise ValueError("wandb must be initialized before serialization.")
             return {
                 "name": wandb.run.name,
                 "project": wandb.run.project,

docs/source/index.rst

@@ -15,7 +15,7 @@ Using Composer, you can:
 Composer features:
 
 - 20+ efficient training methods for training a better language and vision models! Don't waste hours trying to reproduce research papers when Composer has done the work for you.
-- Easy-to-use Trainer interface written to be as performant as possible, and `integrated best practices<https://www.mosaicml.com/blog/best-practices-dec-2021>`.
+- Easy-to-use Trainer interface written to be as performant as possible, and `integrated best practices <https://www.mosaicml.com/blog/best-practices-dec-2021>`_.
 - Easy-to-use Functional forms that allow you to integrate efficient training methods into your training loop!
 - Strong, `reproducible` baselines to get you started as 💨 fast 💨 as possible
 

meta.yaml

@@ -2,11 +2,11 @@
 
 package:
   name: mosaicml
-  version: "0.3.1"
+  version: "0.4.0"
 
 source:
   git_url: https://github.com/mosaicml/composer.git
-  # TODO change to "v0.3.1"
+  # TODO change to "v0.4.0"
   git_rev: "dev"
   git_depth: 1
 
@@ -56,7 +56,7 @@ test:
     - pytest-timeout >=1.4.2
     - testbook >=0.4.2
     # Including all run_constrained requirements in the test requirements, so those tests will not be import-skipped
-    - pip  # Since deepspeed and timm are not available on anaconda, they are installed via pip.
+    - pip # Since deepspeed and timm are not available on anaconda, they are installed via pip.
     - wandb >=0.12.2
     - monai >=0.7.0
     - scikit-learn >=1.0.1
@@ -74,7 +74,7 @@ test:
     - composer
     - tests
   commands:
-    - pip install deepspeed>=0.5.5 timm>=0.5.4  # deepspeed is not available on conda, and timm has a conda version conflict
+    - pip install deepspeed>=0.5.5 timm>=0.5.4 # deepspeed is not available on conda, and timm has a conda version conflict
     - make test DURATION=all EXTRA_ARGS="-m 'not notebooks and not gpu'"
     - make test-dist DURATION=all WORLD_SIZE=2 EXTRA_ARGS="-m 'not notebooks and not gpu'"