Merge branch 'main' into gnn_enc

NVIDIA · Oct 14, 2024 · b7685e9 · b7685e9
2 parents 624d471 + efec9bf
commit b7685e9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/nvflare/app_opt/xgboost/histogram_based_v2/mock/mock_executor.py b/nvflare/app_opt/xgboost/histogram_based_v2/mock/mock_executor.py
@@ -21,13 +21,15 @@ class MockXGBExecutor(XGBExecutor):
     def __init__(
         self,
         int_server_grpc_options=None,
-        req_timeout=10.0,
+        per_msg_timeout=10.0,
+        tx_timeout=60.0,
         in_process=True,
     ):
         XGBExecutor.__init__(
             self,
             adaptor_component_id="",
-            req_timeout=req_timeout,
+            per_msg_timeout=per_msg_timeout,
+            tx_timeout=tx_timeout,
         )
         self.int_server_grpc_options = int_server_grpc_options
         self.in_process = in_process

diff --git a/nvflare/app_opt/xgboost/histogram_based_v2/mock/mock_secure_executor.py b/nvflare/app_opt/xgboost/histogram_based_v2/mock/mock_secure_executor.py
@@ -21,13 +21,15 @@ class MockSecureXGBExecutor(XGBExecutor):
     def __init__(
         self,
         int_server_grpc_options=None,
-        req_timeout=10.0,
+        per_msg_timeout=10.0,
+        tx_timeout=100.0,
         in_process=True,
     ):
         XGBExecutor.__init__(
             self,
             adaptor_component_id="",
-            req_timeout=req_timeout,
+            per_msg_timeout=per_msg_timeout,
+            tx_timeout=tx_timeout,
         )
         self.int_server_grpc_options = int_server_grpc_options
         self.in_process = in_process