mirrors
/
PaddleClas
mirror of https://github.com/PaddlePaddle/PaddleClas.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix acnet

pull/82/head
littletomatodonkey 2020-04-26 14:59:14 +00:00
parent ed3ce87dc1
commit 9955d74f29
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configs/ResNet_ACNet/ResNet_ACNet.yaml
View File

@ -1,6 +1,6 @@
mode: 'train'
ARCHITECTURE:
name: "ResNet_ACNet"
name: "ResNet50_ACNet"
pretrained_model: ""
model_save_dir: "./output/"

30
ppcls/modeling/architectures/resnet_acnet.py
View File

@ -1,16 +1,16 @@
#copyright (c) 2020 PaddlePaddle Authors. All Rights Reserve.
# copyright (c) 2020 PaddlePaddle Authors. All Rights Reserve.
#
#Licensed under the Apache License, Version 2.0 (the "License");
#you may not use this file except in compliance with the License.
#You may obtain a copy of the License at
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
#Unless required by applicable law or agreed to in writing, software
#distributed under the License is distributed on an "AS IS" BASIS,
#WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
#See the License for the specific language governing permissions and
#limitations under the License.
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
from __future__ import absolute_import
from __future__ import division
@ -18,13 +18,12 @@ from __future__ import print_function
import math
import paddle
import paddle.fluid as fluid
from paddle.fluid.param_attr import ParamAttr
__all__ = [
"ResNet_ACNet", "ResNet18_ACNet", "ResNet34_ACNet", "ResNet50_ACNet",
"ResNet101_ACNet", "ResNet152_ACNet"
"ResNet18_ACNet", "ResNet34_ACNet", "ResNet50_ACNet", "ResNet101_ACNet",
"ResNet152_ACNet"
]
@ -41,7 +40,8 @@ class ResNetACNet(object):
layers = self.layers
supported_layers = [18, 34, 50, 101, 152]
assert layers in supported_layers, \
"supported layers are {} but input layer is {}".format(supported_layers, layers)
"supported layers are {} but input layer is {}".format(
supported_layers, layers)
if layers == 18:
depth = [2, 2, 2, 2]
@ -240,7 +240,7 @@ class ResNetACNet(object):
def shortcut(self, input, ch_out, stride, is_first, name):
""" shortcut """
ch_in = input.shape[1]
if ch_in != ch_out or stride != 1 or is_first == True:
if ch_in != ch_out or stride != 1 or is_first is True:
return self.conv_bn_layer(
input=input,
num_filters=ch_out,
@ -304,7 +304,7 @@ class ResNetACNet(object):
def ResNet18_ACNet(deploy=False):
"""ResNet18 + ACNet"""
model = ResNet_ACNet(layers=18, deploy=deploy)
model = ResNetACNet(layers=18, deploy=deploy)
return model