coolroman commited on
Commit
dad3b9d
·
verified ·
1 Parent(s): 331bd3d

Fix CUDA: ldconfig + LD_LIBRARY_PATH, shutdown_after=14400

Browse files
Files changed (2) hide show
  1. chute_config.yml +2 -0
  2. miner.py +68 -14
chute_config.yml CHANGED
@@ -3,6 +3,7 @@ Image:
3
  run_command:
4
  - pip install --upgrade setuptools wheel
5
  - pip install 'numpy>=1.23' 'onnxruntime-gpu[cuda,cudnn]>=1.16' 'opencv-python>=4.7' 'pillow>=9.5' 'huggingface_hub>=0.19.4' 'pydantic>=2.0' 'pyyaml>=6.0' 'aiohttp>=3.9' 'torch>=2.8'
 
6
 
7
  NodeSelector:
8
  gpu_count: 1
@@ -13,3 +14,4 @@ Chute:
13
  concurrency: 4
14
  max_instances: 5
15
  scaling_threshold: 0.5
 
 
3
  run_command:
4
  - pip install --upgrade setuptools wheel
5
  - pip install 'numpy>=1.23' 'onnxruntime-gpu[cuda,cudnn]>=1.16' 'opencv-python>=4.7' 'pillow>=9.5' 'huggingface_hub>=0.19.4' 'pydantic>=2.0' 'pyyaml>=6.0' 'aiohttp>=3.9' 'torch>=2.8'
6
+ - python3 -c "import os,glob;libs=[d for p in ['/usr/local/lib/python3.12/dist-packages','/usr/lib/python3/dist-packages'] for d in glob.glob(os.path.join(p,'nvidia','*','lib'))];open('/etc/ld.so.conf.d/nvidia-pip.conf','w').write('\n'.join(libs)+'\n');print('Registered CUDA libs:',libs)" && ldconfig
7
 
8
  NodeSelector:
9
  gpu_count: 1
 
14
  concurrency: 4
15
  max_instances: 5
16
  scaling_threshold: 0.5
17
+ shutdown_after_seconds: 14400
miner.py CHANGED
@@ -1,5 +1,13 @@
1
  from pathlib import Path
2
  import math
 
 
 
 
 
 
 
 
3
 
4
  import cv2
5
  import numpy as np
@@ -38,10 +46,12 @@ class Miner:
38
  )
39
  self.input_name = self.session.get_inputs()[0].name
40
  input_shape = self.session.get_inputs()[0].shape
 
41
  self.input_h = int(input_shape[2])
42
  self.input_w = int(input_shape[3])
43
- self.conf_threshold = 0.20
44
  self.iou_threshold = 0.3
 
45
 
46
  def __repr__(self) -> str:
47
  return f"ONNX Miner session={type(self.session).__name__} classes={len(self.class_names)}"
@@ -65,48 +75,64 @@ class Miner:
65
  def _nms(self, dets: list[tuple[float, float, float, float, float, int]]) -> list[tuple[float, float, float, float, float, int]]:
66
  if not dets:
67
  return []
 
68
  boxes = np.array([[d[0], d[1], d[2], d[3]] for d in dets], dtype=np.float32)
69
  scores = np.array([d[4] for d in dets], dtype=np.float32)
70
  order = scores.argsort()[::-1]
71
  keep = []
 
72
  while order.size > 0:
73
  i = order[0]
74
  keep.append(i)
 
75
  xx1 = np.maximum(boxes[i, 0], boxes[order[1:], 0])
76
  yy1 = np.maximum(boxes[i, 1], boxes[order[1:], 1])
77
  xx2 = np.minimum(boxes[i, 2], boxes[order[1:], 2])
78
  yy2 = np.minimum(boxes[i, 3], boxes[order[1:], 3])
 
79
  w = np.maximum(0.0, xx2 - xx1)
80
  h = np.maximum(0.0, yy2 - yy1)
81
  inter = w * h
 
82
  area_i = (boxes[i, 2] - boxes[i, 0]) * (boxes[i, 3] - boxes[i, 1])
83
  area_rest = (boxes[order[1:], 2] - boxes[order[1:], 0]) * (boxes[order[1:], 3] - boxes[order[1:], 1])
84
  union = np.maximum(area_i + area_rest - inter, 1e-6)
85
  iou = inter / union
 
86
  remaining = np.where(iou <= self.iou_threshold)[0]
87
  order = order[remaining + 1]
 
88
  return [dets[idx] for idx in keep]
89
 
90
- def _infer_single(self, image_bgr: ndarray) -> list[BoundingBox]:
 
91
  inp, (orig_h, orig_w) = self._preprocess(image_bgr)
92
  out = self.session.run(None, {self.input_name: inp})[0]
