Tensor initialization on device improvements (#6959)
* Update common.py speed improvements Eliminate .to() ops where possible for reduced data transfer overhead. Primarily affects warmup and PyTorch Hub inference. * Updates * Updates * Update detect.py * Update val.py
This commit is contained in:
1 parent
52c1399fdc
commit
701e1177ac
2 files changed
+4
-4
No files matched your search
+1
-1
@@ -466,7 +466,7 @@ class DetectMultiBackend(nn.Module):
|
|||||||
# Warmup model by running inference once
|
# Warmup model by running inference once
|
||||||
if self.pt or self.jit or self.onnx or self.engine: # warmup types
|
if self.pt or self.jit or self.onnx or self.engine: # warmup types
|
||||||
if isinstance(self.device, torch.device) and self.device.type != 'cpu': # only warmup GPU models
|
if isinstance(self.device, torch.device) and self.device.type != 'cpu': # only warmup GPU models
|
||||||
im = torch.zeros(*imgsz).to(self.device).type(torch.half if self.fp16 else torch.float) # input image
|
im = torch.zeros(*imgsz, dtype=torch.half if self.fp16 else torch.float, device=self.device) # input
|
||||||
self.forward(im) # warmup
|
self.forward(im) # warmup
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
|
|||||||
@@ -87,7 +87,7 @@ def process_batch(detections, labels, iouv):
|
|||||||
matches = matches[np.unique(matches[:, 1], return_index=True)[1]]
|
matches = matches[np.unique(matches[:, 1], return_index=True)[1]]
|
||||||
# matches = matches[matches[:, 2].argsort()[::-1]]
|
# matches = matches[matches[:, 2].argsort()[::-1]]
|
||||||
matches = matches[np.unique(matches[:, 0], return_index=True)[1]]
|
matches = matches[np.unique(matches[:, 0], return_index=True)[1]]
|
||||||
matches = torch.Tensor(matches).to(iouv.device)
|
matches = torch.from_numpy(matches).to(iouv.device)
|
||||||
correct[matches[:, 1].long()] = matches[:, 2:3] >= iouv
|
correct[matches[:, 1].long()] = matches[:, 2:3] >= iouv
|
||||||
return correct
|
return correct
|
||||||
|
|
||||||
@@ -155,7 +155,7 @@ def run(data,
|
|||||||
cuda = device.type != 'cpu'
|
cuda = device.type != 'cpu'
|
||||||
is_coco = isinstance(data.get('val'), str) and data['val'].endswith('coco/val2017.txt') # COCO dataset
|
is_coco = isinstance(data.get('val'), str) and data['val'].endswith('coco/val2017.txt') # COCO dataset
|
||||||
nc = 1 if single_cls else int(data['nc']) # number of classes
|
nc = 1 if single_cls else int(data['nc']) # number of classes
|
||||||
iouv = torch.linspace(0.5, 0.95, 10).to(device) # iou vector for mAP@0.5:0.95
|
iouv = torch.linspace(0.5, 0.95, 10, device=device) # iou vector for mAP@0.5:0.95
|
||||||
niou = iouv.numel()
|
niou = iouv.numel()
|
||||||
|
|
||||||
# Dataloader
|
# Dataloader
|
||||||
@@ -196,7 +196,7 @@ def run(data,
|
|||||||
loss += compute_loss([x.float() for x in train_out], targets)[1] # box, obj, cls
|
loss += compute_loss([x.float() for x in train_out], targets)[1] # box, obj, cls
|
||||||
|
|
||||||
# NMS
|
# NMS
|
||||||
targets[:, 2:] *= torch.Tensor([width, height, width, height]).to(device) # to pixels
|
targets[:, 2:] *= torch.tensor((width, height, width, height), device=device) # to pixels
|
||||||
lb = [targets[targets[:, 0] == i, 1:] for i in range(nb)] if save_hybrid else [] # for autolabelling
|
lb = [targets[targets[:, 0] == i, 1:] for i in range(nb)] if save_hybrid else [] # for autolabelling
|
||||||
t3 = time_sync()
|
t3 = time_sync()
|
||||||
out = non_max_suppression(out, conf_thres, iou_thres, labels=lb, multi_label=True, agnostic=single_cls)
|
out = non_max_suppression(out, conf_thres, iou_thres, labels=lb, multi_label=True, agnostic=single_cls)
|
||||||
|
|||||||
Reference in new issue
Block a user