From 9c77dcf2889de93264ba0f96b19178e143fd0e1a Mon Sep 17 00:00:00 2001 From: Glenn Jocher Date: Sat, 23 Oct 2021 14:29:54 +0200 Subject: [PATCH 1/4] Meshgrid `indexing='ij'` for PyTorch 1.10 Will not merge currently as breaks backwards compatibility. --- models/yolo.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/yolo.py b/models/yolo.py index 497a0e9c24e6..bb493b652ac8 100644 --- a/models/yolo.py +++ b/models/yolo.py @@ -74,7 +74,7 @@ def forward(self, x): def _make_grid(self, nx=20, ny=20, i=0): d = self.anchors[i].device - yv, xv = torch.meshgrid([torch.arange(ny).to(d), torch.arange(nx).to(d)]) + yv, xv = torch.meshgrid([torch.arange(ny).to(d), torch.arange(nx).to(d)], indexing='ij') grid = torch.stack((xv, yv), 2).expand((1, self.na, ny, nx, 2)).float() anchor_grid = (self.anchors[i].clone() * self.stride[i]) \ .view((1, self.na, 1, 1, 2)).expand((1, self.na, ny, nx, 2)).float() From 8c0b0ae412e7fda5ad2aa70764decc5d9a37292a Mon Sep 17 00:00:00 2001 From: Glenn Jocher Date: Sat, 23 Oct 2021 14:29:54 +0200 Subject: [PATCH 2/4] Meshgrid `indexing='ij'` for PyTorch 1.10 Will not merge currently as breaks backwards compatibility. --- models/yolo.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/yolo.py b/models/yolo.py index 0fa2db91e82b..2486826bb3b1 100644 --- a/models/yolo.py +++ b/models/yolo.py @@ -74,7 +74,7 @@ def forward(self, x): def _make_grid(self, nx=20, ny=20, i=0): d = self.anchors[i].device - yv, xv = torch.meshgrid([torch.arange(ny).to(d), torch.arange(nx).to(d)]) + yv, xv = torch.meshgrid([torch.arange(ny).to(d), torch.arange(nx).to(d)], indexing='ij') grid = torch.stack((xv, yv), 2).expand((1, self.na, ny, nx, 2)).float() anchor_grid = (self.anchors[i].clone() * self.stride[i]) \ .view((1, self.na, 1, 1, 2)).expand((1, self.na, ny, nx, 2)).float() From 39466fe37cdd71b7ed14cc215f368eb702f570ff Mon Sep 17 00:00:00 2001 From: Glenn Jocher Date: Mon, 1 Nov 2021 13:26:26 +0100 Subject: [PATCH 3/4] Add check_version hard argument --- models/yolo.py | 7 +++++-- utils/augmentations.py | 2 +- utils/general.py | 11 +++++++---- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/models/yolo.py b/models/yolo.py index bb493b652ac8..b66ca0fe16e5 100644 --- a/models/yolo.py +++ b/models/yolo.py @@ -20,7 +20,7 @@ from models.common import * from models.experimental import * from utils.autoanchor import check_anchor_order -from utils.general import check_yaml, make_divisible, print_args, set_logging +from utils.general import check_yaml, make_divisible, print_args, set_logging, check_version from utils.plots import feature_visualization from utils.torch_utils import copy_attr, fuse_conv_and_bn, initialize_weights, model_info, scale_img, \ select_device, time_sync @@ -74,7 +74,10 @@ def forward(self, x): def _make_grid(self, nx=20, ny=20, i=0): d = self.anchors[i].device - yv, xv = torch.meshgrid([torch.arange(ny).to(d), torch.arange(nx).to(d)], indexing='ij') + if check_version(torch.__version__, '1.10.0'): # torch 1.10.0 meshgrid argument workaround for torch 0.7 compat + yv, xv = torch.meshgrid([torch.arange(ny).to(d), torch.arange(nx).to(d)], indexing='ij') + else: + yv, xv = torch.meshgrid([torch.arange(ny).to(d), torch.arange(nx).to(d)]) grid = torch.stack((xv, yv), 2).expand((1, self.na, ny, nx, 2)).float() anchor_grid = (self.anchors[i].clone() * self.stride[i]) \ .view((1, self.na, 1, 1, 2)).expand((1, self.na, ny, nx, 2)).float() diff --git a/utils/augmentations.py b/utils/augmentations.py index 04192d1ec5cd..b3cbbf913b65 100644 --- a/utils/augmentations.py +++ b/utils/augmentations.py @@ -20,7 +20,7 @@ def __init__(self): self.transform = None try: import albumentations as A - check_version(A.__version__, '1.0.3') # version requirement + check_version(A.__version__, '1.0.3', hard=True) # version requirement self.transform = A.Compose([ A.Blur(p=0.01), diff --git a/utils/general.py b/utils/general.py index 02bc741ca3ba..000140c91033 100755 --- a/utils/general.py +++ b/utils/general.py @@ -220,14 +220,17 @@ def check_git_status(): def check_python(minimum='3.6.2'): # Check current python version vs. required python version - check_version(platform.python_version(), minimum, name='Python ') + check_version(platform.python_version(), minimum, name='Python ', hard=True) -def check_version(current='0.0.0', minimum='0.0.0', name='version ', pinned=False): +def check_version(current='0.0.0', minimum='0.0.0', name='version ', pinned=False, hard=False): # Check version vs. required version current, minimum = (pkg.parse_version(x) for x in (current, minimum)) - result = (current == minimum) if pinned else (current >= minimum) - assert result, f'{name}{minimum} required by YOLOv5, but {name}{current} is currently installed' + result = (current == minimum) if pinned else (current >= minimum) # bool + if hard: # assert min requirements met + assert result, f'{name}{minimum} required by YOLOv5, but {name}{current} is currently installed' + else: + return result @try_except From c1c021c7ac30ece7564326a5b062d3ef699224c6 Mon Sep 17 00:00:00 2001 From: Glenn Jocher Date: Mon, 1 Nov 2021 13:28:26 +0100 Subject: [PATCH 4/4] Update comment --- models/yolo.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/yolo.py b/models/yolo.py index a24b51d41ada..80ff83e16085 100644 --- a/models/yolo.py +++ b/models/yolo.py @@ -74,7 +74,7 @@ def forward(self, x): def _make_grid(self, nx=20, ny=20, i=0): d = self.anchors[i].device - if check_version(torch.__version__, '1.10.0'): # torch 1.10.0 meshgrid argument workaround for torch 0.7 compat + if check_version(torch.__version__, '1.10.0'): # torch>=1.10.0 meshgrid workaround for torch>=0.7 compatibility yv, xv = torch.meshgrid([torch.arange(ny).to(d), torch.arange(nx).to(d)], indexing='ij') else: yv, xv = torch.meshgrid([torch.arange(ny).to(d), torch.arange(nx).to(d)])