rename and update

DefangChen · Oct 23, 2019 · b13aecc · b13aecc
1 parent 559adc7
commit b13aecc
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 11 deletions.
diff --git a/models/__init__.py b/models/__init__.py
@@ -2,7 +2,7 @@
 from .resnetv2 import ResNet50
 from .wrn import wrn_16_1, wrn_16_2, wrn_40_1, wrn_40_2
 from .vgg import vgg19_bn, vgg16_bn, vgg13_bn, vgg11_bn, vgg8_bn
-from .mobilenetv2 import mobile_half, mobile_full
+from .mobilenetv2 import mobile_half
 from .ShuffleNetv1 import ShuffleV1
 from .ShuffleNetv2 import ShuffleV2
 
@@ -26,8 +26,7 @@
  'vgg13': vgg13_bn,
  'vgg16': vgg16_bn,
  'vgg19': vgg19_bn,
- 'mobile_half': mobile_half,
- 'mobile_full': mobile_full,
+ 'MobileNetV2': mobile_half,
  'ShuffleV1': ShuffleV1,
  'ShuffleV2': ShuffleV2,
 }
diff --git a/models/mobilenetv2.py b/models/mobilenetv2.py
@@ -7,7 +7,7 @@
 import torch.nn as nn
 import math
 
-__all__ = ['mobilenetv2_T_w', 'mobile_half', 'mobile_full']
+__all__ = ['mobilenetv2_T_w', 'mobile_half']
 
 BN = None
 
@@ -184,10 +184,6 @@ def mobile_half(num_classes):
  return mobilenetv2_T_w(6, 0.5, num_classes)
 
 
-def mobile_full(num_classes):
- return mobilenetv2_T_w(6, 1., num_classes)
-
-
 if __name__ == '__main__':
  x = torch.randn(2, 3, 32, 32)
 

diff --git a/train_student.py b/train_student.py
@@ -61,7 +61,7 @@ def parse_option():
  choices=['resnet8', 'resnet14', 'resnet20', 'resnet32', 'resnet44', 'resnet56', 'resnet110',
  'resnet8x4', 'resnet32x4', 'wrn_16_1', 'wrn_16_2', 'wrn_40_1', 'wrn_40_2',
  'vgg8', 'vgg11', 'vgg13', 'vgg16', 'vgg19', 'ResNet50',
- 'mobile_half', 'mobile_full', 'ShuffleV1', 'ShuffleV2'])
+ 'MobileNetV2', 'ShuffleV1', 'ShuffleV2'])
  parser.add_argument('--path_t', type=str, default=None, help='teacher model snapshot')
 
  # distillation
@@ -90,7 +90,7 @@ def parse_option():
  opt = parser.parse_args()
 
  # set different learning rate from these 4 models
- if opt.model_s in ['mobile_half', 'mobile_full', 'ShuffleV1', 'ShuffleV2']:
+ if opt.model_s in ['MobileNetV2', 'ShuffleV1', 'ShuffleV2']:
  opt.learning_rate = 0.01
 
  # set the path according to the environment

diff --git a/train_teacher.py b/train_teacher.py
@@ -44,7 +44,7 @@ def parse_option():
  choices=['resnet8', 'resnet14', 'resnet20', 'resnet32', 'resnet44', 'resnet56', 'resnet110',
  'resnet8x4', 'resnet32x4', 'wrn_16_1', 'wrn_16_2', 'wrn_40_1', 'wrn_40_2',
  'vgg8', 'vgg11', 'vgg13', 'vgg16', 'vgg19',
- 'mobile_half', 'mobile_full', 'ShuffleV1', 'ShuffleV2', ])
+ 'MobileNetV2', 'ShuffleV1', 'ShuffleV2', ])
  parser.add_argument('--dataset', type=str, default='cifar100', choices=['cifar100'], help='dataset')
 
  parser.add_argument('-t', '--trial', type=int, default=0, help='the experiment id')