From ed6ab95f461d9249e940158e9db841e05936a86a Mon Sep 17 00:00:00 2001
From: liuqi <liuqi10@xiaomi.com>
Date: Wed, 13 Mar 2019 10:33:18 +0800
Subject: [PATCH] Change the timeout of device lock from 3600 to 7200 for CI.

---
 tools/converter.py   | 11 +++++++----
 tools/sh_commands.py |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/tools/converter.py b/tools/converter.py
index c1afcb58..8bb9adad 100644
--- a/tools/converter.py
+++ b/tools/converter.py
@@ -14,12 +14,9 @@
 
 import argparse
 import glob
-import hashlib
-import os
-import re
 import sh
 import sys
-import urllib
+import time
 import yaml
 
 from enum import Enum
@@ -1006,8 +1003,11 @@ def run_mace(flags):
                                    flags.address_sanitizer,
                                    flags.mace_lib_type)
                 # run
+                start_time = time.time()
                 with device.lock():
                     device.run_specify_abi(flags, configs, target_abi)
+                elapse_minutes = (time.time() - start_time) / 60
+                print("Elapse time: %f minutes." % elapse_minutes)
             elif dev[YAMLKeyword.device_name] != SystemType.host:
                 six.print_('The device with soc %s do not support abi %s' %
                            (dev[YAMLKeyword.target_socs], target_abi),
@@ -1090,8 +1090,11 @@ def benchmark_model(flags):
                                       not flags.disable_openmp,
                                       flags.mace_lib_type)
                 device = DeviceWrapper(dev)
+                start_time = time.time()
                 with device.lock():
                     device.bm_specific_target(flags, configs, target_abi)
+                elapse_minutes = (time.time() - start_time) / 60
+                print("Elapse time: %f minutes." % elapse_minutes)
             else:
                 six.print_('There is no abi %s with soc %s' %
                            (target_abi, dev[YAMLKeyword.target_socs]),
diff --git a/tools/sh_commands.py b/tools/sh_commands.py
index 11d6934b..0649129f 100644
--- a/tools/sh_commands.py
+++ b/tools/sh_commands.py
@@ -69,7 +69,7 @@ def device_lock_path(serialno):
     return "/tmp/device-lock-%s" % serialno
 
 
-def device_lock(serialno, timeout=3600):
+def device_lock(serialno, timeout=7200):
     import filelock
     return filelock.FileLock(device_lock_path(serialno), timeout=timeout)
 
-- 
GitLab