Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix timm version compatibility #331

Merged
merged 20 commits into from
Nov 1, 2023
Merged
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
b821166
Merge pull request #1 from alibaba/master
Cathy0908 Feb 23, 2023
9e36b18
Merge branch 'master' of github.com:alibaba/EasyCV
Cathy0908 Mar 1, 2023
a0eb055
Merge branch 'master' of github.com:alibaba/EasyCV
Cathy0908 Mar 3, 2023
15ca248
Merge branch 'master' of github.com:alibaba/EasyCV
Cathy0908 Mar 6, 2023
b39db6d
Merge branch 'master' of github.com:alibaba/EasyCV
Cathy0908 Mar 13, 2023
1134a50
Merge branch 'master' of github.com:alibaba/EasyCV
Cathy0908 Apr 12, 2023
1549a76
Merge branch 'master' of github.com:alibaba/EasyCV
Cathy0908 Apr 12, 2023
e50b022
Merge branch 'master' of github.com:alibaba/EasyCV
Cathy0908 May 9, 2023
77fccc5
Merge branch 'master' of github.com:alibaba/EasyCV
Cathy0908 May 9, 2023
67ba430
Merge branch 'master' of github.com:alibaba/EasyCV
Cathy0908 May 15, 2023
b8b1e64
Merge branch 'master' of github.com:alibaba/EasyCV
Cathy0908 May 26, 2023
40a53ca
Merge branch 'master' of github.com:alibaba/EasyCV
Cathy0908 May 26, 2023
b474236
Merge branch 'master' of github.com:alibaba/EasyCV
Cathy0908 Jun 13, 2023
b185db3
Merge branch 'master' of github.com:alibaba/EasyCV
Cathy0908 Jun 14, 2023
c4c797d
Merge branch 'master' of github.com:alibaba/EasyCV
Cathy0908 Aug 17, 2023
6b1abd2
Merge branch 'master' of github.com:alibaba/EasyCV
Cathy0908 Oct 26, 2023
e04ce3c
Fix timm version compatibility
Cathy0908 Oct 26, 2023
ddbaa4a
fix tmm version
Cathy0908 Oct 27, 2023
c00f5c1
Merge branch 'master' of github.com:alibaba/EasyCV
Cathy0908 Oct 31, 2023
87b3de5
Merge branch 'master' into fix_ms_timm
Cathy0908 Oct 31, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion easycv/models/backbones/efficientformer.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,21 @@
# Copyright (c) 2022 Snap Inc. All rights reserved.
import itertools
import os
from distutils.version import LooseVersion

import timm
import torch
import torch.nn as nn
from timm.models.layers import DropPath, trunc_normal_
from timm.models.layers.helpers import to_2tuple

from ..modelzoo import efficientformer as model_urls
from ..registry import BACKBONES

if LooseVersion(timm.__version__) <= LooseVersion('0.8.2'):
from timm.models.layers.helpers import to_2tuple
else:
from timm.layers.helpers import to_2tuple


class Attention(torch.nn.Module):

Expand Down
Loading