From 6530b36bb0779ba7c0a1ccf736567c4a2bf159d5 Mon Sep 17 00:00:00 2001 From: Bhavay Malhotra Date: Fri, 7 Jun 2024 23:25:57 +0530 Subject: [PATCH 1/4] Added torch.bool in logger.py --- src/lightning/fabric/utilities/logger.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lightning/fabric/utilities/logger.py b/src/lightning/fabric/utilities/logger.py index 2604a0d926d21..e6e65f4b93e59 100644 --- a/src/lightning/fabric/utilities/logger.py +++ b/src/lightning/fabric/utilities/logger.py @@ -17,6 +17,7 @@ from typing import Any, Dict, Mapping, MutableMapping, Optional, Union import numpy as np +import torch from torch import Tensor @@ -125,7 +126,7 @@ def _sanitize_params(params: Dict[str, Any]) -> Dict[str, Any]: """ for k in params: # convert relevant np scalars to python types first (instead of str) - if isinstance(params[k], (np.bool_, np.integer, np.floating)): + if isinstance(params[k], (torch.bool, np.integer, np.floating)): params[k] = params[k].item() elif type(params[k]) not in [bool, int, float, str, Tensor]: params[k] = str(params[k]) From 10003cb5fd8190a0767339d06b61f5e4cd863058 Mon Sep 17 00:00:00 2001 From: Bhavay Malhotra Date: Sat, 8 Jun 2024 12:34:04 +0530 Subject: [PATCH 2/4] Added Union to isinstance --- src/lightning/fabric/utilities/logger.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lightning/fabric/utilities/logger.py b/src/lightning/fabric/utilities/logger.py index e6e65f4b93e59..0d26d7c147e89 100644 --- a/src/lightning/fabric/utilities/logger.py +++ b/src/lightning/fabric/utilities/logger.py @@ -126,7 +126,7 @@ def _sanitize_params(params: Dict[str, Any]) -> Dict[str, Any]: """ for k in params: # convert relevant np scalars to python types first (instead of str) - if isinstance(params[k], (torch.bool, np.integer, np.floating)): + if isinstance(params[k], Union[torch.bool, np.integer, np.floating]): params[k] = params[k].item() elif type(params[k]) not in [bool, int, float, str, Tensor]: params[k] = str(params[k]) From 6da7481c10ec405613f02971c5391212ba044c3d Mon Sep 17 00:00:00 2001 From: Bhavay Malhotra Date: Mon, 10 Jun 2024 20:20:45 +0530 Subject: [PATCH 3/4] Changed some places with numpy dependency --- src/lightning/fabric/utilities/logger.py | 2 +- src/lightning/fabric/utilities/seed.py | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/lightning/fabric/utilities/logger.py b/src/lightning/fabric/utilities/logger.py index 0d26d7c147e89..55fb1e5279b2a 100644 --- a/src/lightning/fabric/utilities/logger.py +++ b/src/lightning/fabric/utilities/logger.py @@ -126,7 +126,7 @@ def _sanitize_params(params: Dict[str, Any]) -> Dict[str, Any]: """ for k in params: # convert relevant np scalars to python types first (instead of str) - if isinstance(params[k], Union[torch.bool, np.integer, np.floating]): + if isinstance(params[k], (np.bool_, np.integer, np.floating)): params[k] = params[k].item() elif type(params[k]) not in [bool, int, float, str, Tensor]: params[k] = str(params[k]) diff --git a/src/lightning/fabric/utilities/seed.py b/src/lightning/fabric/utilities/seed.py index b274bce88fcdf..d9c16b1726123 100644 --- a/src/lightning/fabric/utilities/seed.py +++ b/src/lightning/fabric/utilities/seed.py @@ -12,8 +12,8 @@ log = logging.getLogger(__name__) -max_seed_value = np.iinfo(np.uint32).max -min_seed_value = np.iinfo(np.uint32).min +max_seed_value = torch.iinfo(torch.uint32).max +min_seed_value = torch.iinfo(torch.uint32).min def seed_everything(seed: Optional[int] = None, workers: bool = False) -> int: @@ -54,7 +54,6 @@ def seed_everything(seed: Optional[int] = None, workers: bool = False) -> int: log.info(rank_prefixed_message(f"Seed set to {seed}", _get_rank())) os.environ["PL_GLOBAL_SEED"] = str(seed) random.seed(seed) - np.random.seed(seed) torch.manual_seed(seed) os.environ["PL_SEED_WORKERS"] = f"{int(workers)}" @@ -93,12 +92,12 @@ def pl_worker_init_function(worker_id: int, rank: Optional[int] = None) -> None: ) ss = np.random.SeedSequence([base_seed, worker_id, global_rank]) # use 128 bits (4 x 32-bit words) - np.random.seed(ss.generate_state(4)) + random.seed(ss.generate_state(4)) # Spawn distinct SeedSequences for the PyTorch PRNG and the stdlib random module torch_ss, stdlib_ss = ss.spawn(2) - torch.manual_seed(torch_ss.generate_state(1, dtype=np.uint64)[0]) + torch.manual_seed(torch_ss.generate_state(1, dtype=torch.uint64)[0]) # use 128 bits expressed as an integer - stdlib_seed = (stdlib_ss.generate_state(2, dtype=np.uint64).astype(object) * [1 << 64, 1]).sum() + stdlib_seed = (stdlib_ss.generate_state(2, dtype=torch.uint64).astype(object) * [1 << 64, 1]).sum() random.seed(stdlib_seed) From 707f9d8cf6993c7e4d3299a576f29fb15bb9a813 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 10 Jun 2024 14:51:16 +0000 Subject: [PATCH 4/4] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- src/lightning/fabric/utilities/logger.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/lightning/fabric/utilities/logger.py b/src/lightning/fabric/utilities/logger.py index 55fb1e5279b2a..2604a0d926d21 100644 --- a/src/lightning/fabric/utilities/logger.py +++ b/src/lightning/fabric/utilities/logger.py @@ -17,7 +17,6 @@ from typing import Any, Dict, Mapping, MutableMapping, Optional, Union import numpy as np -import torch from torch import Tensor