93
  pred = self._normalize_predictions(out)
 
94
  if pred.shape[1] < 5:
95
  return []
 
96
  boxes = pred[:, :4]
97
  cls_scores = pred[:, 4:]
 
98
  if cls_scores.shape[1] == 0:
99
  return []
 
100
  cls_ids = np.argmax(cls_scores, axis=1)
101
  confs = np.max(cls_scores, axis=1)
102
  keep = confs >= self.conf_threshold
 
103
  boxes = boxes[keep]
104
  confs = confs[keep]
105
  cls_ids = cls_ids[keep]
 
106
  if boxes.shape[0] == 0:
107
  return []
 
108
  sx = orig_w / float(self.input_w)
109
  sy = orig_h / float(self.input_h)
 
110
  dets: list[tuple[float, float, float, float, float, int]] = []
111
  for i in range(boxes.shape[0]):
112
  cx, cy, bw, bh = boxes[i].tolist()
@@ -115,30 +141,58 @@ class Miner:
115
  x2 = (cx + bw / 2.0) * sx
116
  y2 = (cy + bh / 2.0) * sy
117
  dets.append((x1, y1, x2, y2, float(confs[i]), int(cls_ids[i])))
118
- dets = self._nms(dets)
119
- # Filter spurious detections
120
- dets = [(x1,y1,x2,y2,conf,cid) for x1,y1,x2,y2,conf,cid in dets
121
- if (x2-x1) >= 6 and (y2-y1) >= 6
122
- and (x2-x1)*(y2-y1) >= 80
123
- and max((x2-x1)/max(y2-y1,1), (y2-y1)/max(x2-x1,1)) <= 10.0]
 
 
 
 
 
 
 
 
 
 
 
 
 
124
  out_boxes: list[BoundingBox] = []
125
- for x1, y1, x2, y2, conf, cls_id in dets:
126
  ix1 = max(0, min(orig_w, math.floor(x1)))
127
  iy1 = max(0, min(orig_h, math.floor(y1)))
128
  ix2 = max(0, min(orig_w, math.ceil(x2)))
129
  iy2 = max(0, min(orig_h, math.ceil(y2)))
130
  out_boxes.append(
131
- BoundingBox(x1=ix1, y1=iy1, x2=ix2, y2=iy2,
132
- cls_id=cls_id, conf=max(0.0, min(1.0, conf))))
 
 
 
 
 
 
 
133
  return out_boxes
134
 
135
  def predict_batch(
136
- self, batch_images: list[ndarray], offset: int, n_keypoints: int,
 
 
 
137
  ) -> list[TVFrameResult]:
138
  results: list[TVFrameResult] = []
139
  for idx, image in enumerate(batch_images):
140
  boxes = self._infer_single(image)
141
  keypoints = [(0, 0) for _ in range(max(0, int(n_keypoints)))]
142
- results.append(TVFrameResult(
143
- frame_id=offset + idx, boxes=boxes, keypoints=keypoints))
 
 
 
 
 
144
  return results
 
1
  from pathlib import Path
2
  import math
3
+ import os
4
+ import glob
5
+ import site
6
+
7
+ # Ensure pip-installed NVIDIA CUDA/cuDNN libraries are discoverable
8
+ for sp in site.getsitepackages():
9
+ for d in glob.glob(os.path.join(sp, 'nvidia', '*', 'lib')):
10
+ os.environ['LD_LIBRARY_PATH'] = d + ':' + os.environ.get('LD_LIBRARY_PATH', '')
11
 
12
  import cv2
13
  import numpy as np
 
46
  )
47
  self.input_name = self.session.get_inputs()[0].name
48
  input_shape = self.session.get_inputs()[0].shape
49
+ # expected [N, C, H, W]
50
  self.input_h = int(input_shape[2])
51
  self.input_w = int(input_shape[3])
52
+ self.conf_threshold = 0.15
53
  self.iou_threshold = 0.3
54
+ self.use_tta = True
55
 
56
  def __repr__(self) -> str:
57
  return f"ONNX Miner session={type(self.session).__name__} classes={len(self.class_names)}"
 
75
  def _nms(self, dets: list[tuple[float, float, float, float, float, int]]) -> list[tuple[float, float, float, float, float, int]]:
76
  if not dets:
77
  return []
78
+
79
  boxes = np.array([[d[0], d[1], d[2], d[3]] for d in dets], dtype=np.float32)
80
  scores = np.array([d[4] for d in dets], dtype=np.float32)
81
  order = scores.argsort()[::-1]
82
  keep = []
83
+
84
  while order.size > 0:
85
  i = order[0]
86
  keep.append(i)
87
+
88
  xx1 = np.maximum(boxes[i, 0], boxes[order[1:], 0])
