From f7b0bc24814cda3a262a942d6537960b57c8df02 Mon Sep 17 00:00:00 2001 From: William Chen Date: Wed, 16 Jun 2021 17:19:32 -0400 Subject: [PATCH 1/5] remove unused import --- timesformer/models/resnet_helper.py | 1 - 1 file changed, 1 deletion(-) diff --git a/timesformer/models/resnet_helper.py b/timesformer/models/resnet_helper.py index 082d318..773602b 100755 --- a/timesformer/models/resnet_helper.py +++ b/timesformer/models/resnet_helper.py @@ -12,7 +12,6 @@ from einops import rearrange, reduce, repeat import torch.nn.functional as F from torch.nn.modules.module import Module -from torch.nn.modules.linear import _LinearWithBias from torch.nn.modules.activation import MultiheadAttention import numpy as np From f22862b89b0c67fa4313d81892e73e681079a2e5 Mon Sep 17 00:00:00 2001 From: William Chen Date: Wed, 16 Jun 2021 17:29:18 -0400 Subject: [PATCH 2/5] compile errors --- timesformer/datasets/multigrid_helper.py | 3 +-- timesformer/models/vit_utils.py | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/timesformer/datasets/multigrid_helper.py b/timesformer/datasets/multigrid_helper.py index de9ba0c..ff8d4e7 100755 --- a/timesformer/datasets/multigrid_helper.py +++ b/timesformer/datasets/multigrid_helper.py @@ -3,7 +3,6 @@ """Helper functions for multigrid training.""" import numpy as np -from torch._six import int_classes as _int_classes from torch.utils.data.sampler import Sampler @@ -21,7 +20,7 @@ def __init__(self, sampler, batch_size, drop_last, cfg): "torch.utils.data.Sampler, but got sampler={}".format(sampler) ) if ( - not isinstance(batch_size, _int_classes) + not isinstance(batch_size, int) or isinstance(batch_size, bool) or batch_size <= 0 ): diff --git a/timesformer/models/vit_utils.py b/timesformer/models/vit_utils.py index 9ce6a93..35fdb61 100755 --- a/timesformer/models/vit_utils.py +++ b/timesformer/models/vit_utils.py @@ -11,7 +11,7 @@ from timesformer.models.helpers import load_pretrained from .build import MODEL_REGISTRY from itertools import repeat -from torch._six import container_abcs +import collections.abc DEFAULT_CROP_PCT = 0.875 IMAGENET_DEFAULT_MEAN = (0.485, 0.456, 0.406) @@ -77,7 +77,7 @@ def trunc_normal_(tensor, mean=0., std=1., a=-2., b=2.): # From PyTorch internals def _ntuple(n): def parse(x): - if isinstance(x, container_abcs.Iterable): + if isinstance(x, collections.abc.Iterable): return x return tuple(repeat(x, n)) return parse From e4b06fde1c70fc0f05770d6383c8462d5961c4de Mon Sep 17 00:00:00 2001 From: William Chen Date: Sun, 20 Jun 2021 12:12:52 -0400 Subject: [PATCH 3/5] retain support for previous versions --- timesformer/datasets/multigrid_helper.py | 9 ++++++++- timesformer/models/vit_utils.py | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/timesformer/datasets/multigrid_helper.py b/timesformer/datasets/multigrid_helper.py index ff8d4e7..1d2a65e 100755 --- a/timesformer/datasets/multigrid_helper.py +++ b/timesformer/datasets/multigrid_helper.py @@ -5,6 +5,13 @@ import numpy as np from torch.utils.data.sampler import Sampler +TORCH_MAJOR = int(torch.__version__.split('.')[0]) +TORCH_MINOR = int(torch.__version__.split('.')[1]) + +if TORCH_MAJOR == 1 and TORCH_MINOR < 8: + from torch._six import int_classes as _int_classes +else: + _int_classes = int class ShortCycleBatchSampler(Sampler): """ @@ -20,7 +27,7 @@ def __init__(self, sampler, batch_size, drop_last, cfg): "torch.utils.data.Sampler, but got sampler={}".format(sampler) ) if ( - not isinstance(batch_size, int) + not isinstance(batch_size, _int_classes) or isinstance(batch_size, bool) or batch_size <= 0 ): diff --git a/timesformer/models/vit_utils.py b/timesformer/models/vit_utils.py index 35fdb61..2c6cc30 100755 --- a/timesformer/models/vit_utils.py +++ b/timesformer/models/vit_utils.py @@ -11,7 +11,14 @@ from timesformer.models.helpers import load_pretrained from .build import MODEL_REGISTRY from itertools import repeat -import collections.abc + +TORCH_MAJOR = int(torch.__version__.split('.')[0]) +TORCH_MINOR = int(torch.__version__.split('.')[1]) + +if TORCH_MAJOR == 1 and TORCH_MINOR < 8: + from torch._six import container_abcs +else: + import collections.abc as container_abcs DEFAULT_CROP_PCT = 0.875 IMAGENET_DEFAULT_MEAN = (0.485, 0.456, 0.406) From 184742ce9151b924b433d6f3a257deb17fa9297e Mon Sep 17 00:00:00 2001 From: William Chen Date: Sun, 20 Jun 2021 12:14:15 -0400 Subject: [PATCH 4/5] change var name to fit new import --- timesformer/models/vit_utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/timesformer/models/vit_utils.py b/timesformer/models/vit_utils.py index 2c6cc30..83251e5 100755 --- a/timesformer/models/vit_utils.py +++ b/timesformer/models/vit_utils.py @@ -84,7 +84,7 @@ def trunc_normal_(tensor, mean=0., std=1., a=-2., b=2.): # From PyTorch internals def _ntuple(n): def parse(x): - if isinstance(x, collections.abc.Iterable): + if isinstance(x, container_abcs.Iterable): return x return tuple(repeat(x, n)) return parse From 5a05100f5e87d2463a06b60fc72edfb375fff8f4 Mon Sep 17 00:00:00 2001 From: William Chen <39677488+wanchichen@users.noreply.github.com> Date: Wed, 6 Apr 2022 17:06:56 -0400 Subject: [PATCH 5/5] Update multigrid_helper.py --- timesformer/datasets/multigrid_helper.py | 1 + 1 file changed, 1 insertion(+) diff --git a/timesformer/datasets/multigrid_helper.py b/timesformer/datasets/multigrid_helper.py index 1d2a65e..291bcd4 100755 --- a/timesformer/datasets/multigrid_helper.py +++ b/timesformer/datasets/multigrid_helper.py @@ -3,6 +3,7 @@ """Helper functions for multigrid training.""" import numpy as np +import torch from torch.utils.data.sampler import Sampler TORCH_MAJOR = int(torch.__version__.split('.')[0])