Merge pull request #17 from AdaptiveMotorControlLab/jaap/address_timm_deprecation_warnings

Address timm deprecation warnings

Author: deruyter92

animals/models/model_animals.py

@@ -13,7 +13,7 @@
 import torch
 import torch.nn as nn
 from einops import rearrange
-from timm.models.layers import DropPath
+from timm.layers import DropPath
 
 from fmpose3d.animals.models.graph_frames import Graph
 

fmpose3d/animals/models/model_animal3d.py

@@ -13,7 +13,7 @@
 import torch
 import torch.nn as nn
 from einops import rearrange
-from timm.models.layers import DropPath
+from timm.layers import DropPath
 
 from fmpose3d.animals.models.graph_frames import Graph
 from fmpose3d.models.base_model import BaseModel, register_model

fmpose3d/lib/hrnet/lib/models/pose_hrnet.py

@@ -493,7 +493,7 @@ def init_weights(self, pretrained=''):
             need_init_state_dict = {}
             for name, m in pretrained_state_dict.items():
                 if name.split('.')[0] in self.pretrained_layers \
-                   or self.pretrained_layers[0] is '*':
+                   or self.pretrained_layers[0] == '*':
                     need_init_state_dict[name] = m
             self.load_state_dict(need_init_state_dict, strict=False)
         elif pretrained:

fmpose3d/models/fmpose3d/model_GAMLP.py

@@ -15,7 +15,7 @@
 from fmpose3d.models.base_model import BaseModel, register_model
 from functools import partial
 from einops import rearrange
-from timm.models.layers import DropPath
+from timm.layers import DropPath
 
 class TimeEmbedding(nn.Module):
     def __init__(self, dim: int, hidden_dim: int = 64):