Feat 865 #905

narendasan · 2022-03-01T04:02:47Z

Description

Adds context managers to quickly change the log level for a subset of code

Fixes #865

Type of change

Please delete options that are not relevant and/or add your own.

New feature (non-breaking change which adds functionality)

Checklist:

My code follows the style guidelines of this project (You can use the linters)
I have performed a self-review of my own code
I have commented my code, particularly in hard-to-understand areas and hacks
I have made corresponding changes to the documentation
I have added tests to verify my fix or my feature
New and existing unit tests pass locally with my changes

Signed-off-by: Naren Dasan <naren@narendasan.com> Signed-off-by: Naren Dasan <narens@nvidia.com>

narendasan · 2022-03-01T04:03:51Z

@peri044 what do you think of the names here, I think in a vacuum they make more sense but it might be confusing transitioning from the old tools. Ideally this becomes what people use 99% of the time though

github-actions

Code conforms to C++ style guidelines

github-actions

There are some changes that do not conform to Python style guidelines:

--- /workspace/py/torch_tensorrt/logging.py	(original)
+++ /workspace/py/torch_tensorrt/logging.py	(reformatted)
@@ -99,7 +99,6 @@
    """
    _log(Level._to_internal_level(level), msg)

-
    InternalError = LogLevel.INTERNAL_ERROR
    Error = LogLevel.ERROR
    Warning = LogLevel.WARNING
@@ -107,7 +106,9 @@
    Debug = LogLevel.DEBUG
    Graph = LogLevel.GRAPH

+
class internal_errors:
+
    def __enter__(self):
        self.external_lvl = get_reportable_log_level()
        set_reportable_log_level(Level.InternalError)
@@ -115,7 +116,9 @@
    def __exit__(self, exc_type, exc_value, exc_tb):
        set_reportable_log_level(self.external_lvl)

+
class errors:
+
    def __enter__(self):
        self.external_lvl = get_reportable_log_level()
        set_reportable_log_level(Level.Error)
@@ -123,7 +126,9 @@
    def __exit__(self, exc_type, exc_value, exc_tb):
        set_reportable_log_level(self.external_lvl)

+
class warnings:
+
    def __enter__(self):
        self.external_lvl = get_reportable_log_level()
        set_reportable_log_level(Level.Warning)
@@ -131,7 +136,9 @@
    def __exit__(self, exc_type, exc_value, exc_tb):
        set_reportable_log_level(self.external_lvl)

+
class info:
+
    def __enter__(self):
        self.external_lvl = get_reportable_log_level()
        set_reportable_log_level(Level.Info)
@@ -139,7 +146,9 @@
    def __exit__(self, exc_type, exc_value, exc_tb):
        set_reportable_log_level(self.external_lvl)

+
class debug:
+
    def __enter__(self):
        self.external_lvl = get_reportable_log_level()
        set_reportable_log_level(Level.Debug)
@@ -147,7 +156,9 @@
    def __exit__(self, exc_type, exc_value, exc_tb):
        set_reportable_log_level(self.external_lvl)

+
class graphs:
+
    def __enter__(self):
        self.external_lvl = get_reportable_log_level()
        set_reportable_log_level(Level.Graph)
Reformatting /workspace/py/torch_tensorrt/ptq.py
Reformatting /workspace/py/torch_tensorrt/_Device.py
Reformatting /workspace/py/torch_tensorrt/logging.py
Reformatting /workspace/py/torch_tensorrt/_compile.py
Reformatting /workspace/py/torch_tensorrt/_enums.py
Reformatting /workspace/py/torch_tensorrt/_Input.py
Reformatting /workspace/py/torch_tensorrt/_util.py
Reformatting /workspace/py/torch_tensorrt/__init__.py
Reformatting /workspace/py/torch_tensorrt/ts/_compiler.py
Reformatting /workspace/py/torch_tensorrt/ts/_compile_spec.py
Reformatting /workspace/py/torch_tensorrt/ts/__init__.py
Reformatting /workspace/py/setup.py
ERROR: Some files do not conform to style guidelines

github-actions

Code conforms to C++ style guidelines

github-actions

There are some changes that do not conform to Python style guidelines:

--- /workspace/py/torch_tensorrt/logging.py	(original)
+++ /workspace/py/torch_tensorrt/logging.py	(reformatted)
@@ -99,7 +99,6 @@
    """
    _log(Level._to_internal_level(level), msg)

