From fee19e9b9b434dcd79c0d271898aaf3b9d724939 Mon Sep 17 00:00:00 2001
From: Alexander Borzunov <borzunov.alexander@gmail.com>
Date: Sun, 19 Feb 2023 05:46:17 +0400
Subject: [PATCH] Use get_logger(__name__) instead of get_logger(__file__)
 (#265)

---
 src/petals/bloom/from_pretrained.py           | 2 +-
 src/petals/bloom/modeling_utils.py            | 2 +-
 src/petals/cli/convert_model.py               | 2 +-
 src/petals/cli/inference_one_block.py         | 2 +-
 src/petals/cli/run_server.py                  | 2 +-
 src/petals/client/inference_session.py        | 2 +-
 src/petals/client/remote_generation.py        | 2 +-
 src/petals/client/remote_model.py             | 2 +-
 src/petals/client/remote_sequential.py        | 2 +-
 src/petals/client/routing/sequence_info.py    | 2 +-
 src/petals/client/routing/sequence_manager.py | 2 +-
 src/petals/client/sequential_autograd.py      | 2 +-
 src/petals/dht_utils.py                       | 2 +-
 src/petals/server/backend.py                  | 2 +-
 src/petals/server/block_selection.py          | 2 +-
 src/petals/server/handler.py                  | 2 +-
 src/petals/server/memory_cache.py             | 2 +-
 src/petals/server/server.py                   | 2 +-
 src/petals/server/task_pool.py                | 2 +-
 src/petals/server/throughput.py               | 2 +-
 src/petals/utils/convert_block.py             | 2 +-
 src/petals/utils/disk_cache.py                | 2 +-
 src/petals/utils/version.py                   | 2 +-
 tests/test_full_model.py                      | 2 +-
 tests/test_remote_sequential.py               | 2 +-
 tests/test_sequence_manager.py                | 2 +-
 26 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/src/petals/bloom/from_pretrained.py b/src/petals/bloom/from_pretrained.py
index fa31602..f8e41a7 100644
--- a/src/petals/bloom/from_pretrained.py
+++ b/src/petals/bloom/from_pretrained.py
@@ -22,7 +22,7 @@ from petals.bloom.block import WrappedBloomBlock
 from petals.server.block_utils import get_block_size
 from petals.utils.disk_cache import DEFAULT_CACHE_DIR, allow_cache_reads, allow_cache_writes, free_disk_space_for
 
-logger = get_logger(__file__)
+logger = get_logger(__name__)
 
 CLIENT_BRANCH = "main"
 BLOCK_BRANCH_PREFIX = "block_"
diff --git a/src/petals/bloom/modeling_utils.py b/src/petals/bloom/modeling_utils.py
index 4e2899c..cb069b8 100644
--- a/src/petals/bloom/modeling_utils.py
+++ b/src/petals/bloom/modeling_utils.py
@@ -13,7 +13,7 @@ from hivemind import get_logger
 from torch import nn
 from transformers import BloomConfig
 
-logger = get_logger(__file__)
+logger = get_logger(__name__)
 
 
 class LMHead(nn.Module):
diff --git a/src/petals/cli/convert_model.py b/src/petals/cli/convert_model.py
index 289c764..6f7499d 100644
--- a/src/petals/cli/convert_model.py
+++ b/src/petals/cli/convert_model.py
@@ -13,7 +13,7 @@ from transformers.models.bloom.modeling_bloom import BloomModel
 from petals.bloom.from_pretrained import BLOCK_BRANCH_PREFIX, CLIENT_BRANCH
 from petals.client import DistributedBloomConfig
 
-logger = get_logger(__file__)
+logger = get_logger(__name__)
 
 DTYPE_MAP = dict(bfloat16=torch.bfloat16, float16=torch.float16, float32=torch.float32, auto="auto")
 
diff --git a/src/petals/cli/inference_one_block.py b/src/petals/cli/inference_one_block.py
index 9f7c5b4..01ba1ef 100644
--- a/src/petals/cli/inference_one_block.py
+++ b/src/petals/cli/inference_one_block.py
@@ -8,7 +8,7 @@ from transformers.models.bloom.modeling_bloom import build_alibi_tensor
 
 from petals.bloom.block import BloomBlock
 
-logger = get_logger(__file__)
+logger = get_logger(__name__)
 
 logger.warning("inference_one_block will soon be deprecated in favour of tests!")
 
diff --git a/src/petals/cli/run_server.py b/src/petals/cli/run_server.py
index 135720d..5fb700d 100644
--- a/src/petals/cli/run_server.py
+++ b/src/petals/cli/run_server.py
@@ -10,7 +10,7 @@ from petals.constants import PUBLIC_INITIAL_PEERS
 from petals.server.server import Server
 from petals.utils.version import validate_version
 
-logger = get_logger(__file__)
+logger = get_logger(__name__)
 
 
 def main():
diff --git a/src/petals/client/inference_session.py b/src/petals/client/inference_session.py
index 902dd0f..24a188a 100644
--- a/src/petals/client/inference_session.py
+++ b/src/petals/client/inference_session.py
@@ -25,7 +25,7 @@ from petals.data_structures import CHAIN_DELIMITER, ModuleUID, RemoteSpanInfo, R
 from petals.server.handler import TransformerConnectionHandler
 from petals.utils.misc import DUMMY, is_dummy
 
-logger = get_logger(__file__)
+logger = get_logger(__name__)
 
 
 class _ServerInferenceSession:
diff --git a/src/petals/client/remote_generation.py b/src/petals/client/remote_generation.py
index 4ea0c9b..bcf59ab 100644
--- a/src/petals/client/remote_generation.py
+++ b/src/petals/client/remote_generation.py
@@ -15,7 +15,7 @@ from petals.utils.generation_algorithms import (
 )
 from petals.utils.generation_constraints import ABCBloomConstraint, EosConstraint
 
-logger = get_logger(__file__)
+logger = get_logger(__name__)
 
 
 class RemoteGenerationMixin:
diff --git a/src/petals/client/remote_model.py b/src/petals/client/remote_model.py
index 6f8ebf1..e2c0258 100644
--- a/src/petals/client/remote_model.py
+++ b/src/petals/client/remote_model.py
@@ -21,7 +21,7 @@ from petals.client.remote_sequential import RemoteSequential
 from petals.constants import PUBLIC_INITIAL_PEERS
 from petals.utils.misc import DUMMY
 
-logger = get_logger(__file__)
+logger = get_logger(__name__)
 
 
 class DistributedBloomConfig(BloomConfig):
diff --git a/src/petals/client/remote_sequential.py b/src/petals/client/remote_sequential.py
index 6b9841e..31a33af 100644
--- a/src/petals/client/remote_sequential.py
+++ b/src/petals/client/remote_sequential.py
@@ -14,7 +14,7 @@ from petals.client.sequential_autograd import _RemoteSequentialAutogradFunction
 from petals.data_structures import UID_DELIMITER
 from petals.utils.misc import DUMMY
 
-logger = get_logger(__file__)
+logger = get_logger(__name__)
 
 
 class RemoteSequential(nn.Module):
diff --git a/src/petals/client/routing/sequence_info.py b/src/petals/client/routing/sequence_info.py
index e69cd35..de7eb37 100644
--- a/src/petals/client/routing/sequence_info.py
+++ b/src/petals/client/routing/sequence_info.py
@@ -6,7 +6,7 @@ from hivemind import get_logger
 
 from petals.data_structures import ModuleUID, RemoteModuleInfo, RemoteSpanInfo, ServerState
 
-logger = get_logger(__file__)
+logger = get_logger(__name__)
 
 
 T = TypeVar("T")
diff --git a/src/petals/client/routing/sequence_manager.py b/src/petals/client/routing/sequence_manager.py
index a299bc7..1ca58cf 100644
--- a/src/petals/client/routing/sequence_manager.py
+++ b/src/petals/client/routing/sequence_manager.py
@@ -23,7 +23,7 @@ from petals.client.routing.spending_policy import NoSpendingPolicy
 from petals.data_structures import ModuleUID, RemoteSpanInfo, ServerState
 from petals.server.handler import TransformerConnectionHandler
 
-logger = get_logger(__file__)
+logger = get_logger(__name__)
 
 
 class RemoteSequenceManager:
diff --git a/src/petals/client/sequential_autograd.py b/src/petals/client/sequential_autograd.py
index 75d087b..b846dfc 100644
--- a/src/petals/client/sequential_autograd.py
+++ b/src/petals/client/sequential_autograd.py
@@ -18,7 +18,7 @@ from petals.data_structures import CHAIN_DELIMITER, RemoteSpanInfo
 from petals.server.handler import TransformerConnectionHandler
 from petals.utils.misc import DUMMY, is_dummy
 
-logger = get_logger(__file__)
+logger = get_logger(__name__)
 
 MAX_TOKENS_IN_BATCH = 1024
 
diff --git a/src/petals/dht_utils.py b/src/petals/dht_utils.py
index 09aa27a..3542e40 100644
--- a/src/petals/dht_utils.py
+++ b/src/petals/dht_utils.py
@@ -15,7 +15,7 @@ from hivemind.utils import DHTExpiration, MPFuture, get_dht_time, get_logger
 import petals.client
 from petals.data_structures import CHAIN_DELIMITER, UID_DELIMITER, ModuleUID, RemoteModuleInfo, ServerInfo, ServerState
 
-logger = get_logger(__file__)
+logger = get_logger(__name__)
 
 
 def declare_active_modules(
diff --git a/src/petals/server/backend.py b/src/petals/server/backend.py
index cd8dce4..dc9cebb 100644
--- a/src/petals/server/backend.py
+++ b/src/petals/server/backend.py
@@ -20,7 +20,7 @@ from petals.server.memory_cache import Handle, MemoryCache
 from petals.server.task_pool import PrioritizedTaskPool
 from petals.utils.misc import is_dummy
 
-logger = get_logger(__file__)
+logger = get_logger(__name__)
 
 
 class TransformerBackend(ModuleBackend):
diff --git a/src/petals/server/block_selection.py b/src/petals/server/block_selection.py
index 1aa39da..cc050d4 100644
--- a/src/petals/server/block_selection.py
+++ b/src/petals/server/block_selection.py
@@ -8,7 +8,7 @@ from petals.data_structures import RemoteModuleInfo, ServerState
 
 __all__ = ["choose_best_blocks", "should_choose_other_blocks"]
 
-logger = get_logger(__file__)
+logger = get_logger(__name__)
 
 
 @dataclass
diff --git a/src/petals/server/handler.py b/src/petals/server/handler.py
index b1c36ed..79376f8 100644
--- a/src/petals/server/handler.py
+++ b/src/petals/server/handler.py
@@ -32,7 +32,7 @@ from petals.server.task_pool import PrioritizedTaskPool
 from petals.server.task_prioritizer import DummyTaskPrioritizer, TaskPrioritizerBase
 from petals.utils.misc import DUMMY, is_dummy
 
-logger = get_logger(__file__)
+logger = get_logger(__name__)
 
 CACHE_TOKENS_AVAILABLE = "cache_tokens_available"
 
diff --git a/src/petals/server/memory_cache.py b/src/petals/server/memory_cache.py
index 0e39cf5..7ea981f 100644
--- a/src/petals/server/memory_cache.py
+++ b/src/petals/server/memory_cache.py
@@ -18,7 +18,7 @@ from hivemind.utils import TensorDescriptor, get_logger
 
 from petals.utils.asyncio import shield_and_wait
 
-logger = get_logger(__file__)
+logger = get_logger(__name__)
 
 Handle = int
 
diff --git a/src/petals/server/server.py b/src/petals/server/server.py
index 3a5eefd..29e9d6b 100644
--- a/src/petals/server/server.py
+++ b/src/petals/server/server.py
@@ -31,7 +31,7 @@ from petals.server.throughput import get_dtype_name, get_host_throughput
 from petals.utils.convert_block import check_device_balance, convert_block
 from petals.utils.disk_cache import DEFAULT_CACHE_DIR
 
-logger = get_logger(__file__)
+logger = get_logger(__name__)
 
 
 class Server:
diff --git a/src/petals/server/task_pool.py b/src/petals/server/task_pool.py
index 330679c..e027d52 100644
--- a/src/petals/server/task_pool.py
+++ b/src/petals/server/task_pool.py
@@ -12,7 +12,7 @@ from hivemind import get_logger
 from hivemind.moe.server.task_pool import TaskPoolBase
 from hivemind.utils.mpfuture import ALL_STATES, MPFuture
 
-logger = get_logger(__file__)
+logger = get_logger(__name__)
 
 
 @dataclass(order=True, frozen=True)
diff --git a/src/petals/server/throughput.py b/src/petals/server/throughput.py
index 8b6dc9c..ac43759 100644
--- a/src/petals/server/throughput.py
+++ b/src/petals/server/throughput.py
@@ -16,7 +16,7 @@ from petals.server.block_utils import resolve_block_dtype
 from petals.utils.convert_block import convert_block
 from petals.utils.disk_cache import DEFAULT_CACHE_DIR
 
-logger = get_logger(__file__)
+logger = get_logger(__name__)
 
 try:
     import speedtest
diff --git a/src/petals/utils/convert_block.py b/src/petals/utils/convert_block.py
index 0afe641..4938289 100644
--- a/src/petals/utils/convert_block.py
+++ b/src/petals/utils/convert_block.py
@@ -15,7 +15,7 @@ from transformers.models.bloom.modeling_bloom import BloomAttention
 from petals.bloom.block import WrappedBloomBlock
 
 use_hivemind_log_handler("in_root_logger")
-logger = get_logger(__file__)
+logger = get_logger(__name__)
 
 
 def convert_block(
diff --git a/src/petals/utils/disk_cache.py b/src/petals/utils/disk_cache.py
index eb23477..3217e34 100644
--- a/src/petals/utils/disk_cache.py
+++ b/src/petals/utils/disk_cache.py
@@ -8,7 +8,7 @@ from typing import Optional
 import huggingface_hub
 from hivemind.utils.logging import get_logger
 
-logger = get_logger(__file__)
+logger = get_logger(__name__)
 
 DEFAULT_CACHE_DIR = os.getenv("PETALS_CACHE", Path(Path.home(), ".cache", "petals"))
 
diff --git a/src/petals/utils/version.py b/src/petals/utils/version.py
index b992c27..f4a5be1 100644
--- a/src/petals/utils/version.py
+++ b/src/petals/utils/version.py
@@ -4,7 +4,7 @@ from packaging.version import parse
 
 import petals
 
-logger = get_logger(__file__)
+logger = get_logger(__name__)
 
 
 def validate_version():
diff --git a/tests/test_full_model.py b/tests/test_full_model.py
index d2b272f..1c48c87 100644
--- a/tests/test_full_model.py
+++ b/tests/test_full_model.py
@@ -8,7 +8,7 @@ from transformers.models.bloom import BloomForCausalLM
 
 from petals.client.remote_model import DistributedBloomForCausalLM
 
-logger = get_logger(__file__)
+logger = get_logger(__name__)
 
 
 @pytest.mark.forked
diff --git a/tests/test_remote_sequential.py b/tests/test_remote_sequential.py
index a8e585f..7f49a6e 100644
--- a/tests/test_remote_sequential.py
+++ b/tests/test_remote_sequential.py
@@ -10,7 +10,7 @@ from petals.client import RemoteSequenceManager, RemoteSequential
 from petals.client.remote_model import DistributedBloomConfig
 from petals.data_structures import UID_DELIMITER
 
-logger = get_logger(__file__)
+logger = get_logger(__name__)
 
 
 @pytest.mark.forked
diff --git a/tests/test_sequence_manager.py b/tests/test_sequence_manager.py
index 29562c3..7c175a8 100644
--- a/tests/test_sequence_manager.py
+++ b/tests/test_sequence_manager.py
@@ -10,7 +10,7 @@ from petals.client import RemoteSequenceManager, RemoteSequential
 from petals.client.remote_model import DistributedBloomConfig
 from petals.data_structures import UID_DELIMITER
 
-logger = get_logger(__file__)
+logger = get_logger(__name__)
 
 
 @pytest.mark.forked