Merge pull request #355 from DeNA/develop

(2024/04) merge develop into master
DeNA · Apr 26, 2024 · d46a7cd · d46a7cd
2 parents 9d9a459 + 6008b1c
commit d46a7cd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/handyrl/connection.py b/handyrl/connection.py
@@ -204,6 +204,8 @@ def _send_thread(self):
             conn, send_data = self.output_queue.get()
             try:
                 conn.send(send_data)
+            except TimeoutError:
+                self.disconnect(conn)
             except ConnectionResetError:
                 self.disconnect(conn)
             except BrokenPipeError:
@@ -215,6 +217,9 @@ def _recv_thread(self):
             for conn in conns:
                 try:
                     recv_data = conn.recv()
+                except TimeoutError:
+                    self.disconnect(conn)
+                    continue
                 except ConnectionResetError:
                     self.disconnect(conn)
                     continue

diff --git a/handyrl/evaluation.py b/handyrl/evaluation.py
@@ -396,7 +396,7 @@ def resolve_agent(model_path):
 
     print('%d process, %d games' % (num_process, num_games))
 
-    seed = random.randrange(1e8)
+    seed = random.randrange(int(1e8))
     print('seed = %d' % seed)
 
     opponent = model_paths[1] if len(model_paths) > 1 else 'random'
@@ -416,7 +416,7 @@ def eval_server_main(args, argv):
 
     print('%d process, %d games' % (num_process, num_games))
 
-    seed = random.randrange(1e8)
+    seed = random.randrange(int(1e8))
     print('seed = %d' % seed)
 
     evaluate_mp(env, [None] * len(env.players()), None, env_args, {'default': {}}, num_process, num_games, seed)