-
    InternalError = LogLevel.INTERNAL_ERROR
    Error = LogLevel.ERROR
    Warning = LogLevel.WARNING
@@ -107,7 +106,9 @@
    Debug = LogLevel.DEBUG
    Graph = LogLevel.GRAPH

+
class internal_errors:
+
    def __enter__(self):
        self.external_lvl = get_reportable_log_level()
        set_reportable_log_level(Level.InternalError)
@@ -115,7 +116,9 @@
    def __exit__(self, exc_type, exc_value, exc_tb):
        set_reportable_log_level(self.external_lvl)

+
class errors:
+
    def __enter__(self):
        self.external_lvl = get_reportable_log_level()
        set_reportable_log_level(Level.Error)
@@ -123,7 +126,9 @@
    def __exit__(self, exc_type, exc_value, exc_tb):
        set_reportable_log_level(self.external_lvl)

+
class warnings:
+
    def __enter__(self):
        self.external_lvl = get_reportable_log_level()
        set_reportable_log_level(Level.Warning)
@@ -131,7 +136,9 @@
    def __exit__(self, exc_type, exc_value, exc_tb):
        set_reportable_log_level(self.external_lvl)

+
class info:
+
    def __enter__(self):
        self.external_lvl = get_reportable_log_level()
        set_reportable_log_level(Level.Info)
@@ -139,7 +146,9 @@
    def __exit__(self, exc_type, exc_value, exc_tb):
        set_reportable_log_level(self.external_lvl)

+
class debug:
+
    def __enter__(self):
        self.external_lvl = get_reportable_log_level()
        set_reportable_log_level(Level.Debug)
@@ -147,7 +156,9 @@
    def __exit__(self, exc_type, exc_value, exc_tb):
        set_reportable_log_level(self.external_lvl)

+
class graphs:
+
    def __enter__(self):
        self.external_lvl = get_reportable_log_level()
        set_reportable_log_level(Level.Graph)
Reformatting /workspace/py/torch_tensorrt/ptq.py
Reformatting /workspace/py/torch_tensorrt/_Device.py
Reformatting /workspace/py/torch_tensorrt/logging.py
Reformatting /workspace/py/torch_tensorrt/_compile.py
Reformatting /workspace/py/torch_tensorrt/_enums.py
Reformatting /workspace/py/torch_tensorrt/_Input.py
Reformatting /workspace/py/torch_tensorrt/_util.py
Reformatting /workspace/py/torch_tensorrt/__init__.py
Reformatting /workspace/py/torch_tensorrt/ts/_compiler.py
Reformatting /workspace/py/torch_tensorrt/ts/_compile_spec.py
Reformatting /workspace/py/torch_tensorrt/ts/__init__.py
Reformatting /workspace/py/setup.py
ERROR: Some files do not conform to style guidelines

Signed-off-by: Naren Dasan <naren@narendasan.com> Signed-off-by: Naren Dasan <narens@nvidia.com>

narendasan · 2022-03-01T04:12:15Z

Reminder for myself to squash and merge this when its ready

github-actions

There are some changes that do not conform to Python style guidelines:

--- /workspace/py/torch_tensorrt/logging.py	(original)
+++ /workspace/py/torch_tensorrt/logging.py	(reformatted)
@@ -99,7 +99,6 @@
    """
    _log(Level._to_internal_level(level), msg)

-
    InternalError = LogLevel.INTERNAL_ERROR
    Error = LogLevel.ERROR
    Warning = LogLevel.WARNING
@@ -107,6 +106,7 @@
    Debug = LogLevel.DEBUG
    Graph = LogLevel.GRAPH

+
class internal_errors:
    """Context-manager to limit displayed log messages to just internal errors

