fix(torch): concurrent_predict was always true

jolibrain · Jul 17, 2023 · edb28c1 · edb28c1
1 parent 5eb7890
commit edb28c1
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 5 deletions.
diff --git a/src/backends/torch/torchlib.cc b/src/backends/torch/torchlib.cc
@@ -209,6 +209,7 @@ namespace dd
             "GPU is not available, service could not be created");
       }
 
+    _concurrent_predict = mllib_dto->concurrent_predict;
     std::vector<int> gpuids = mllib_dto->gpuid->_ids;
 
     if (mllib_dto->nclasses != 0)
@@ -313,11 +314,6 @@ namespace dd
         _multi_label = true;
       }
 
-    if (mllib_dto->concurrent_predict)
-      {
-        _concurrent_predict = true;
-      }
-
     if (_template == "bert")
       {
         if (!self_supervised.empty())
@@ -1380,6 +1376,7 @@ namespace dd
       {
         // concurrent calls can use more memory on gpu than initially expected
         lock = std::make_unique<std::lock_guard<std::mutex>>(_net_mutex);
+        this->_logger->info("Locking torch service for predict");
       }
     oatpp::Object<DTO::ServicePredict> predict_dto;
 

diff --git a/src/backends/torch/torchmodule.cc b/src/backends/torch/torchmodule.cc
@@ -752,6 +752,11 @@ namespace dd
       const torch::Device &device,
       const oatpp::Object<DTO::ServicePredict> &pred_dto);
 
+  template void TorchModule::create_native_template(
+      const std::string &tmpl, const APIData &lib_ad,
+      const ImgTorchInputFileConn &inputc, const TorchModel &tmodel,
+      const torch::Device &device);
+
   template void TorchModule::post_transform(
       const std::string tmpl, const APIData &template_params,
       const VideoTorchInputFileConn &inputc, const TorchModel &tmodel,
@@ -768,6 +773,11 @@ namespace dd
       const torch::Device &device,
       const oatpp::Object<DTO::ServicePredict> &pred_dto);
 
+  template void TorchModule::create_native_template(
+      const std::string &tmpl, const APIData &lib_ad,
+      const VideoTorchInputFileConn &inputc, const TorchModel &tmodel,
+      const torch::Device &device);
+
   template void TorchModule::post_transform(
       const std::string tmpl, const APIData &template_params,
       const TxtTorchInputFileConn &inputc, const TorchModel &tmodel,
@@ -784,6 +794,11 @@ namespace dd
       const torch::Device &device,
       const oatpp::Object<DTO::ServicePredict> &pred_dto);
 
+  template void TorchModule::create_native_template(
+      const std::string &tmpl, const APIData &lib_ad,
+      const TxtTorchInputFileConn &inputc, const TorchModel &tmodel,
+      const torch::Device &device);
+
   template void TorchModule::post_transform(
       const std::string tmpl, const APIData &template_params,
       const CSVTSTorchInputFileConn &inputc, const TorchModel &tmodel,
@@ -799,4 +814,9 @@ namespace dd
       const CSVTSTorchInputFileConn &inputc, const TorchModel &tmodel,
       const torch::Device &device,
       const oatpp::Object<DTO::ServicePredict> &pred_dto);
+
+  template void TorchModule::create_native_template(
+      const std::string &tmpl, const APIData &lib_ad,
+      const CSVTSTorchInputFileConn &inputc, const TorchModel &tmodel,
+      const torch::Device &device);
 }