Reverted Logger changes - TRT fixed the bug that caused the crash

Signed-off-by: Boris Fomitchev <[email protected]>

Author: borisfom

core/conversion/conversionctx/ConversionCtx.cpp

@@ -41,7 +41,10 @@ std::ostream& operator<<(std::ostream& os, const BuilderSettings& s) {
 
 ConversionCtx::ConversionCtx(BuilderSettings build_settings)
     : settings(build_settings),
-      logger(util::logging::get_logger()) {
+      logger(
+          "[TRTorch Conversion Context] - ",
+          util::logging::get_logger().get_reportable_severity(),
+          util::logging::get_logger().get_is_colored_output_on()) {
   // TODO: Support FP16 and FP32 from JIT information
   if (settings.device.gpu_id) {
     TRTORCH_CHECK(

core/conversion/conversionctx/ConversionCtx.h

@@ -60,7 +60,7 @@ struct ConversionCtx {
   nvinfer1::DataType input_type;
   nvinfer1::DataType op_precision;
   BuilderSettings settings;
-  util::logging::TRTorchLogger& logger;
+  util::logging::TRTorchLogger logger;
   // Pointers to data that needs to remain alive until conversion is done
   // All data will be freed when the destructor is called
   // The weights class is the main consumer of this, each time a weight object

core/plugins/register_plugins.cpp

@@ -41,7 +41,10 @@ class TRTorchPluginRegistry {
   }
 
  public:
-  util::logging::TRTorchLogger& plugin_logger = util::logging::get_logger();
+  util::logging::TRTorchLogger plugin_logger = util::logging::TRTorchLogger(
+      "[TRTorch Plugins Context] - ",
+      util::logging::get_logger().get_reportable_log_level(),
+      util::logging::get_logger().get_is_colored_output_on());
 };
 
 namespace {

core/runtime/TRTEngine.cpp

@@ -16,14 +16,20 @@ std::string slugify(std::string s) {
 }
 
 TRTEngine::TRTEngine(std::string serialized_engine)
-{
+    : logger(
+          std::string("[] - "),
+          util::logging::get_logger().get_reportable_severity(),
+          util::logging::get_logger().get_is_colored_output_on()) {
   std::string _name = "deserialized_trt";
   new (this) TRTEngine(_name, serialized_engine);
 }
 
 TRTEngine::TRTEngine(std::string mod_name, std::string serialized_engine)
-{
-  rt = nvinfer1::createInferRuntime(util::logging::get_logger());
+    : logger(
+          std::string("[") + mod_name + std::string("_engine] - "),
+          util::logging::get_logger().get_reportable_severity(),
+          util::logging::get_logger().get_is_colored_output_on()) {
+  rt = nvinfer1::createInferRuntime(logger);
 
   name = slugify(mod_name) + "_engine";
 

core/runtime/runtime.h

@@ -19,6 +19,7 @@ struct TRTEngine : torch::CustomClassHolder {
   std::pair<uint64_t, uint64_t> num_io;
   EngineID id;
   std::string name;
+  util::logging::TRTorchLogger logger;
 
   std::unordered_map<uint64_t, uint64_t> in_binding_map;
   std::unordered_map<uint64_t, uint64_t> out_binding_map;