From 81d172659194acddbb79afba27c622b6c5af82f4 Mon Sep 17 00:00:00 2001 From: Justin Goheen <26209687+JustinGoheen@users.noreply.github.com> Date: Sat, 16 Jul 2022 18:59:51 -0400 Subject: [PATCH 01/13] remove module from pyproject.toml --- pyproject.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 989e63122f640..8e678e3bcc215 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -61,7 +61,6 @@ module = [ "pytorch_lightning.loggers.comet", "pytorch_lightning.loggers.mlflow", "pytorch_lightning.loggers.neptune", - "pytorch_lightning.loggers.tensorboard", "pytorch_lightning.loggers.wandb", "pytorch_lightning.profilers.advanced", "pytorch_lightning.profilers.base", From 9cfb09adf95572179def2415bcbd1dd69aaa9e01 Mon Sep 17 00:00:00 2001 From: Justin Goheen <26209687+JustinGoheen@users.noreply.github.com> Date: Sat, 16 Jul 2022 19:49:49 -0400 Subject: [PATCH 02/13] update type hints --- src/pytorch_lightning/loggers/tensorboard.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/pytorch_lightning/loggers/tensorboard.py b/src/pytorch_lightning/loggers/tensorboard.py index 9f3023ee443ef..a0cc9e51bf048 100644 --- a/src/pytorch_lightning/loggers/tensorboard.py +++ b/src/pytorch_lightning/loggers/tensorboard.py @@ -96,7 +96,7 @@ def __init__( sub_dir: Optional[str] = None, agg_key_funcs: Optional[Mapping[str, Callable[[Sequence[float]], float]]] = None, agg_default_func: Optional[Callable[[Sequence[float]], float]] = None, - **kwargs, + **kwargs: Any, ): super().__init__(agg_key_funcs=agg_key_funcs, agg_default_func=agg_default_func) self._save_dir = save_dir @@ -108,8 +108,8 @@ def __init__( self._prefix = prefix self._fs = get_filesystem(save_dir) - self._experiment = None - self.hparams = {} + self._experiment: Optional["SummaryWriter"] = None + self.hparams: dict = {} self._kwargs = kwargs @property @@ -155,7 +155,7 @@ def sub_dir(self) -> Optional[str]: """ return self._sub_dir - @property + @property # type: ignore[misc] @rank_zero_experiment def experiment(self) -> SummaryWriter: r""" @@ -236,7 +236,7 @@ def log_metrics(self, metrics: Dict[str, float], step: Optional[int] = None) -> raise ValueError(m) from ex @rank_zero_only - def log_graph(self, model: "pl.LightningModule", input_array=None): + def log_graph(self, model: "pl.LightningModule", input_array: Optional[Tensor] = None) -> None: if self._log_graph: if input_array is None: input_array = model.example_input_array @@ -281,7 +281,7 @@ def name(self) -> str: return self._name @property - def version(self) -> int: + def version(self) -> Union[int, str, Any]: """Get the experiment version. Returns: @@ -291,7 +291,7 @@ def version(self) -> int: self._version = self._get_next_version() return self._version - def _get_next_version(self): + def _get_next_version(self): # type: ignore[no-untyped-def] root_dir = self.root_dir try: @@ -318,7 +318,7 @@ def _sanitize_params(params: Dict[str, Any]) -> Dict[str, Any]: # logging of arrays with dimension > 1 is not supported, sanitize as string return {k: str(v) if isinstance(v, (Tensor, np.ndarray)) and v.ndim > 1 else v for k, v in params.items()} - def __getstate__(self): + def __getstate__(self): # type: ignore[no-untyped-def] state = self.__dict__.copy() state["_experiment"] = None return state From 9a5cd94e7efc28e6d94d2808df4e5e65de2a9932 Mon Sep 17 00:00:00 2001 From: Justin Goheen <26209687+JustinGoheen@users.noreply.github.com> Date: Sat, 16 Jul 2022 19:59:58 -0400 Subject: [PATCH 03/13] add ignore --- src/pytorch_lightning/loggers/tensorboard.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pytorch_lightning/loggers/tensorboard.py b/src/pytorch_lightning/loggers/tensorboard.py index a0cc9e51bf048..ce8e87879be4e 100644 --- a/src/pytorch_lightning/loggers/tensorboard.py +++ b/src/pytorch_lightning/loggers/tensorboard.py @@ -119,7 +119,7 @@ def root_dir(self) -> str: If the experiment name parameter is an empty string, no experiment subdirectory is used and the checkpoint will be saved in "save_dir/version" """ - return os.path.join(self.save_dir, self.name) + return os.path.join(self.save_dir, self.name) # type: ignore[arg-type] @property def log_dir(self) -> str: From 189b860675313ab19873d39f3da790d6ff6ee245 Mon Sep 17 00:00:00 2001 From: Justin Goheen <26209687+JustinGoheen@users.noreply.github.com> Date: Mon, 18 Jul 2022 11:23:35 -0400 Subject: [PATCH 04/13] Update src/pytorch_lightning/loggers/tensorboard.py MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Adrian Wälchli --- src/pytorch_lightning/loggers/tensorboard.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pytorch_lightning/loggers/tensorboard.py b/src/pytorch_lightning/loggers/tensorboard.py index ce8e87879be4e..7911fe769304a 100644 --- a/src/pytorch_lightning/loggers/tensorboard.py +++ b/src/pytorch_lightning/loggers/tensorboard.py @@ -291,7 +291,7 @@ def version(self) -> Union[int, str, Any]: self._version = self._get_next_version() return self._version - def _get_next_version(self): # type: ignore[no-untyped-def] + def _get_next_version(self) -> int: root_dir = self.root_dir try: From 2dbd7341b4a867c98143ffe216aeab7f7862d0cf Mon Sep 17 00:00:00 2001 From: Justin Goheen <26209687+JustinGoheen@users.noreply.github.com> Date: Mon, 18 Jul 2022 11:23:52 -0400 Subject: [PATCH 05/13] Update src/pytorch_lightning/loggers/tensorboard.py MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Adrian Wälchli --- src/pytorch_lightning/loggers/tensorboard.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pytorch_lightning/loggers/tensorboard.py b/src/pytorch_lightning/loggers/tensorboard.py index 7911fe769304a..17179894fbf4d 100644 --- a/src/pytorch_lightning/loggers/tensorboard.py +++ b/src/pytorch_lightning/loggers/tensorboard.py @@ -318,7 +318,7 @@ def _sanitize_params(params: Dict[str, Any]) -> Dict[str, Any]: # logging of arrays with dimension > 1 is not supported, sanitize as string return {k: str(v) if isinstance(v, (Tensor, np.ndarray)) and v.ndim > 1 else v for k, v in params.items()} - def __getstate__(self): # type: ignore[no-untyped-def] + def __getstate__(self) -> Dict[str, Any]: state = self.__dict__.copy() state["_experiment"] = None return state From 3a9fad5e2d7d04f9d4b98c0a14130c3bb0c02821 Mon Sep 17 00:00:00 2001 From: Justin Goheen <26209687+JustinGoheen@users.noreply.github.com> Date: Mon, 18 Jul 2022 11:24:06 -0400 Subject: [PATCH 06/13] Update src/pytorch_lightning/loggers/tensorboard.py Co-authored-by: Rohit Gupta --- src/pytorch_lightning/loggers/tensorboard.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pytorch_lightning/loggers/tensorboard.py b/src/pytorch_lightning/loggers/tensorboard.py index 17179894fbf4d..8451e17b06cd0 100644 --- a/src/pytorch_lightning/loggers/tensorboard.py +++ b/src/pytorch_lightning/loggers/tensorboard.py @@ -109,7 +109,7 @@ def __init__( self._fs = get_filesystem(save_dir) self._experiment: Optional["SummaryWriter"] = None - self.hparams: dict = {} + self.hparams: Union[Dict[str, Any], Namespace] = {} self._kwargs = kwargs @property From 050acf2eaeb19cd16ff59dcf12abbc222ffb4f84 Mon Sep 17 00:00:00 2001 From: Justin Goheen <26209687+JustinGoheen@users.noreply.github.com> Date: Mon, 18 Jul 2022 11:24:23 -0400 Subject: [PATCH 07/13] Update src/pytorch_lightning/loggers/tensorboard.py Co-authored-by: Rohit Gupta --- src/pytorch_lightning/loggers/tensorboard.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pytorch_lightning/loggers/tensorboard.py b/src/pytorch_lightning/loggers/tensorboard.py index 8451e17b06cd0..3e21f727e4014 100644 --- a/src/pytorch_lightning/loggers/tensorboard.py +++ b/src/pytorch_lightning/loggers/tensorboard.py @@ -236,7 +236,7 @@ def log_metrics(self, metrics: Dict[str, float], step: Optional[int] = None) -> raise ValueError(m) from ex @rank_zero_only - def log_graph(self, model: "pl.LightningModule", input_array: Optional[Tensor] = None) -> None: + def log_graph(self, model: "pl.LightningModule", input_array: Any = None) -> None: if self._log_graph: if input_array is None: input_array = model.example_input_array From 3670ee07d73c5085dd6cf8beb4b2feacbae460a5 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 18 Jul 2022 15:26:53 +0000 Subject: [PATCH 08/13] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- src/pytorch_lightning/loggers/tensorboard.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pytorch_lightning/loggers/tensorboard.py b/src/pytorch_lightning/loggers/tensorboard.py index 3e21f727e4014..752f368492663 100644 --- a/src/pytorch_lightning/loggers/tensorboard.py +++ b/src/pytorch_lightning/loggers/tensorboard.py @@ -109,7 +109,7 @@ def __init__( self._fs = get_filesystem(save_dir) self._experiment: Optional["SummaryWriter"] = None - self.hparams: Union[Dict[str, Any], Namespace] = {} + self.hparams: Union[Dict[str, Any], Namespace] = {} self._kwargs = kwargs @property From 10162cec9102059a218ac47ee0fdb9b1a0f121b3 Mon Sep 17 00:00:00 2001 From: Justin Goheen <26209687+JustinGoheen@users.noreply.github.com> Date: Mon, 18 Jul 2022 11:49:31 -0400 Subject: [PATCH 09/13] Update src/pytorch_lightning/loggers/tensorboard.py Co-authored-by: Rohit Gupta --- src/pytorch_lightning/loggers/tensorboard.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pytorch_lightning/loggers/tensorboard.py b/src/pytorch_lightning/loggers/tensorboard.py index 752f368492663..fcd665b4f3e96 100644 --- a/src/pytorch_lightning/loggers/tensorboard.py +++ b/src/pytorch_lightning/loggers/tensorboard.py @@ -281,7 +281,7 @@ def name(self) -> str: return self._name @property - def version(self) -> Union[int, str, Any]: + def version(self) -> Union[int, str]: """Get the experiment version. Returns: From eca640a1622d2392a5ff61af2ffc0be43cd39e2a Mon Sep 17 00:00:00 2001 From: Justin Goheen <26209687+JustinGoheen@users.noreply.github.com> Date: Mon, 18 Jul 2022 16:02:38 -0400 Subject: [PATCH 10/13] make save_dir req'd --- src/pytorch_lightning/loggers/tensorboard.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pytorch_lightning/loggers/tensorboard.py b/src/pytorch_lightning/loggers/tensorboard.py index fcd665b4f3e96..0fff0aad27f91 100644 --- a/src/pytorch_lightning/loggers/tensorboard.py +++ b/src/pytorch_lightning/loggers/tensorboard.py @@ -119,7 +119,7 @@ def root_dir(self) -> str: If the experiment name parameter is an empty string, no experiment subdirectory is used and the checkpoint will be saved in "save_dir/version" """ - return os.path.join(self.save_dir, self.name) # type: ignore[arg-type] + return os.path.join(self.save_dir, self.name) @property def log_dir(self) -> str: @@ -138,7 +138,7 @@ def log_dir(self) -> str: return log_dir @property - def save_dir(self) -> Optional[str]: + def save_dir(self) -> str: """Gets the save directory where the TensorBoard experiments are saved. Returns: From 2f4254ace3dc94d76855714e8e51c32a201b5f11 Mon Sep 17 00:00:00 2001 From: Justin Goheen <26209687+JustinGoheen@users.noreply.github.com> Date: Mon, 18 Jul 2022 16:03:37 -0400 Subject: [PATCH 11/13] Update src/pytorch_lightning/loggers/tensorboard.py MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Carlos Mocholí --- src/pytorch_lightning/loggers/tensorboard.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pytorch_lightning/loggers/tensorboard.py b/src/pytorch_lightning/loggers/tensorboard.py index 0fff0aad27f91..33a80f52db342 100644 --- a/src/pytorch_lightning/loggers/tensorboard.py +++ b/src/pytorch_lightning/loggers/tensorboard.py @@ -236,7 +236,7 @@ def log_metrics(self, metrics: Dict[str, float], step: Optional[int] = None) -> raise ValueError(m) from ex @rank_zero_only - def log_graph(self, model: "pl.LightningModule", input_array: Any = None) -> None: + def log_graph(self, model: "pl.LightningModule", input_array: Optional[Any] = None) -> None: if self._log_graph: if input_array is None: input_array = model.example_input_array From c523acad43659b70cfc7b69217764553c4d0e546 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mochol=C3=AD?= Date: Mon, 18 Jul 2022 22:08:52 +0200 Subject: [PATCH 12/13] Tensor --- src/pytorch_lightning/loggers/tensorboard.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pytorch_lightning/loggers/tensorboard.py b/src/pytorch_lightning/loggers/tensorboard.py index 33a80f52db342..12ec2e21b84ce 100644 --- a/src/pytorch_lightning/loggers/tensorboard.py +++ b/src/pytorch_lightning/loggers/tensorboard.py @@ -236,7 +236,7 @@ def log_metrics(self, metrics: Dict[str, float], step: Optional[int] = None) -> raise ValueError(m) from ex @rank_zero_only - def log_graph(self, model: "pl.LightningModule", input_array: Optional[Any] = None) -> None: + def log_graph(self, model: "pl.LightningModule", input_array: Optional[Tensor] = None) -> None: if self._log_graph: if input_array is None: input_array = model.example_input_array From 894a623ff247359748943dc5901e67cabbf4f13c Mon Sep 17 00:00:00 2001 From: otaj Date: Wed, 20 Jul 2022 18:27:58 +0200 Subject: [PATCH 13/13] empty