From d83b1de17e4a2733cfabe61232904a3d9f87cf4b Mon Sep 17 00:00:00 2001
From: LDOUBLEV <liuvv0203@outlook.com>
Date: Tue, 17 Aug 2021 02:43:15 +0000
Subject: [PATCH] mv get_gpu_id func to utility

---
 tools/infer/predict_det.py | 15 +--------------
 tools/infer/utility.py     | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/tools/infer/predict_det.py b/tools/infer/predict_det.py
index 6a9ae987..62e7ff73 100755
--- a/tools/infer/predict_det.py
+++ b/tools/infer/predict_det.py
@@ -101,7 +101,7 @@ class TextDetector(object):
         if args.benchmark:
             import auto_log
             pid = os.getpid()
-            gpu_id = self.get_infer_gpuid()
+            gpu_id = utility.get_infer_gpuid()
             self.autolog = auto_log.AutoLogger(
                 model_name="det",
                 model_precision=args.precision,
@@ -118,19 +118,6 @@ class TextDetector(object):
                 warmup=2,
                 logger=logger)
 
-    def get_infer_gpuid(self):
-        cmd = "nvidia-smi"
-        res = os.popen(cmd).readlines()
-        if len(res) == 0:
-            return None
-        cmd = "env | grep CUDA_VISIBLE_DEVICES"
-        env_cuda = os.popen(cmd).readlines()
-        if len(env_cuda) == 0:
-            return 0
-        else:
-            gpu_id = env_cuda[0].strip().split("=")[1]
-            return int(gpu_id[0])
-
     def order_points_clockwise(self, pts):
         """
         reference from: https://github.com/jrosebr1/imutils/blob/master/imutils/perspective.py
diff --git a/tools/infer/utility.py b/tools/infer/utility.py
index 1c822800..527a811d 100755
--- a/tools/infer/utility.py
+++ b/tools/infer/utility.py
@@ -280,6 +280,20 @@ def create_predictor(args, mode, logger):
     return predictor, input_tensor, output_tensors, config
 
 
+def get_infer_gpuid():
+    cmd = "nvidia-smi"
+    res = os.popen(cmd).readlines()
+    if len(res) == 0:
+        return None
+    cmd = "env | grep CUDA_VISIBLE_DEVICES"
+    env_cuda = os.popen(cmd).readlines()
+    if len(env_cuda) == 0:
+        return 0
+    else:
+        gpu_id = env_cuda[0].strip().split("=")[1]
+        return int(gpu_id[0])
+
+
 def draw_e2e_res(dt_boxes, strs, img_path):
     src_im = cv2.imread(img_path)
     for box, str in zip(dt_boxes, strs):
-- 
GitLab