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.

Sign up for GitHub

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

Fixed issue with reneamed dependency function (timm) #142

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fixed issue with reneamed dependency function (timm) #142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 12 additions & 12 deletions fastervit/models/faster_vit.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import torch.nn as nn
from timm.models.registry import register_model
from timm.models.layers import trunc_normal_, DropPath, LayerNorm2d
from timm.models._builder import resolve_pretrained_cfg, _update_default_kwargs
from timm.models._builder import resolve_pretrained_cfg, _update_default_model_kwargs
from .registry import register_pip_model
from pathlib import Path
import numpy as np
Expand Down Expand Up @@ -987,7 +987,7 @@ def faster_vit_0_224(pretrained=False, **kwargs):
model_path = kwargs.pop("model_path", "/tmp/faster_vit_0.pth.tar")
hat = kwargs.pop("hat", [False, False, True, False])
pretrained_cfg = resolve_pretrained_cfg('faster_vit_0_224').to_dict()
_update_default_kwargs(pretrained_cfg, kwargs, kwargs_filter=None)
_update_default_model_kwargs(pretrained_cfg, kwargs, kwargs_filter=None)
model = FasterViT(depths=depths,
num_heads=num_heads,
window_size=window_size,
Expand Down Expand Up @@ -1024,7 +1024,7 @@ def faster_vit_1_224(pretrained=False, **kwargs):
model_path = kwargs.pop("model_path", "/tmp/faster_vit_1.pth.tar")
hat = kwargs.pop("hat", [False, False, True, False])
pretrained_cfg = resolve_pretrained_cfg('faster_vit_1_224').to_dict()
_update_default_kwargs(pretrained_cfg, kwargs, kwargs_filter=None)
_update_default_model_kwargs(pretrained_cfg, kwargs, kwargs_filter=None)
model = FasterViT(depths=depths,
num_heads=num_heads,
window_size=window_size,
Expand Down Expand Up @@ -1061,7 +1061,7 @@ def faster_vit_2_224(pretrained=False, **kwargs):
model_path = kwargs.pop("model_path", "/tmp/faster_vit_2.pth.tar")
hat = kwargs.pop("hat", [False, False, True, False])
pretrained_cfg = resolve_pretrained_cfg('faster_vit_2_224').to_dict()
_update_default_kwargs(pretrained_cfg, kwargs, kwargs_filter=None)
_update_default_model_kwargs(pretrained_cfg, kwargs, kwargs_filter=None)
model = FasterViT(depths=depths,
num_heads=num_heads,
window_size=window_size,
Expand Down Expand Up @@ -1099,7 +1099,7 @@ def faster_vit_3_224(pretrained=False, **kwargs):
model_path = kwargs.pop("model_path", "/tmp/faster_vit_3.pth.tar")
hat = kwargs.pop("hat", [False, False, True, False])
pretrained_cfg = resolve_pretrained_cfg('faster_vit_3_224').to_dict()
_update_default_kwargs(pretrained_cfg, kwargs, kwargs_filter=None)
_update_default_model_kwargs(pretrained_cfg, kwargs, kwargs_filter=None)
model = FasterViT(depths=depths,
num_heads=num_heads,
window_size=window_size,
Expand Down Expand Up @@ -1140,7 +1140,7 @@ def faster_vit_4_224(pretrained=False, **kwargs):
model_path = kwargs.pop("model_path", "/tmp/faster_vit_4.pth.tar")
hat = kwargs.pop("hat", [False, False, True, False])
pretrained_cfg = resolve_pretrained_cfg('faster_vit_4_224').to_dict()
_update_default_kwargs(pretrained_cfg, kwargs, kwargs_filter=None)
_update_default_model_kwargs(pretrained_cfg, kwargs, kwargs_filter=None)
model = FasterViT(depths=depths,
num_heads=num_heads,
window_size=window_size,
Expand Down Expand Up @@ -1182,7 +1182,7 @@ def faster_vit_5_224(pretrained=False, **kwargs):
model_path = kwargs.pop("model_path", "/tmp/faster_vit_5.pth.tar")
hat = kwargs.pop("hat", [False, False, True, False])
pretrained_cfg = resolve_pretrained_cfg('faster_vit_5_224').to_dict()
_update_default_kwargs(pretrained_cfg, kwargs, kwargs_filter=None)
_update_default_model_kwargs(pretrained_cfg, kwargs, kwargs_filter=None)
model = FasterViT(depths=depths,
num_heads=num_heads,
window_size=window_size,
Expand Down Expand Up @@ -1224,7 +1224,7 @@ def faster_vit_6_224(pretrained=False, **kwargs):
model_path = kwargs.pop("model_path", "/tmp/faster_vit_6.pth.tar")
hat = kwargs.pop("hat", [False, False, True, False])
pretrained_cfg = resolve_pretrained_cfg('faster_vit_6_224').to_dict()
_update_default_kwargs(pretrained_cfg, kwargs, kwargs_filter=None)
_update_default_model_kwargs(pretrained_cfg, kwargs, kwargs_filter=None)
model = FasterViT(depths=depths,
num_heads=num_heads,
window_size=window_size,
Expand Down Expand Up @@ -1266,7 +1266,7 @@ def faster_vit_4_21k_224(pretrained=False, **kwargs):
model_path = kwargs.pop("model_path", "/tmp/fastervit_4_21k_224_w14.pth.tar")
hat = kwargs.pop("hat", [False, False, False, False])
pretrained_cfg = resolve_pretrained_cfg('faster_vit_4_21k_224',).to_dict()
_update_default_kwargs(pretrained_cfg, kwargs, kwargs_filter=None)
_update_default_model_kwargs(pretrained_cfg, kwargs, kwargs_filter=None)
model = FasterViT(depths=depths,
num_heads=num_heads,
window_size=window_size,
Expand Down Expand Up @@ -1308,7 +1308,7 @@ def faster_vit_4_21k_384(pretrained=False, **kwargs):
model_path = kwargs.pop("model_path", "/tmp/fastervit_4_21k_384_w24.pth.tar")
hat = kwargs.pop("hat", [False, False, False, False])
pretrained_cfg = resolve_pretrained_cfg('faster_vit_4_21k_384').to_dict()
_update_default_kwargs(pretrained_cfg, kwargs, kwargs_filter=None)
_update_default_model_kwargs(pretrained_cfg, kwargs, kwargs_filter=None)
model = FasterViT(depths=depths,
num_heads=num_heads,
window_size=window_size,
Expand Down Expand Up @@ -1350,7 +1350,7 @@ def faster_vit_4_21k_512(pretrained=False, **kwargs):
model_path = kwargs.pop("model_path", "/tmp/fastervit_4_21k_512_w32.pth.tar")
hat = kwargs.pop("hat", [False, False, False, False])
pretrained_cfg = resolve_pretrained_cfg('faster_vit_4_21k_512').to_dict()
_update_default_kwargs(pretrained_cfg, kwargs, kwargs_filter=None)
_update_default_model_kwargs(pretrained_cfg, kwargs, kwargs_filter=None)
model = FasterViT(depths=depths,
num_heads=num_heads,
window_size=window_size,
Expand Down Expand Up @@ -1392,7 +1392,7 @@ def faster_vit_4_21k_768(pretrained=False, **kwargs):
model_path = kwargs.pop("model_path", "/tmp/fastervit_4_21k_768_w48.pth.tar")
hat = kwargs.pop("hat", [False, False, False, False])
pretrained_cfg = resolve_pretrained_cfg('faster_vit_4_21k_768').to_dict()
_update_default_kwargs(pretrained_cfg, kwargs, kwargs_filter=None)
_update_default_model_kwargs(pretrained_cfg, kwargs, kwargs_filter=None)
model = FasterViT(depths=depths,
num_heads=num_heads,
window_size=window_size,
Expand Down
24 changes: 12 additions & 12 deletions fastervit/models/faster_vit_any_res.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import torch.nn as nn
from timm.models.registry import register_model
from timm.models.layers import trunc_normal_, DropPath, LayerNorm2d
from timm.models._builder import resolve_pretrained_cfg, _update_default_kwargs
from timm.models._builder import resolve_pretrained_cfg, _update_default_model_kwargs
from .registry import register_pip_model
from pathlib import Path
import numpy as np
Expand Down Expand Up @@ -1017,7 +1017,7 @@ def faster_vit_0_any_res(pretrained=False, **kwargs):
model_path = kwargs.pop("model_path", "/tmp/faster_vit_0.pth.tar")
hat = kwargs.pop("hat", [False, False, True, False])
pretrained_cfg = resolve_pretrained_cfg('faster_vit_0_any_res').to_dict()
_update_default_kwargs(pretrained_cfg, kwargs, kwargs_filter=None)
_update_default_model_kwargs(pretrained_cfg, kwargs, kwargs_filter=None)
model = FasterViT(depths=depths,
num_heads=num_heads,
window_size=window_size,
Expand Down Expand Up @@ -1054,7 +1054,7 @@ def faster_vit_1_any_res(pretrained=False, **kwargs):
model_path = kwargs.pop("model_path", "/tmp/faster_vit_1.pth.tar")
hat = kwargs.pop("hat", [False, False, True, False])
pretrained_cfg = resolve_pretrained_cfg('faster_vit_1_any_res').to_dict()
_update_default_kwargs(pretrained_cfg, kwargs, kwargs_filter=None)
_update_default_model_kwargs(pretrained_cfg, kwargs, kwargs_filter=None)
model = FasterViT(depths=depths,
num_heads=num_heads,
window_size=window_size,
Expand Down Expand Up @@ -1091,7 +1091,7 @@ def faster_vit_2_any_res(pretrained=False, **kwargs):
model_path = kwargs.pop("model_path", "/tmp/faster_vit_2.pth.tar")
hat = kwargs.pop("hat", [False, False, True, False])
pretrained_cfg = resolve_pretrained_cfg('faster_vit_2_any_res').to_dict()
_update_default_kwargs(pretrained_cfg, kwargs, kwargs_filter=None)
_update_default_model_kwargs(pretrained_cfg, kwargs, kwargs_filter=None)
model = FasterViT(depths=depths,
num_heads=num_heads,
window_size=window_size,
Expand Down Expand Up @@ -1129,7 +1129,7 @@ def faster_vit_3_any_res(pretrained=False, **kwargs):
model_path = kwargs.pop("model_path", "/tmp/faster_vit_3.pth.tar")
hat = kwargs.pop("hat", [False, False, True, False])
pretrained_cfg = resolve_pretrained_cfg('faster_vit_3_any_res').to_dict()
_update_default_kwargs(pretrained_cfg, kwargs, kwargs_filter=None)
_update_default_model_kwargs(pretrained_cfg, kwargs, kwargs_filter=None)
model = FasterViT(depths=depths,
num_heads=num_heads,
window_size=window_size,
Expand Down Expand Up @@ -1170,7 +1170,7 @@ def faster_vit_4_any_res(pretrained=False, **kwargs):
model_path = kwargs.pop("model_path", "/tmp/faster_vit_4.pth.tar")
hat = kwargs.pop("hat", [False, False, True, False])
pretrained_cfg = resolve_pretrained_cfg('faster_vit_4_any_res').to_dict()
_update_default_kwargs(pretrained_cfg, kwargs, kwargs_filter=None)
_update_default_model_kwargs(pretrained_cfg, kwargs, kwargs_filter=None)
model = FasterViT(depths=depths,
num_heads=num_heads,
window_size=window_size,
Expand Down Expand Up @@ -1212,7 +1212,7 @@ def faster_vit_5_any_res(pretrained=False, **kwargs):
model_path = kwargs.pop("model_path", "/tmp/faster_vit_5.pth.tar")
hat = kwargs.pop("hat", [False, False, True, False])
pretrained_cfg = resolve_pretrained_cfg('faster_vit_5_any_res').to_dict()
_update_default_kwargs(pretrained_cfg, kwargs, kwargs_filter=None)
_update_default_model_kwargs(pretrained_cfg, kwargs, kwargs_filter=None)
model = FasterViT(depths=depths,
num_heads=num_heads,
window_size=window_size,
Expand Down Expand Up @@ -1254,7 +1254,7 @@ def faster_vit_6_any_res(pretrained=False, **kwargs):
model_path = kwargs.pop("model_path", "/tmp/faster_vit_6.pth.tar")
hat = kwargs.pop("hat", [False, False, True, False])
pretrained_cfg = resolve_pretrained_cfg('faster_vit_6_any_res').to_dict()
_update_default_kwargs(pretrained_cfg, kwargs, kwargs_filter=None)
_update_default_model_kwargs(pretrained_cfg, kwargs, kwargs_filter=None)
model = FasterViT(depths=depths,
num_heads=num_heads,
window_size=window_size,
Expand Down Expand Up @@ -1296,7 +1296,7 @@ def faster_vit_4_21k_224_any_res(pretrained=False, **kwargs):
model_path = kwargs.pop("model_path", "/tmp/fastervit_4_21k_224_w14.pth.tar")
hat = kwargs.pop("hat", [False, False, False, False])
pretrained_cfg = resolve_pretrained_cfg('faster_vit_4_21k_224_any_res').to_dict()
_update_default_kwargs(pretrained_cfg, kwargs, kwargs_filter=None)
_update_default_model_kwargs(pretrained_cfg, kwargs, kwargs_filter=None)
model = FasterViT(depths=depths,
num_heads=num_heads,
window_size=window_size,
Expand Down Expand Up @@ -1338,7 +1338,7 @@ def faster_vit_4_21k_384_any_res(pretrained=False, **kwargs):
model_path = kwargs.pop("model_path", "/tmp/fastervit_4_21k_384_w24.pth.tar")
hat = kwargs.pop("hat", [False, False, False, False])
pretrained_cfg = resolve_pretrained_cfg('faster_vit_4_21k_384_any_res').to_dict()
_update_default_kwargs(pretrained_cfg, kwargs, kwargs_filter=None)
_update_default_model_kwargs(pretrained_cfg, kwargs, kwargs_filter=None)
model = FasterViT(depths=depths,
num_heads=num_heads,
window_size=window_size,
Expand Down Expand Up @@ -1380,7 +1380,7 @@ def faster_vit_4_21k_512_any_res(pretrained=False, **kwargs):
model_path = kwargs.pop("model_path", "/tmp/fastervit_4_21k_512_w32.pth.tar")
hat = kwargs.pop("hat", [False, False, False, False])
pretrained_cfg = resolve_pretrained_cfg('faster_vit_4_21k_512_any_res').to_dict()
_update_default_kwargs(pretrained_cfg, kwargs, kwargs_filter=None)
_update_default_model_kwargs(pretrained_cfg, kwargs, kwargs_filter=None)
model = FasterViT(depths=depths,
num_heads=num_heads,
window_size=window_size,
Expand Down Expand Up @@ -1422,7 +1422,7 @@ def faster_vit_4_21k_768_any_res(pretrained=False, **kwargs):
model_path = kwargs.pop("model_path", "/tmp/fastervit_4_21k_768_w48.pth.tar")
hat = kwargs.pop("hat", [False, False, False, False])
pretrained_cfg = resolve_pretrained_cfg('faster_vit_4_21k_768_any_res').to_dict()
_update_default_kwargs(pretrained_cfg, kwargs, kwargs_filter=None)
_update_default_model_kwargs(pretrained_cfg, kwargs, kwargs_filter=None)
model = FasterViT(depths=depths,
num_heads=num_heads,
window_size=window_size,
Expand Down