Commit24f1c45

authored

Merge pull request#9 from luzai/master

fix depth of resnet/preresnet on cifar10/cifar100

2 parents6e1d46e +803ce40 commit24f1c45Copy full SHA for 24f1c45

File tree

+25

-10

lines changed

+25

-10

lines changed

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,8 @@`
`64`	`64`	`' \| '.join(model_names)+`
`65`	`65`	`' (default: resnet18)')`
`66`	`66`	`parser.add_argument('--depth',type=int,default=29,help='Model depth.')`
	`67`	`+parser.add_argument('--block-name',type=str,default='BasicBlock',`
	`68`	`+help='the building block for Resnet and Preresnet: BasicBlock, Bottleneck (default: Basicblock for cifar10/cifar100)')`
`67`	`69`	`parser.add_argument('--cardinality',type=int,default=8,help='Model cardinality (group).')`
`68`	`70`	`parser.add_argument('--widen-factor',type=int,default=4,help='Widen factor. 4 -> 64, 8 -> 128, ...')`
`69`	`71`	`parser.add_argument('--growthRate',type=int,default=12,help='Growth rate for DenseNet.')`
`@@ -161,14 +163,14 @@ def main():`
`161`	`163`	`model=models.__dict__[args.arch](`
`162`	`164`	`num_classes=num_classes,`
`163`	`165`	`depth=args.depth,`
	`166`	`+block_name=args.block_name,`
`164`	`167`	`)`
`165`	`168`	`else:`
`166`	`169`	`model=models.__dict__[args.arch](num_classes=num_classes)`
`167`	`170`
`168`	`171`	`model=torch.nn.DataParallel(model).cuda()`
`169`	`172`	`cudnn.benchmark=True`
`170`	`173`	`print(' Total params: %.2fM'% (sum(p.numel()forpinmodel.parameters())/1000000.0))`
`171`		`-`
`172`	`174`	`criterion=nn.CrossEntropyLoss()`
`173`	`175`	`optimizer=optim.SGD(model.parameters(),lr=args.lr,momentum=args.momentum,weight_decay=args.weight_decay)`
`174`	`176`

Lines changed: 11 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -92,13 +92,19 @@ def forward(self, x):`
`92`	`92`
`93`	`93`	`classPreResNet(nn.Module):`
`94`	`94`
`95`		`-def__init__(self,depth,num_classes=1000):`
	`95`	`+def__init__(self,depth,num_classes=1000,block_name='BasicBlock'):`
`96`	`96`	`super(PreResNet,self).__init__()`
`97`	`97`	`# Model type specifies number of layers for CIFAR-10 model`
`98`		`-assert (depth-2)%6==0,'depth should be 6n+2'`
`99`		`-n= (depth-2)//6`
`100`		`-`
`101`		`-block=Bottleneckifdepth>=44elseBasicBlock`
	`98`	`+ifblock_name.lower()=='basicblock':`
	`99`	`+assert (depth-2)%6==0,'When use basicblock, depth should be 6n+2, e.g. 20, 32, 44, 56, 110, 1202'`
	`100`	`+n= (depth-2)//6`
	`101`	`+block=BasicBlock`
	`102`	`+elifblock_name.lower()=='bottleneck':`
	`103`	`+assert (depth-2)%9==0,'When use bottleneck, depth should be 9n+2, e.g. 20, 29, 47, 56, 110, 1199'`
	`104`	`+n= (depth-2)//9`
	`105`	`+block=Bottleneck`
	`106`	`+else:`
	`107`	`+raiseValueError('block_name shoule be Basicblock or Bottleneck')`
`102`	`108`
`103`	`109`	`self.inplanes=16`
`104`	`110`	`self.conv1=nn.Conv2d(3,16,kernel_size=3,padding=1,`

Lines changed: 11 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -92,13 +92,20 @@ def forward(self, x):`
`92`	`92`
`93`	`93`	`classResNet(nn.Module):`
`94`	`94`
`95`		`-def__init__(self,depth,num_classes=1000):`
	`95`	`+def__init__(self,depth,num_classes=1000,block_name='BasicBlock'):`
`96`	`96`	`super(ResNet,self).__init__()`
`97`	`97`	`# Model type specifies number of layers for CIFAR-10 model`
`98`		`-assert (depth-2)%6==0,'depth should be 6n+2'`
`99`		`-n= (depth-2)//6`
	`98`	`+ifblock_name.lower()=='basicblock':`
	`99`	`+assert (depth-2)%6==0,'When use basicblock, depth should be 6n+2, e.g. 20, 32, 44, 56, 110, 1202'`
	`100`	`+n= (depth-2)//6`
	`101`	`+block=BasicBlock`
	`102`	`+elifblock_name.lower()=='bottleneck':`
	`103`	`+assert (depth-2)%9==0,'When use bottleneck, depth should be 9n+2, e.g. 20, 29, 47, 56, 110, 1199'`
	`104`	`+n= (depth-2)//9`
	`105`	`+block=Bottleneck`
	`106`	`+else:`
	`107`	`+raiseValueError('block_name shoule be Basicblock or Bottleneck')`
`100`	`108`
`101`		`-block=Bottleneckifdepth>=44elseBasicBlock`
`102`	`109`
`103`	`110`	`self.inplanes=16`
`104`	`111`	`self.conv1=nn.Conv2d(3,16,kernel_size=3,padding=1,`

Comments

(0)