JackIsNotInTheBox commited on
Commit
bb74c00
·
1 Parent(s): 89b97ab

Patch mmcv imports for v2.x / mmengine compatibility

Browse files
Files changed (1) hide show
  1. cavp/model/cavp_modules.py +12 -4
cavp/model/cavp_modules.py CHANGED
@@ -3,16 +3,20 @@ import warnings
3
  import torch
4
  import torch.nn as nn
5
  from mmcv.cnn import ConvModule, kaiming_init
6
- from mmcv.runner import _load_checkpoint, load_checkpoint
7
- from mmcv.utils import print_log
 
 
 
 
8
 
9
  import warnings
10
  import torch.nn as nn
11
  import torch.utils.checkpoint as cp
12
  from mmcv.cnn import (ConvModule, NonLocal3d, build_activation_layer,
13
  constant_init, kaiming_init)
14
- from mmcv.runner import _load_checkpoint, load_checkpoint
15
- from mmcv.utils import _BatchNorm
16
  from torch.nn.modules.utils import _ntuple, _triple
17
 
18
  from itertools import repeat
@@ -23,6 +27,10 @@ from torch.utils.checkpoint import checkpoint
23
  from torch.nn import functional as F
24
  from collections import OrderedDict
25
 
 
 
 
 
26
  class BasicBlock3d(nn.Module):
27
  """BasicBlock 3d block for ResNet3D.
28
  Args:
 
3
  import torch
4
  import torch.nn as nn
5
  from mmcv.cnn import ConvModule, kaiming_init
6
+ from mmengine.runner import load_checkpoint
7
+ try:
8
+ from mmengine.runner.checkpoint import _load_checkpoint
9
+ except ImportError:
10
+ _load_checkpoint = load_checkpoint
11
+ from mmengine.logging import print_log
12
 
13
  import warnings
14
  import torch.nn as nn
15
  import torch.utils.checkpoint as cp
16
  from mmcv.cnn import (ConvModule, NonLocal3d, build_activation_layer,
17
  constant_init, kaiming_init)
18
+ from mmengine.runner import load_checkpoint
19
+ from torch.nn.modules.batchnorm import _BatchNorm
20
  from torch.nn.modules.utils import _ntuple, _triple
21
 
22
  from itertools import repeat
 
27
  from torch.nn import functional as F
28
  from collections import OrderedDict
29
 
30
+ import logging
31
+ def get_root_logger(log_level=logging.DEBUG):
32
+ return logging.getLogger('mmengine')
33
+
34
  class BasicBlock3d(nn.Module):
35
  """BasicBlock 3d block for ResNet3D.
36
  Args: