Skip to content

Commit 90c44b9

Browse files
narendasannarendasan
committed
feat(//core/util): New logging level for Graph Dumping
Signed-off-by: Naren Dasan <[email protected]> Signed-off-by: Naren Dasan <[email protected]>
1 parent 9e8fb38 commit 90c44b9

File tree

3 files changed

+36
-29
lines changed

3 files changed

+36
-29
lines changed

‎core/util/logging/TRTorchLogger.cpp

Lines changed: 27 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -17,39 +17,36 @@ namespace util {
1717
namespace logging {
1818

1919
TRTorchLogger::TRTorchLogger(std::string prefix, Severity severity, bool color)
20-
: prefix_(prefix), reportable_severity_(severity), color_(color) {}
20+
: prefix_(prefix), reportable_severity_((LogLevel) severity), color_(color) {}
2121

2222
TRTorchLogger::TRTorchLogger(std::string prefix, LogLevel lvl, bool color)
23-
: prefix_(prefix), reportable_severity_((Severity) lvl), color_(color) {}
23+
: prefix_(prefix), reportable_severity_(lvl), color_(color) {}
2424

2525
void TRTorchLogger::log(LogLevel lvl, std::string msg) {
26-
Severity severity = (Severity) lvl;
27-
log(severity, msg.c_str());
28-
}
29-
30-
void TRTorchLogger::log(Severity severity, const char* msg) {
3126
// suppress messages with severity enum value greater than the reportable
32-
if (severity > reportable_severity_) {
27+
if (lvl > reportable_severity_) {
3328
return;
3429
}
3530

3631
if (color_) {
37-
switch (severity) {
38-
case Severity::kINTERNAL_ERROR: std::cerr << TERM_RED; break;
39-
case Severity::kERROR: std::cerr << TERM_RED; break;
40-
case Severity::kWARNING: std::cerr << TERM_YELLOW; break;
41-
case Severity::kINFO: std::cerr << TERM_GREEN; break;
42-
case Severity::kVERBOSE: std::cerr << TERM_MAGENTA; break;
32+
switch (lvl) {
33+
case LogLevel::kINTERNAL_ERROR: std::cerr << TERM_RED; break;
34+
case LogLevel::kERROR: std::cerr << TERM_RED; break;
35+
case LogLevel::kWARNING: std::cerr << TERM_YELLOW; break;
36+
case LogLevel::kINFO: std::cerr << TERM_GREEN; break;
37+
case LogLevel::kDEBUG: std::cerr << TERM_MAGENTA; break;
38+
case LogLevel::kGRAPH: std::cerr << TERM_NORMAL; break;
4339
default: break;
4440
}
4541
}
4642

47-
switch (severity) {
48-
case Severity::kINTERNAL_ERROR: std::cerr << "INTERNAL_ERROR: "; break;
49-
case Severity::kERROR: std::cerr << "ERROR: "; break;
50-
case Severity::kWARNING: std::cerr << "WARNING: "; break;
51-
case Severity::kINFO: std::cerr << "INFO: "; break;
52-
case Severity::kVERBOSE: std::cerr << "DEBUG: "; break;
43+
switch (lvl) {
44+
case LogLevel::kINTERNAL_ERROR: std::cerr << "INTERNAL_ERROR: "; break;
45+
case LogLevel::kERROR: std::cerr << "ERROR: "; break;
46+
case LogLevel::kWARNING: std::cerr << "WARNING: "; break;
47+
case LogLevel::kINFO: std::cerr << "INFO: "; break;
48+
case LogLevel::kDEBUG: std::cerr << "DEBUG: "; break;
49+
case LogLevel::kGRAPH: std::cerr << "GRAPH: "; break;
5350
default: std::cerr << "UNKNOWN: "; break;
5451
}
5552

@@ -60,16 +57,22 @@ void TRTorchLogger::log(Severity severity, const char* msg) {
6057
std::cerr << prefix_ << msg << std::endl;
6158
}
6259

60+
61+
void TRTorchLogger::log(Severity severity, const char* msg) {
62+
LogLevel lvl = (LogLevel) severity;
63+
log(lvl, std::string(msg));
64+
}
65+
6366
void TRTorchLogger::set_logging_prefix(std::string prefix) {
6467
prefix_ = prefix;
6568
}
6669

6770
void TRTorchLogger::set_reportable_severity(Severity severity) {
68-
reportable_severity_ = severity;
71+
reportable_severity_ = (LogLevel) severity;
6972
}
7073

7174
void TRTorchLogger::set_reportable_log_level(LogLevel lvl) {
72-
reportable_severity_ = (Severity) lvl;
75+
reportable_severity_ = lvl;
7376
}
7477

7578
void TRTorchLogger::set_is_colored_output_on(bool colored_output_on) {
@@ -81,11 +84,11 @@ std::string TRTorchLogger::get_logging_prefix() {
8184
}
8285

8386
nvinfer1::ILogger::Severity TRTorchLogger::get_reportable_severity() {
84-
return reportable_severity_;
87+
return (Severity) reportable_severity_;
8588
}
8689

8790
LogLevel TRTorchLogger::get_reportable_log_level() {
88-
return (LogLevel) reportable_severity_;
91+
return reportable_severity_;
8992
}
9093

9194
bool TRTorchLogger::get_is_colored_output_on() {

‎core/util/logging/TRTorchLogger.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,13 @@ namespace core {
88
namespace util {
99
namespace logging {
1010

11-
enum LogLevel {
11+
enum class LogLevel : uint8_t {
1212
kINTERNAL_ERROR = (int) nvinfer1::ILogger::Severity::kINTERNAL_ERROR,
1313
kERROR = (int) nvinfer1::ILogger::Severity::kERROR,
1414
kWARNING = (int) nvinfer1::ILogger::Severity::kWARNING,
1515
kINFO = (int) nvinfer1::ILogger::Severity::kINFO,
1616
kDEBUG = (int) nvinfer1::ILogger::Severity::kVERBOSE,
17+
kGRAPH
1718
};
1819

1920
// Logger for TensorRT info/warning/errors
@@ -38,10 +39,10 @@ class TRTorchLogger : public nvinfer1::ILogger {
3839

3940
private:
4041
std::string prefix_;
41-
Severity reportable_severity_;
42+
LogLevel reportable_severity_;
4243
bool color_;
4344
};
44-
45+
4546
TRTorchLogger& get_logger();
4647

4748
} // namespace logging

‎core/util/macros.h

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,21 @@
1111
l.log(sev, ss.str()); \
1212
} while (0)
1313

14+
#define GRAPH_DUMP_GLOBAL(s) TRTORCH_LOG(core::util::logging::get_logger(), core::util::logging::LogLevel::kGRAPH, s)
1415
#define LOG_DEBUG_GLOBAL(s) TRTORCH_LOG(core::util::logging::get_logger(), core::util::logging::LogLevel::kDEBUG, s)
1516
#define LOG_INFO_GLOBAL(s) TRTORCH_LOG(core::util::logging::get_logger(), core::util::logging::LogLevel::kINFO, s)
1617
#define LOG_WARNING_GLOBAL(s) TRTORCH_LOG(core::util::logging::get_logger(), core::util::logging::LogLevel::kWARNING, s)
1718
#define LOG_ERROR_GLOBAL(s) TRTORCH_LOG(core::util::logging::get_logger(), core::util::logging::LogLevel::kERROR, s)
18-
#define LOG_INTERNAL_ERROR_GLOBAL(s) TRTORCH_LOG(core::util::logging::get_logger(), core::util::logging::LogLevel::kINTERNAL_ERROR, s)
19+
#define LOG_INTERNAL_ERROR_GLOBAL(s) TRTORCH_LOG(core::util::logging::get_logger(), core::util::logging::LogLevel::kINTERNAL_ERROR, s)
1920

21+
#define GRAPH_DUMP_OWN(l,s) TRTORCH_LOG(l, core::util::logging::LogLevel::kGRAPH, s)
2022
#define LOG_DEBUG_OWN(l,s) TRTORCH_LOG(l, core::util::logging::LogLevel::kDEBUG, s)
2123
#define LOG_INFO_OWN(l,s) TRTORCH_LOG(l, core::util::logging::LogLevel::kINFO, s)
2224
#define LOG_WARNING_OWN(l,s) TRTORCH_LOG(l, core::util::logging::LogLevel::kWARNING, s)
2325
#define LOG_ERROR_OWN(l,s) TRTORCH_LOG(l, core::util::logging::LogLevel::kERROR, s)
2426
#define LOG_INTERNAL_ERROR_OWN(l,s) TRTORCH_LOG(l, core::util::logging::LogLevel::kINTERNAL_ERROR, s)
2527

28+
#define GRAPH_DUMP(...) GET_MACRO(__VA_ARGS__, GRAPH_DUMP_OWN, GRAPH_DUMP_GLOBAL)(__VA_ARGS__)
2629
#define LOG_DEBUG(...) GET_MACRO(__VA_ARGS__, LOG_DEBUG_OWN, LOG_DEBUG_GLOBAL)(__VA_ARGS__)
2730
#define LOG_INFO(...) GET_MACRO(__VA_ARGS__, LOG_INFO_OWN, LOG_INFO_GLOBAL)(__VA_ARGS__)
2831
#define LOG_WARNING(...) GET_MACRO(__VA_ARGS__, LOG_WARNING_OWN, LOG_WARNING_GLOBAL)(__VA_ARGS__)
@@ -47,7 +50,7 @@
4750
<< ", consider filing a bug: https://www.github.com/NVIDIA/TRTorch/issues\n" \
4851
<< __VA_ARGS__); \
4952
}
50-
53+
5154
#define TRTORCH_CHECK(cond, ...) \
5255
if (!(cond)) { \
5356
TRTORCH_THROW_ERROR("Expected " << #cond \

0 commit comments

Comments
 (0)