Skip to content

Commit 966b0e0

Browse files
authored
TensorRT detect.py inference fix (#9581)
* Update * Update ci-testing.yml Signed-off-by: Glenn Jocher <[email protected]> * Update ci-testing.yml Signed-off-by: Glenn Jocher <[email protected]> * Segment fix * Segment fix Signed-off-by: Glenn Jocher <[email protected]>
1 parent 2787ad7 commit 966b0e0

File tree

4 files changed

+13
-4
lines changed

4 files changed

+13
-4
lines changed

.github/workflows/ci-testing.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,12 @@ jobs:
4444
- name: Benchmark SegmentationModel
4545
run: |
4646
python benchmarks.py --data coco128-seg.yaml --weights ${{ matrix.model }}-seg.pt --img 320 --hard-fail 0.22
47+
- name: Test predictions
48+
run: |
49+
python export.py --weights ${{ matrix.model }}-cls.pt --include onnx --img 224
50+
python detect.py --weights ${{ matrix.model }}.onnx --img 320
51+
python segment/predict.py --weights ${{ matrix.model }}-seg.onnx --img 320
52+
python classify/predict.py --weights ${{ matrix.model }}-cls.onnx --img 224
4753
4854
Tests:
4955
timeout-minutes: 60

classify/predict.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,14 +89,15 @@ def run(
8989
imgsz = check_img_size(imgsz, s=stride) # check image size
9090

9191
# Dataloader
92+
bs = 1 # batch_size
9293
if webcam:
9394
view_img = check_imshow()
9495
dataset = LoadStreams(source, img_size=imgsz, transforms=classify_transforms(imgsz[0]), vid_stride=vid_stride)
96+
bs = len(dataset)
9597
elif screenshot:
9698
dataset = LoadScreenshots(source, img_size=imgsz, stride=stride, auto=pt)
9799
else:
98100
dataset = LoadImages(source, img_size=imgsz, transforms=classify_transforms(imgsz[0]), vid_stride=vid_stride)
99-
bs = len(dataset) # batch_size
100101
vid_path, vid_writer = [None] * bs, [None] * bs
101102

102103
# Run inference

detect.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,14 +97,15 @@ def run(
9797
imgsz = check_img_size(imgsz, s=stride) # check image size
9898

9999
# Dataloader
100+
bs = 1 # batch_size
100101
if webcam:
101102
view_img = check_imshow()
102103
dataset = LoadStreams(source, img_size=imgsz, stride=stride, auto=pt, vid_stride=vid_stride)
104+
bs = len(dataset)
103105
elif screenshot:
104106
dataset = LoadScreenshots(source, img_size=imgsz, stride=stride, auto=pt)
105107
else:
106108
dataset = LoadImages(source, img_size=imgsz, stride=stride, auto=pt, vid_stride=vid_stride)
107-
bs = len(dataset) # batch_size
108109
vid_path, vid_writer = [None] * bs, [None] * bs
109110

110111
# Run inference

segment/predict.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,14 +100,15 @@ def run(
100100
imgsz = check_img_size(imgsz, s=stride) # check image size
101101

102102
# Dataloader
103+
bs = 1 # batch_size
103104
if webcam:
104105
view_img = check_imshow()
105106
dataset = LoadStreams(source, img_size=imgsz, stride=stride, auto=pt, vid_stride=vid_stride)
107+
bs = len(dataset)
106108
elif screenshot:
107109
dataset = LoadScreenshots(source, img_size=imgsz, stride=stride, auto=pt)
108110
else:
109111
dataset = LoadImages(source, img_size=imgsz, stride=stride, auto=pt, vid_stride=vid_stride)
110-
bs = len(dataset) # batch_size
111112
vid_path, vid_writer = [None] * bs, [None] * bs
112113

113114
# Run inference
@@ -179,7 +180,7 @@ def run(
179180
c = int(cls) # integer class
180181
label = None if hide_labels else (names[c] if hide_conf else f'{names[c]} {conf:.2f}')
181182
annotator.box_label(xyxy, label, color=colors(c, True))
182-
annotator.draw.polygon(segments[j], outline=colors(c, True), width=3)
183+
# annotator.draw.polygon(segments[j], outline=colors(c, True), width=3)
183184
if save_crop:
184185
save_one_box(xyxy, imc, file=save_dir / 'crops' / names[c] / f'{p.stem}.jpg', BGR=True)
185186

0 commit comments

Comments
 (0)