refactor(serde): Address PR comments

Signed-off-by: Naren Dasan <[email protected]>
Signed-off-by: Naren Dasan <[email protected]>

Author: narendasan

core/runtime/CudaDevice.cpp

@@ -34,9 +34,6 @@ CudaDevice::CudaDevice(int64_t gpu_id, nvinfer1::DeviceType device_type) {
   // Set Device name
   this->device_name = device_name;
 
-  // Set Device name len for serialization/deserialization
-  this->device_name_len = device_name.size();
-
   // Set Device Type
   this->device_type = device_type;
 }
@@ -70,14 +67,20 @@ CudaDevice::CudaDevice(std::string device_info) {
 }
 
 std::string CudaDevice::serialize() {
+  std::vector<std::string> content;
+  content.resize(DEVICE_NAME_IDX + 1);
+
+  content[ID_IDX] = std::to_string(id);
+  content[SM_MAJOR_IDX] = std::to_string(major);
+  content[SM_MINOR_IDX] = std::to_string(minor);
+  content[DEVICE_TYPE_IDX] = std::to_string((int64_t)device_type);
+  content[DEVICE_NAME_IDX] = device_name;
+
   std::stringstream ss;
-  // clang-format off
-  ss << id << DEVICE_INFO_DELIM \
-     << major << DEVICE_INFO_DELIM \
-     << minor << DEVICE_INFO_DELIM \
-     << (int64_t) device_type << DEVICE_INFO_DELIM
-     << device_name;
-  // clang-format on
+  for (size_t i = 0; i < content.size() - 1; i++) {
+    ss << content[i] << DEVICE_INFO_DELIM;
+  }
+  ss << content[DEVICE_NAME_IDX];
 
   std::string serialized_device_info = ss.str();
 

core/runtime/register_trt_op.cpp

@@ -27,18 +27,17 @@ bool is_switch_required(const CudaDevice& curr_device, const CudaDevice& conf_de
     if (curr_device.device_name != conf_device.device_name) {
       LOG_WARNING(
           "Program compiled for " << conf_device.device_name << " but current CUDA device is " << curr_device
-                                  << ". Switching the device context");
+                                  << ". Attempting to switch device context for better compatibility");
       return true;
     }
   }
 
-  // REVIEW: This shouldnt be a reason to switch GPU
-  // if (curr_device.id != conf_device.id) {
-  //   LOG_WARNING(
-  //       "Configured Device ID: " << conf_device.id << " is different that current device ID: " << curr_device.id
-  //                                << ". Switching context");
-  //   return true;
-  // }
+  if (curr_device.id != conf_device.id) {
+    LOG_WARNING(
+        "Configured Device ID: " << conf_device.id << " is different that current device ID: " << curr_device.id
+                                 << ". Moving input tensors to device: " << conf_device.id);
+    return true;
+  }
 
   return false;
 }

core/runtime/runtime.cpp

@@ -13,7 +13,7 @@ void set_cuda_device(CudaDevice& cuda_device) {
 }
 
 CudaDevice get_current_device() {
-  int device = 0;
+  int device = -1;
   TRTORCH_CHECK(
       (cudaGetDevice(reinterpret_cast<int*>(&device)) == cudaSuccess),
       "Unable to get current device (runtime.get_current_device)");

core/runtime/runtime.h

@@ -18,7 +18,6 @@ struct CudaDevice {
   int64_t major; // CUDA compute major version
   int64_t minor; // CUDA compute minor version
   nvinfer1::DeviceType device_type;
-  size_t device_name_len;
   std::string device_name;
 
   CudaDevice();