89
  yy1 = np.maximum(boxes[i, 1], boxes[order[1:], 1])
90
  xx2 = np.minimum(boxes[i, 2], boxes[order[1:], 2])
91
  yy2 = np.minimum(boxes[i, 3], boxes[order[1:], 3])
92
+
93
  w = np.maximum(0.0, xx2 - xx1)
94
  h = np.maximum(0.0, yy2 - yy1)
95
  inter = w * h
96
+
97
  area_i = (boxes[i, 2] - boxes[i, 0]) * (boxes[i, 3] - boxes[i, 1])
98
  area_rest = (boxes[order[1:], 2] - boxes[order[1:], 0]) * (boxes[order[1:], 3] - boxes[order[1:], 1])
99
  union = np.maximum(area_i + area_rest - inter, 1e-6)
100
  iou = inter / union
101
+
102
  remaining = np.where(iou <= self.iou_threshold)[0]
103
  order = order[remaining + 1]
104
+
105
  return [dets[idx] for idx in keep]
106
 
107
+ def _decode(self, image_bgr: ndarray) -> list[tuple[float, float, float, float, float, int]]:
108
+ """Run model and return raw detections before NMS."""
109
  inp, (orig_h, orig_w) = self._preprocess(image_bgr)
110
  out = self.session.run(None, {self.input_name: inp})[0]
111
  pred = self._normalize_predictions(out)
112
+
113
  if pred.shape[1] < 5:
114
  return []
115
+
116
  boxes = pred[:, :4]
117
  cls_scores = pred[:, 4:]
118
+
119
  if cls_scores.shape[1] == 0:
120
  return []
121
+
122
  cls_ids = np.argmax(cls_scores, axis=1)
123
  confs = np.max(cls_scores, axis=1)
124
  keep = confs >= self.conf_threshold
125
+
126
  boxes = boxes[keep]
127
  confs = confs[keep]
128
  cls_ids = cls_ids[keep]
129
+
130
  if boxes.shape[0] == 0:
131
  return []
132
+
133
  sx = orig_w / float(self.input_w)
134
  sy = orig_h / float(self.input_h)
135
+
136
  dets: list[tuple[float, float, float, float, float, int]] = []
137
  for i in range(boxes.shape[0]):
138
  cx, cy, bw, bh = boxes[i].tolist()
 
141
  x2 = (cx + bw / 2.0) * sx
142
  y2 = (cy + bh / 2.0) * sy
143
  dets.append((x1, y1, x2, y2, float(confs[i]), int(cls_ids[i])))
144
+
145
+ return dets
146
+
147
+ def _infer_single(self, image_bgr: ndarray) -> list[BoundingBox]:
148
+ orig_h, orig_w = image_bgr.shape[:2]
149
+
150
+ # Original pass
151
+ all_dets = self._decode(image_bgr)
152
+
153
+ # TTA: horizontal flip pass
154
+ if self.use_tta:
155
+ flipped = cv2.flip(image_bgr, 1)
156
+ flip_dets = self._decode(flipped)
157
+ for x1, y1, x2, y2, conf, cls_id in flip_dets:
158
+ all_dets.append((orig_w - x2, y1, orig_w - x1, y2, conf, cls_id))
159
+
160
+ # NMS
161
+ all_dets = self._nms(all_dets)
162
+
163
  out_boxes: list[BoundingBox] = []
164
+ for x1, y1, x2, y2, conf, cls_id in all_dets:
165
  ix1 = max(0, min(orig_w, math.floor(x1)))
166
  iy1 = max(0, min(orig_h, math.floor(y1)))
167
  ix2 = max(0, min(orig_w, math.ceil(x2)))
168
  iy2 = max(0, min(orig_h, math.ceil(y2)))
169
  out_boxes.append(
170
+ BoundingBox(
171
+ x1=ix1,
172
+ y1=iy1,
173
+ x2=ix2,
174
+ y2=iy2,
175
+ cls_id=cls_id,
176
+ conf=max(0.0, min(1.0, conf)),
177
+ )
178
+ )
179
  return out_boxes
180
 
181
  def predict_batch(
182
+ self,
183
+ batch_images: list[ndarray],
184
+ offset: int,
185
+ n_keypoints: int,
186
  ) -> list[TVFrameResult]:
187
  results: list[TVFrameResult] = []
188
  for idx, image in enumerate(batch_images):
189
  boxes = self._infer_single(image)
190
  keypoints = [(0, 0) for _ in range(max(0, int(n_keypoints)))]
191
+ results.append(
192
+ TVFrameResult(
193
+ frame_id=offset + idx,
194
+ boxes=boxes,
195
+ keypoints=keypoints,
196
+ )
197
+ )
198
  return results