Browse Source

!9091 fix shufflenet scripts

From: @pandoublefeng
Reviewed-by: 
Signed-off-by:
tags/v1.1.0
mindspore-ci-bot Gitee 5 years ago
parent
commit
f108c49b5a
7 changed files with 18 additions and 28 deletions
  1. +2
    -4
      model_zoo/official/cv/efficientnet/eval.py
  2. +4
    -5
      model_zoo/official/cv/efficientnet/train.py
  3. +2
    -4
      model_zoo/official/cv/nasnet/eval.py
  4. +4
    -4
      model_zoo/official/cv/nasnet/train.py
  5. +2
    -4
      model_zoo/official/cv/shufflenetv2/eval.py
  6. +0
    -3
      model_zoo/official/cv/shufflenetv2/src/config.py
  7. +4
    -4
      model_zoo/official/cv/shufflenetv2/train.py

+ 2
- 4
model_zoo/official/cv/efficientnet/eval.py View File

@@ -14,7 +14,6 @@
# ============================================================================
"""evaluate imagenet"""
import argparse
import os

import mindspore.nn as nn
from mindspore import context
@@ -33,9 +32,8 @@ if __name__ == '__main__':
parser.add_argument('--platform', type=str, default='GPU', choices=('Ascend', 'GPU'), help='run platform')
args_opt = parser.parse_args()

if args_opt.platform == 'Ascend':
device_id = int(os.getenv('DEVICE_ID'))
context.set_context(device_id=device_id)
if args_opt.platform != 'GPU':
raise ValueError("Only supported GPU training.")

context.set_context(mode=context.GRAPH_MODE, device_target=args_opt.platform)



+ 4
- 5
model_zoo/official/cv/efficientnet/train.py View File

@@ -92,7 +92,7 @@ parser.add_argument('--resume', default='', type=str, metavar='PATH',

def main():
args, _ = parser.parse_known_args()
devid, rank_id, rank_size = 0, 0, 1
rank_id, rank_size = 0, 1

context.set_context(mode=context.GRAPH_MODE)

@@ -101,10 +101,7 @@ def main():
init("nccl")
context.set_context(device_target='GPU')
else:
init()
devid = int(os.getenv('DEVICE_ID'))
context.set_context(
device_target='Ascend', device_id=devid, reserve_class_name_in_scope=False)
raise ValueError("Only supported GPU training.")
context.reset_auto_parallel_context()
rank_id = get_rank()
rank_size = get_group_size()
@@ -113,6 +110,8 @@ def main():
else:
if args.GPU:
context.set_context(device_target='GPU')
else:
raise ValueError("Only supported GPU training.")

net = efficientnet_b0(num_classes=cfg.num_classes,
drop_rate=cfg.drop,


+ 2
- 4
model_zoo/official/cv/nasnet/eval.py View File

@@ -14,7 +14,6 @@
# ============================================================================
"""evaluate imagenet"""
import argparse
import os

import mindspore.nn as nn
from mindspore import context
@@ -34,9 +33,8 @@ if __name__ == '__main__':
parser.add_argument('--platform', type=str, default='GPU', choices=('Ascend', 'GPU'), help='run platform')
args_opt = parser.parse_args()

if args_opt.platform == 'Ascend':
device_id = int(os.getenv('DEVICE_ID'))
context.set_context(device_id=device_id)
if args_opt.platform != 'GPU':
raise ValueError("Only supported GPU training.")

context.set_context(mode=context.GRAPH_MODE, device_target=args_opt.platform)
net = NASNetAMobile(num_classes=cfg.num_classes, is_training=False)


+ 4
- 4
model_zoo/official/cv/nasnet/train.py View File

@@ -45,16 +45,16 @@ if __name__ == '__main__':
parser.add_argument('--platform', type=str, default='GPU', choices=('Ascend', 'GPU'), help='run platform')
args_opt = parser.parse_args()

if args_opt.platform != "GPU":
raise ValueError("Only supported GPU training.")

context.set_context(mode=context.GRAPH_MODE, device_target=args_opt.platform, save_graphs=False)
if os.getenv('DEVICE_ID', "not_set").isdigit():
context.set_context(device_id=int(os.getenv('DEVICE_ID')))

# init distributed
if args_opt.is_distributed:
if args_opt.platform == "Ascend":
init()
else:
init("nccl")
init("nccl")
cfg.rank = get_rank()
cfg.group_size = get_group_size()
parallel_mode = ParallelMode.DATA_PARALLEL


+ 2
- 4
model_zoo/official/cv/shufflenetv2/eval.py View File

@@ -14,7 +14,6 @@
# ============================================================================
"""evaluate_imagenet"""
import argparse
import os

import mindspore.nn as nn
from mindspore import context
@@ -33,9 +32,8 @@ if __name__ == '__main__':
parser.add_argument('--platform', type=str, default='GPU', choices=('Ascend', 'GPU'), help='run platform')
args_opt = parser.parse_args()

if args_opt.platform == 'Ascend':
device_id = int(os.getenv('DEVICE_ID'))
context.set_context(device_id=device_id)
if args_opt.platform != 'GPU':
raise ValueError("Only supported GPU training.")

context.set_context(mode=context.GRAPH_MODE, device_target=args_opt.platform, device_id=0)
net = ShuffleNetV2(n_class=cfg.num_classes)


+ 0
- 3
model_zoo/official/cv/shufflenetv2/src/config.py View File

@@ -34,7 +34,6 @@ config_gpu = edict({

### Loss Config
'label_smooth_factor': 0.1,
'aux_factor': 0.4,

### Learning Rate Config
'lr_init': 0.5,
@@ -42,8 +41,6 @@ config_gpu = edict({
### Optimization Config
'weight_decay': 0.00004,
'momentum': 0.9,
'opt_eps': 1.0,
'rmsprop_decay': 0.9,
"loss_scale": 1,

})

+ 4
- 4
model_zoo/official/cv/shufflenetv2/train.py View File

@@ -47,16 +47,16 @@ if __name__ == '__main__':
parser.add_argument('--model_size', type=str, default='1.0x', help='ShuffleNetV2 model size parameter')
args_opt = parser.parse_args()

if args_opt.platform != "GPU":
raise ValueError("Only supported GPU training.")

context.set_context(mode=context.GRAPH_MODE, device_target=args_opt.platform, save_graphs=False)
if os.getenv('DEVICE_ID', "not_set").isdigit():
context.set_context(device_id=int(os.getenv('DEVICE_ID')))

# init distributed
if args_opt.is_distributed:
if args_opt.platform == "Ascend":
init()
else:
init("nccl")
init("nccl")
cfg.rank = get_rank()
cfg.group_size = get_group_size()
parallel_mode = ParallelMode.DATA_PARALLEL


Loading…
Cancel
Save