diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index a5af9008..df137017 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -20,7 +20,7 @@ repos: - id: sort-simple-yaml - id: trailing-whitespace - repo: https://github.com/psf/black - rev: 23.3.0 + rev: 23.7.0 hooks: - id: black - repo: https://github.com/PyCQA/isort @@ -34,7 +34,7 @@ repos: additional_dependencies: ["tomli"] - repo: https://github.com/astral-sh/ruff-pre-commit # Ruff version. - rev: 'v0.0.277' + rev: 'v0.0.278' hooks: - id: ruff - repo: https://github.com/executablebooks/mdformat diff --git a/src/dvclive/_dvclive_version.py b/src/dvclive/_dvclive_version.py new file mode 100644 index 00000000..c7467cfb --- /dev/null +++ b/src/dvclive/_dvclive_version.py @@ -0,0 +1,4 @@ +# file generated by setuptools_scm +# don't change, don't track in version control +__version__ = version = "2.12.2.dev4+gc3a798a" +__version_tuple__ = version_tuple = (2, 12, 2, "dev4", "gc3a798a") diff --git a/src/dvclive/lightning.py b/src/dvclive/lightning.py index fef5de26..7dc2c0f6 100644 --- a/src/dvclive/lightning.py +++ b/src/dvclive/lightning.py @@ -3,15 +3,27 @@ from pathlib import Path from typing import Any, Dict, List, Optional, Union -from lightning.fabric.utilities.logger import ( - _convert_params, - _sanitize_callable_params, - _sanitize_params, -) -from lightning.pytorch.callbacks.model_checkpoint import ModelCheckpoint -from lightning.pytorch.loggers.logger import Logger, rank_zero_experiment -from lightning.pytorch.loggers.utilities import _scan_checkpoints -from lightning.pytorch.utilities import rank_zero_only +try: + from lightning.fabric.utilities.logger import ( + _convert_params, + _sanitize_callable_params, + _sanitize_params, + ) + from lightning.pytorch.callbacks.model_checkpoint import ModelCheckpoint + from lightning.pytorch.loggers.logger import Logger, rank_zero_experiment + from lightning.pytorch.loggers.utilities import _scan_checkpoints + from lightning.pytorch.utilities import rank_zero_only +except ImportError: + from lightning_fabric.utilities.logger import ( + _convert_params, + _sanitize_callable_params, + _sanitize_params, + ) + from pytorch_lightning.callbacks import ModelCheckpoint + from pytorch_lightning.loggers.logger import Logger, rank_zero_experiment + from pytorch_lightning.utilities.logger import _scan_checkpoints + from pytorch_lightning.utilities import rank_zero_only + from torch import is_tensor from dvclive import Live diff --git a/src/dvclive/live.py b/src/dvclive/live.py index 309cbcd7..3c8f727e 100644 --- a/src/dvclive/live.py +++ b/src/dvclive/live.py @@ -43,7 +43,6 @@ formatter = logging.Formatter("%(levelname)s:%(name)s:%(message)s") handler.setFormatter(formatter) logger.addHandler(handler) -logger.setLevel(os.getenv(env.DVCLIVE_LOGLEVEL, "INFO").upper()) ParamLike = Union[int, float, str, bool, List["ParamLike"], Dict[str, "ParamLike"]] @@ -133,9 +132,7 @@ def _init_dvc(self): self._exp_name = os.getenv(env.DVC_EXP_NAME, "") self._inside_dvc_exp = True if self._save_dvc_exp: - logger.warning( - "Ignoring `_save_dvc_exp` because `dvc exp run` is running" - ) + logger.info("Ignoring `save_dvc_exp` because `dvc exp run` is running") self._save_dvc_exp = False self._dvc_repo = get_dvc_repo()