@@ -115,12 +115,14 @@
    with torch_tensorrt.logging.internal_errors():
        outputs = model_torchtrt(inputs)
    """
+
    def __enter__(self):
        self.external_lvl = get_reportable_log_level()
        set_reportable_log_level(Level.InternalError)

    def __exit__(self, exc_type, exc_value, exc_tb):
        set_reportable_log_level(self.external_lvl)
+

class errors:
    """Context-manager to limit displayed log messages to just errors and above
@@ -130,12 +132,14 @@
    with torch_tensorrt.logging.errors():
        outputs = model_torchtrt(inputs)
    """
+
    def __enter__(self):
        self.external_lvl = get_reportable_log_level()
        set_reportable_log_level(Level.Error)

    def __exit__(self, exc_type, exc_value, exc_tb):
        set_reportable_log_level(self.external_lvl)
+

class warnings:
    """Context-manager to limit displayed log messages to just warnings and above
@@ -153,6 +157,7 @@
    def __exit__(self, exc_type, exc_value, exc_tb):
        set_reportable_log_level(self.external_lvl)

+
class info:
    """Context-manager to display all info and greater severity messages

@@ -161,12 +166,14 @@
    with torch_tensorrt.logging.info():
        model_trt = torch_tensorrt.compile(model, **spec)
    """
+
    def __enter__(self):
        self.external_lvl = get_reportable_log_level()
        set_reportable_log_level(Level.Info)

    def __exit__(self, exc_type, exc_value, exc_tb):
        set_reportable_log_level(self.external_lvl)
+

class debug:
    """Context-manager to display full debug information through the logger
@@ -176,12 +183,14 @@
    with torch_tensorrt.logging.debug():
        model_trt = torch_tensorrt.compile(model, **spec)
    """
+
    def __enter__(self):
        self.external_lvl = get_reportable_log_level()
        set_reportable_log_level(Level.Debug)

    def __exit__(self, exc_type, exc_value, exc_tb):
        set_reportable_log_level(self.external_lvl)
+

class graphs:
    """Context-manager to display the results of intermediate lowering passes
@@ -192,6 +201,7 @@
    with torch_tensorrt.logging.graphs():
        model_trt = torch_tensorrt.compile(model, **spec)
    """
+
    def __enter__(self):
        self.external_lvl = get_reportable_log_level()
        set_reportable_log_level(Level.Graph)
Reformatting /workspace/py/torch_tensorrt/ptq.py
Reformatting /workspace/py/torch_tensorrt/_Device.py
Reformatting /workspace/py/torch_tensorrt/logging.py
Reformatting /workspace/py/torch_tensorrt/_compile.py
Reformatting /workspace/py/torch_tensorrt/_enums.py
Reformatting /workspace/py/torch_tensorrt/_Input.py
Reformatting /workspace/py/torch_tensorrt/_util.py
Reformatting /workspace/py/torch_tensorrt/__init__.py
Reformatting /workspace/py/torch_tensorrt/ts/_compiler.py
Reformatting /workspace/py/torch_tensorrt/ts/_compile_spec.py
Reformatting /workspace/py/torch_tensorrt/ts/__init__.py
Reformatting /workspace/py/setup.py
ERROR: Some files do not conform to style guidelines

github-actions

Code conforms to C++ style guidelines

github-actions

Code conforms to C++ style guidelines

github-actions

There are some changes that do not conform to Python style guidelines:

Reformatting /workspace/py/torch_tensorrt/ptq.py
Reformatting /workspace/py/torch_tensorrt/_Device.py
Reformatting /workspace/py/torch_tensorrt/logging.py
Reformatting /workspace/py/torch_tensorrt/_compile.py
Reformatting /workspace/py/torch_tensorrt/_enums.py
Reformatting /workspace/py/torch_tensorrt/_Input.py
Reformatting /workspace/py/torch_tensorrt/_util.py
Reformatting /workspace/py/torch_tensorrt/__init__.py
Reformatting /workspace/py/torch_tensorrt/ts/_compiler.py
Reformatting /workspace/py/torch_tensorrt/ts/_compile_spec.py
Reformatting /workspace/py/torch_tensorrt/ts/__init__.py
Reformatting /workspace/py/setup.py
Reformatting /workspace/tests/py/test_api_dla.py
Reformatting /workspace/tests/py/test_to_backend_api.py
Reformatting /workspace/tests/py/test_ptq_dataloader_calibrator.py
Reformatting /workspace/tests/py/test_multi_gpu.py
Reformatting /workspace/tests/modules/hub.py
--- /workspace/tests/py/test_api.py	(original)
+++ /workspace/tests/py/test_api.py	(reformatted)
@@ -366,6 +366,7 @@

        lvl = torchtrt.logging.get_reportable_log_level()
        self.assertEqual(base_lvl, lvl)
+

class TestDevice(unittest.TestCase):

Reformatting /workspace/tests/py/test_ptq_to_backend.py
Reformatting /workspace/tests/py/test_ptq_trt_calibrator.py
Reformatting /workspace/tests/py/model_test_case.py
Reformatting /workspace/tests/py/test_qat_trt_accuracy.py
Reformatting /workspace/tests/py/test_trt_intercompatability.py
Reformatting /workspace/tests/py/test_api.py
ERROR: Some files do not conform to style guidelines

github-actions

There are some changes that do not conform to Python style guidelines:

Reformatting /workspace/py/torch_tensorrt/ptq.py
Reformatting /workspace/py/torch_tensorrt/_Device.py
Reformatting /workspace/py/torch_tensorrt/logging.py
Reformatting /workspace/py/torch_tensorrt/_compile.py
Reformatting /workspace/py/torch_tensorrt/_enums.py
Reformatting /workspace/py/torch_tensorrt/_Input.py
Reformatting /workspace/py/torch_tensorrt/_util.py
Reformatting /workspace/py/torch_tensorrt/__init__.py
Reformatting /workspace/py/torch_tensorrt/ts/_compiler.py
Reformatting /workspace/py/torch_tensorrt/ts/_compile_spec.py
Reformatting /workspace/py/torch_tensorrt/ts/__init__.py
Reformatting /workspace/py/setup.py
Reformatting /workspace/tests/py/test_api_dla.py
Reformatting /workspace/tests/py/test_to_backend_api.py
Reformatting /workspace/tests/py/test_ptq_dataloader_calibrator.py
Reformatting /workspace/tests/py/test_multi_gpu.py
Reformatting /workspace/tests/modules/hub.py
--- /workspace/tests/py/test_api.py	(original)
+++ /workspace/tests/py/test_api.py	(reformatted)
@@ -366,6 +366,7 @@

        lvl = torchtrt.logging.get_reportable_log_level()
        self.assertEqual(base_lvl, lvl)
+

class TestDevice(unittest.TestCase):

Reformatting /workspace/tests/py/test_ptq_to_backend.py
Reformatting /workspace/tests/py/test_ptq_trt_calibrator.py
Reformatting /workspace/tests/py/model_test_case.py
Reformatting /workspace/tests/py/test_qat_trt_accuracy.py
Reformatting /workspace/tests/py/test_trt_intercompatability.py
Reformatting /workspace/tests/py/test_api.py
ERROR: Some files do not conform to style guidelines

github-actions

Code conforms to C++ style guidelines

peri044

LGTM. One question is
are we doing with torch_tensorrt.logging.debug(): or with torch_tensorrt.debug():.
The latter is described in the feature request #865
Any preference here ?

narendasan · 2022-03-18T19:12:56Z

I think logging debug is better

…

