Skip to content

Commit 3c424f8

Browse files
Arm backend: Use correct log-level in tests
Arm tests logged too much as comparisons with logger.level were used instead of logger.getEffectiveLevel(). logger.level will always be logging.NOTSET unless explicitly set with logger.setLevel() which we want to avoid. Instead, we should use logger.getEffectiveLevel() which will inherit the level from its parent. Signed-off-by: Oscar Andersson <[email protected]> Change-Id: If863593e7dbe455999d5b7bca33cc2511aa3ee50
1 parent bde6b11 commit 3c424f8

File tree

7 files changed

+8
-14
lines changed

7 files changed

+8
-14
lines changed

backends/arm/_passes/decompose_embedding_pass.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
from .arm_pass_utils import create_node, get_first_fake_tensor
1818

1919
logger = logging.getLogger(__name__)
20-
logger.setLevel(logging.WARNING)
2120

2221

2322
class DecomposeEmbeddingPass(ArmPass):

backends/arm/operator_support/right_shift_support.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,5 +48,5 @@ def is_node_tosa_supported(
4848
"""
4949
# TODO MLETORCH-525 Remove warning
5050
if tosa_spec.is_U55_subset:
51-
logging.warning(f"{node.target} may introduce one-off errors.")
51+
logger.warning(f"{node.target} may introduce one-off errors.")
5252
return True

backends/arm/operator_support/slice_copy_support.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,6 @@ def is_node_tosa_supported(self, node: fx.Node, tosa_spec: TosaSpecification) ->
3232

3333
args = node.args
3434
if len(args) == 5 and (step := args[4]) != 1:
35-
logging.warning(f"{node.target} with step size of {step} not supported.")
35+
logger.warning(f"{node.target} with step size of {step} not supported.")
3636
return False
3737
return True

backends/arm/test/conftest.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@
66
import logging
77
import os
88
import random
9-
import sys
109
from typing import Any
1110

1211
import pytest
1312

13+
logger = logging.getLogger(__name__)
14+
1415
"""
1516
This file contains the pytest hooks, fixtures etc. for the Arm test suite.
1617
"""
@@ -29,8 +30,6 @@ def pytest_configure(config):
2930
if config.option.arm_run_tosa_version:
3031
pytest._test_options["tosa_version"] = config.option.arm_run_tosa_version
3132

32-
logging.basicConfig(level=logging.INFO, stream=sys.stdout)
33-
3433

3534
def pytest_collection_modifyitems(config, items):
3635
pass
@@ -98,7 +97,7 @@ def set_random_seed():
9897
"ARM_TEST_SEED env variable must be integers or the string RANDOM"
9998
)
10099

101-
print(f" ARM_TEST_SEED={seed} ", end=" ")
100+
logger.info(f"ARM_TEST_SEED={seed}")
102101

103102

104103
# ==== End of Pytest fixtures =====

backends/arm/test/models/test_deit_tiny_arm.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
from torchvision import transforms
2424

2525
logger = logging.getLogger(__name__)
26-
logger.setLevel(logging.INFO)
2726

2827

2928
deit_tiny = timm.models.deit.deit_tiny_patch16_224(pretrained=True)

backends/arm/test/runner_utils.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -763,11 +763,11 @@ def run_tosa_graph(
763763
if isinstance(tosa_version, Tosa_1_00):
764764
import tosa_reference_model as reference_model # type: ignore[import-untyped]
765765

766-
debug_mode = "ALL" if logger.level <= logging.DEBUG else None
766+
debug_mode = "ALL" if logger.getEffectiveLevel() <= logging.DEBUG else None
767767
outputs_np, status = reference_model.run(
768768
graph,
769769
inputs_np,
770-
verbosity=_tosa_refmodel_loglevel(logger.level),
770+
verbosity=_tosa_refmodel_loglevel(logger.getEffectiveLevel()),
771771
initialize_variable_tensor_from_numpy=True,
772772
debug_mode=debug_mode,
773773
)

backends/arm/test/tester/analyze_output_utils.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -273,11 +273,8 @@ def dump_error_output(
273273

274274

275275
if __name__ == "__main__":
276-
import sys
277276

278-
logging.basicConfig(stream=sys.stdout, level=logging.INFO)
279-
280-
""" This is expected to produce the example output of print_diff"""
277+
"""This is expected to produce the example output of print_diff"""
281278
torch.manual_seed(0)
282279
a = torch.rand(3, 3, 2, 2) * 0.01
283280
b = a.clone().detach()

0 commit comments

Comments
 (0)