________________________________ From: Dheeraj Peri ***@***.***> Sent: Friday, March 18, 2022 12:41:15 PM To: NVIDIA/Torch-TensorRT ***@***.***> Cc: Naren Dasan ***@***.***>; Author ***@***.***> Subject: Re: [NVIDIA/Torch-TensorRT] Feat 865 (PR #905) @peri044 approved this pull request. LGTM. One question is are we doing with torch_tensorrt.logging.debug(): or with torch_tensorrt.debug():. The latter is described in the feature request #865<#865> Any preference here ? — Reply to this email directly, view it on GitHub<#905 (review)>, or unsubscribe<https://github.com/notifications/unsubscribe-auth/AANVFFIF4P7UREFZLS7T4CTVATE4XANCNFSM5PS4RKCQ>. You are receiving this because you authored the thread.Message ID: ***@***.***>

Signed-off-by: Naren Dasan <naren@narendasan.com> Signed-off-by: Naren Dasan <narens@nvidia.com>

narendasan added 2 commits February 28, 2022 19:59

feat(//py): Context managers to quickly switch logging level

12e470f

Signed-off-by: Naren Dasan <naren@narendasan.com> Signed-off-by: Naren Dasan <narens@nvidia.com>

refactor(//py): Give better names to the CtxManagers

11dc516

Signed-off-by: Naren Dasan <naren@narendasan.com> Signed-off-by: Naren Dasan <narens@nvidia.com>

narendasan requested a review from peri044 March 1, 2022 04:02

github-actions bot added component: api [Python] Issues re: Python API component: tests Issues re: Tests labels Mar 1, 2022

github-actions bot approved these changes Mar 1, 2022

View reviewed changes

github-actions bot requested changes Mar 1, 2022

View reviewed changes

github-actions bot approved these changes Mar 1, 2022

View reviewed changes

github-actions bot requested changes Mar 1, 2022

View reviewed changes

chore(//py): Adding documentation to the new context managers

36d57ae

Signed-off-by: Naren Dasan <naren@narendasan.com> Signed-off-by: Naren Dasan <narens@nvidia.com>

narendasan force-pushed the feat_865_2 branch from 570209a to 8e29a3d Compare March 1, 2022 04:11

narendasan force-pushed the feat_865_2 branch from 8e29a3d to 36d57ae Compare March 1, 2022 04:13

github-actions bot requested changes Mar 1, 2022

View reviewed changes

github-actions bot approved these changes Mar 1, 2022

View reviewed changes

github-actions bot requested changes Mar 1, 2022

View reviewed changes

github-actions bot approved these changes Mar 1, 2022

View reviewed changes

peri044 approved these changes Mar 18, 2022

View reviewed changes

refactor: Linitng

3e44ee5

Signed-off-by: Naren Dasan <naren@narendasan.com> Signed-off-by: Naren Dasan <narens@nvidia.com>

narendasan merged commit ba9f730 into master Mar 24, 2022

narendasan deleted the feat_865_2 branch March 24, 2022 23:24

Feat 865 #905

Feat 865 #905

Uh oh!

Conversation

narendasan commented Mar 1, 2022

Description

Type of change

Checklist:

Uh oh!

narendasan commented Mar 1, 2022

Uh oh!

github-actions bot left a comment

Choose a reason for hiding this comment

Uh oh!

github-actions bot left a comment

Choose a reason for hiding this comment

Uh oh!

github-actions bot left a comment

Choose a reason for hiding this comment

Uh oh!

github-actions bot left a comment

Choose a reason for hiding this comment

Uh oh!

narendasan commented Mar 1, 2022

Uh oh!

github-actions bot left a comment

Choose a reason for hiding this comment

Uh oh!

github-actions bot left a comment

Choose a reason for hiding this comment

Uh oh!

github-actions bot left a comment

Choose a reason for hiding this comment

Uh oh!

github-actions bot left a comment

Choose a reason for hiding this comment

Uh oh!

github-actions bot left a comment

Choose a reason for hiding this comment

Uh oh!

github-actions bot left a comment

Choose a reason for hiding this comment

Uh oh!

peri044 left a comment

Choose a reason for hiding this comment

Uh oh!

narendasan commented Mar 18, 2022 via email

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants