Browse Source

!3218 Move mass and fasterrcnn to new model zoo directory.

Merge pull request !3218 from linqingke/mass
tags/v0.6.0-beta
mindspore-ci-bot Gitee 5 years ago
parent
commit
ca6da6751f
80 changed files with 10 additions and 10 deletions
  1. +1
    -1
      model_zoo/official/cv/faster_rcnn/README.md
  2. +0
    -0
      model_zoo/official/cv/faster_rcnn/eval.py
  3. +0
    -0
      model_zoo/official/cv/faster_rcnn/scripts/run_distribute_train.sh
  4. +0
    -0
      model_zoo/official/cv/faster_rcnn/scripts/run_eval.sh
  5. +0
    -0
      model_zoo/official/cv/faster_rcnn/scripts/run_standalone_train.sh
  6. +0
    -0
      model_zoo/official/cv/faster_rcnn/src/FasterRcnn/__init__.py
  7. +0
    -0
      model_zoo/official/cv/faster_rcnn/src/FasterRcnn/anchor_generator.py
  8. +0
    -0
      model_zoo/official/cv/faster_rcnn/src/FasterRcnn/bbox_assign_sample.py
  9. +0
    -0
      model_zoo/official/cv/faster_rcnn/src/FasterRcnn/bbox_assign_sample_stage2.py
  10. +0
    -0
      model_zoo/official/cv/faster_rcnn/src/FasterRcnn/faster_rcnn_r50.py
  11. +0
    -0
      model_zoo/official/cv/faster_rcnn/src/FasterRcnn/fpn_neck.py
  12. +0
    -0
      model_zoo/official/cv/faster_rcnn/src/FasterRcnn/proposal_generator.py
  13. +0
    -0
      model_zoo/official/cv/faster_rcnn/src/FasterRcnn/rcnn.py
  14. +0
    -0
      model_zoo/official/cv/faster_rcnn/src/FasterRcnn/resnet50.py
  15. +0
    -0
      model_zoo/official/cv/faster_rcnn/src/FasterRcnn/roi_align.py
  16. +0
    -0
      model_zoo/official/cv/faster_rcnn/src/FasterRcnn/rpn.py
  17. +0
    -0
      model_zoo/official/cv/faster_rcnn/src/config.py
  18. +0
    -0
      model_zoo/official/cv/faster_rcnn/src/dataset.py
  19. +0
    -0
      model_zoo/official/cv/faster_rcnn/src/lr_schedule.py
  20. +0
    -0
      model_zoo/official/cv/faster_rcnn/src/network_define.py
  21. +0
    -0
      model_zoo/official/cv/faster_rcnn/src/util.py
  22. +0
    -0
      model_zoo/official/cv/faster_rcnn/train.py
  23. +2
    -2
      model_zoo/official/nlp/mass/README.md
  24. +0
    -0
      model_zoo/official/nlp/mass/__init__.py
  25. +0
    -0
      model_zoo/official/nlp/mass/apply_bpe_encoding.py
  26. +0
    -0
      model_zoo/official/nlp/mass/config/__init__.py
  27. +0
    -0
      model_zoo/official/nlp/mass/config/config.json
  28. +0
    -0
      model_zoo/official/nlp/mass/config/config.py
  29. +0
    -0
      model_zoo/official/nlp/mass/cornell_dialog.py
  30. +0
    -0
      model_zoo/official/nlp/mass/eval.py
  31. +0
    -0
      model_zoo/official/nlp/mass/gigaword.py
  32. +0
    -0
      model_zoo/official/nlp/mass/news_crawl.py
  33. +0
    -0
      model_zoo/official/nlp/mass/requirements.txt
  34. +0
    -0
      model_zoo/official/nlp/mass/scripts/__init__.py
  35. +0
    -0
      model_zoo/official/nlp/mass/scripts/learn_subword.sh
  36. +7
    -7
      model_zoo/official/nlp/mass/scripts/run.sh
  37. +0
    -0
      model_zoo/official/nlp/mass/src/__init__.py
  38. +0
    -0
      model_zoo/official/nlp/mass/src/dataset/__init__.py
  39. +0
    -0
      model_zoo/official/nlp/mass/src/dataset/base.py
  40. +0
    -0
      model_zoo/official/nlp/mass/src/dataset/bi_data_loader.py
  41. +0
    -0
      model_zoo/official/nlp/mass/src/dataset/load_dataset.py
  42. +0
    -0
      model_zoo/official/nlp/mass/src/dataset/mono_data_loader.py
  43. +0
    -0
      model_zoo/official/nlp/mass/src/dataset/schema.py
  44. +0
    -0
      model_zoo/official/nlp/mass/src/language_model/__init__.py
  45. +0
    -0
      model_zoo/official/nlp/mass/src/language_model/base.py
  46. +0
    -0
      model_zoo/official/nlp/mass/src/language_model/loose_masked_language_model.py
  47. +0
    -0
      model_zoo/official/nlp/mass/src/language_model/masked_language_model.py
  48. +0
    -0
      model_zoo/official/nlp/mass/src/language_model/mass_language_model.py
  49. +0
    -0
      model_zoo/official/nlp/mass/src/language_model/noise_channel_language_model.py
  50. +0
    -0
      model_zoo/official/nlp/mass/src/transformer/__init__.py
  51. +0
    -0
      model_zoo/official/nlp/mass/src/transformer/beam_search.py
  52. +0
    -0
      model_zoo/official/nlp/mass/src/transformer/components.py
  53. +0
    -0
      model_zoo/official/nlp/mass/src/transformer/create_attn_mask.py
  54. +0
    -0
      model_zoo/official/nlp/mass/src/transformer/decoder.py
  55. +0
    -0
      model_zoo/official/nlp/mass/src/transformer/embedding.py
  56. +0
    -0
      model_zoo/official/nlp/mass/src/transformer/encoder.py
  57. +0
    -0
      model_zoo/official/nlp/mass/src/transformer/feed_forward_network.py
  58. +0
    -0
      model_zoo/official/nlp/mass/src/transformer/grad_clip.py
  59. +0
    -0
      model_zoo/official/nlp/mass/src/transformer/infer_mass.py
  60. +0
    -0
      model_zoo/official/nlp/mass/src/transformer/multi_head_attention.py
  61. +0
    -0
      model_zoo/official/nlp/mass/src/transformer/positional_embedding.py
  62. +0
    -0
      model_zoo/official/nlp/mass/src/transformer/residual_conn.py
  63. +0
    -0
      model_zoo/official/nlp/mass/src/transformer/self_attention.py
  64. +0
    -0
      model_zoo/official/nlp/mass/src/transformer/transformer.py
  65. +0
    -0
      model_zoo/official/nlp/mass/src/transformer/transformer_for_infer.py
  66. +0
    -0
      model_zoo/official/nlp/mass/src/transformer/transformer_for_train.py
  67. +0
    -0
      model_zoo/official/nlp/mass/src/utils/__init__.py
  68. +0
    -0
      model_zoo/official/nlp/mass/src/utils/byte_pair_encoding.py
  69. +0
    -0
      model_zoo/official/nlp/mass/src/utils/dictionary.py
  70. +0
    -0
      model_zoo/official/nlp/mass/src/utils/eval_score.py
  71. +0
    -0
      model_zoo/official/nlp/mass/src/utils/initializer.py
  72. +0
    -0
      model_zoo/official/nlp/mass/src/utils/load_weights.py
  73. +0
    -0
      model_zoo/official/nlp/mass/src/utils/loss_monitor.py
  74. +0
    -0
      model_zoo/official/nlp/mass/src/utils/lr_scheduler.py
  75. +0
    -0
      model_zoo/official/nlp/mass/src/utils/ppl_score.py
  76. +0
    -0
      model_zoo/official/nlp/mass/src/utils/preprocess.py
  77. +0
    -0
      model_zoo/official/nlp/mass/src/utils/rouge_score.py
  78. +0
    -0
      model_zoo/official/nlp/mass/tokenize_corpus.py
  79. +0
    -0
      model_zoo/official/nlp/mass/train.py
  80. +0
    -0
      model_zoo/official/nlp/mass/weights_average.py

model_zoo/faster_rcnn/README.md → model_zoo/official/cv/faster_rcnn/README.md View File

@@ -139,4 +139,4 @@ Inference result will be stored in the example path, whose folder name is "infer
Average Recall (AR) @[ IoU=0.50:0.95 | area= small | maxDets=100 ] = 0.346
Average Recall (AR) @[ IoU=0.50:0.95 | area=medium | maxDets=100 ] = 0.562
Average Recall (AR) @[ IoU=0.50:0.95 | area= large | maxDets=100 ] = 0.631
```
```

model_zoo/faster_rcnn/eval.py → model_zoo/official/cv/faster_rcnn/eval.py View File


model_zoo/faster_rcnn/scripts/run_distribute_train.sh → model_zoo/official/cv/faster_rcnn/scripts/run_distribute_train.sh View File


model_zoo/faster_rcnn/scripts/run_eval.sh → model_zoo/official/cv/faster_rcnn/scripts/run_eval.sh View File


model_zoo/faster_rcnn/scripts/run_standalone_train.sh → model_zoo/official/cv/faster_rcnn/scripts/run_standalone_train.sh View File


model_zoo/faster_rcnn/src/FasterRcnn/__init__.py → model_zoo/official/cv/faster_rcnn/src/FasterRcnn/__init__.py View File


model_zoo/faster_rcnn/src/FasterRcnn/anchor_generator.py → model_zoo/official/cv/faster_rcnn/src/FasterRcnn/anchor_generator.py View File


model_zoo/faster_rcnn/src/FasterRcnn/bbox_assign_sample.py → model_zoo/official/cv/faster_rcnn/src/FasterRcnn/bbox_assign_sample.py View File


model_zoo/faster_rcnn/src/FasterRcnn/bbox_assign_sample_stage2.py → model_zoo/official/cv/faster_rcnn/src/FasterRcnn/bbox_assign_sample_stage2.py View File


model_zoo/faster_rcnn/src/FasterRcnn/faster_rcnn_r50.py → model_zoo/official/cv/faster_rcnn/src/FasterRcnn/faster_rcnn_r50.py View File


model_zoo/faster_rcnn/src/FasterRcnn/fpn_neck.py → model_zoo/official/cv/faster_rcnn/src/FasterRcnn/fpn_neck.py View File


model_zoo/faster_rcnn/src/FasterRcnn/proposal_generator.py → model_zoo/official/cv/faster_rcnn/src/FasterRcnn/proposal_generator.py View File


model_zoo/faster_rcnn/src/FasterRcnn/rcnn.py → model_zoo/official/cv/faster_rcnn/src/FasterRcnn/rcnn.py View File


model_zoo/faster_rcnn/src/FasterRcnn/resnet50.py → model_zoo/official/cv/faster_rcnn/src/FasterRcnn/resnet50.py View File


model_zoo/faster_rcnn/src/FasterRcnn/roi_align.py → model_zoo/official/cv/faster_rcnn/src/FasterRcnn/roi_align.py View File


model_zoo/faster_rcnn/src/FasterRcnn/rpn.py → model_zoo/official/cv/faster_rcnn/src/FasterRcnn/rpn.py View File


model_zoo/faster_rcnn/src/config.py → model_zoo/official/cv/faster_rcnn/src/config.py View File


model_zoo/faster_rcnn/src/dataset.py → model_zoo/official/cv/faster_rcnn/src/dataset.py View File


model_zoo/faster_rcnn/src/lr_schedule.py → model_zoo/official/cv/faster_rcnn/src/lr_schedule.py View File


model_zoo/faster_rcnn/src/network_define.py → model_zoo/official/cv/faster_rcnn/src/network_define.py View File


model_zoo/faster_rcnn/src/util.py → model_zoo/official/cv/faster_rcnn/src/util.py View File


model_zoo/faster_rcnn/train.py → model_zoo/official/cv/faster_rcnn/train.py View File


model_zoo/mass/README.md → model_zoo/official/nlp/mass/README.md View File

@@ -548,7 +548,7 @@ Run the shell script `run.sh` as followed:
```bash
sh run.sh -t t -n 1 -i 1 -c /mass/config/config.json
```
Get the log and output files under the path `./run_mass_*/`, and the model file under the path assigned in the `config/config.json` file.
Get the log and output files under the path `./train_mass_*/`, and the model file under the path assigned in the `config/config.json` file.

## Fine-tuning
For fine-tuning a model, config the options in `config.json` firstly:
@@ -562,7 +562,7 @@ Run the shell script `run.sh` as followed:
```bash
sh run.sh -t t -n 1 -i 1 -c config/config.json
```
Get the log and output files under the path `./run_mass_*/`, and the model file under the path assigned in the `config/config.json` file.
Get the log and output files under the path `./train_mass_*/`, and the model file under the path assigned in the `config/config.json` file.

## Inference
If you need to use the trained model to perform inference on multiple hardware platforms, such as GPU, Ascend 910 or Ascend 310, you can refer to this [Link](https://www.mindspore.cn/tutorial/zh-CN/master/advanced_use/network_migration.html).

model_zoo/mass/__init__.py → model_zoo/official/nlp/mass/__init__.py View File


model_zoo/mass/apply_bpe_encoding.py → model_zoo/official/nlp/mass/apply_bpe_encoding.py View File


model_zoo/mass/config/__init__.py → model_zoo/official/nlp/mass/config/__init__.py View File


model_zoo/mass/config/config.json → model_zoo/official/nlp/mass/config/config.json View File


model_zoo/mass/config/config.py → model_zoo/official/nlp/mass/config/config.py View File


model_zoo/mass/cornell_dialog.py → model_zoo/official/nlp/mass/cornell_dialog.py View File


model_zoo/mass/eval.py → model_zoo/official/nlp/mass/eval.py View File


model_zoo/mass/gigaword.py → model_zoo/official/nlp/mass/gigaword.py View File


model_zoo/mass/news_crawl.py → model_zoo/official/nlp/mass/news_crawl.py View File


model_zoo/mass/requirements.txt → model_zoo/official/nlp/mass/requirements.txt View File


model_zoo/mass/scripts/__init__.py → model_zoo/official/nlp/mass/scripts/__init__.py View File


model_zoo/mass/scripts/learn_subword.sh → model_zoo/official/nlp/mass/scripts/learn_subword.sh View File


model_zoo/mass/scripts/run.sh → model_zoo/official/nlp/mass/scripts/run.sh View File

@@ -149,19 +149,19 @@ do
cd $file_path || exit
cd ../ || exit

rm -rf ./run_mass_$DEVICE_ID
mkdir ./run_mass_$DEVICE_ID
rm -rf ./${task}_mass_$DEVICE_ID
mkdir ./${task}_mass_$DEVICE_ID

cp train.py ./run_mass_$DEVICE_ID
cp eval.py ./run_mass_$DEVICE_ID
cp $configurations ./run_mass_$DEVICE_ID
cp train.py ./${task}_mass_$DEVICE_ID
cp eval.py ./${task}_mass_$DEVICE_ID
cp $configurations ./${task}_mass_$DEVICE_ID

if [ $vocab ]
then
cp $vocab ./run_mass_$DEVICE_ID
cp $vocab ./${task}_mass_$DEVICE_ID
fi

cd ./run_mass_$DEVICE_ID || exit
cd ./${task}_mass_$DEVICE_ID || exit
env > log.log
echo $task
if [ "$task" == "train" ]

model_zoo/mass/src/__init__.py → model_zoo/official/nlp/mass/src/__init__.py View File


model_zoo/mass/src/dataset/__init__.py → model_zoo/official/nlp/mass/src/dataset/__init__.py View File


model_zoo/mass/src/dataset/base.py → model_zoo/official/nlp/mass/src/dataset/base.py View File


model_zoo/mass/src/dataset/bi_data_loader.py → model_zoo/official/nlp/mass/src/dataset/bi_data_loader.py View File


model_zoo/mass/src/dataset/load_dataset.py → model_zoo/official/nlp/mass/src/dataset/load_dataset.py View File


model_zoo/mass/src/dataset/mono_data_loader.py → model_zoo/official/nlp/mass/src/dataset/mono_data_loader.py View File


model_zoo/mass/src/dataset/schema.py → model_zoo/official/nlp/mass/src/dataset/schema.py View File


model_zoo/mass/src/language_model/__init__.py → model_zoo/official/nlp/mass/src/language_model/__init__.py View File


model_zoo/mass/src/language_model/base.py → model_zoo/official/nlp/mass/src/language_model/base.py View File


model_zoo/mass/src/language_model/loose_masked_language_model.py → model_zoo/official/nlp/mass/src/language_model/loose_masked_language_model.py View File


model_zoo/mass/src/language_model/masked_language_model.py → model_zoo/official/nlp/mass/src/language_model/masked_language_model.py View File


model_zoo/mass/src/language_model/mass_language_model.py → model_zoo/official/nlp/mass/src/language_model/mass_language_model.py View File


model_zoo/mass/src/language_model/noise_channel_language_model.py → model_zoo/official/nlp/mass/src/language_model/noise_channel_language_model.py View File


model_zoo/mass/src/transformer/__init__.py → model_zoo/official/nlp/mass/src/transformer/__init__.py View File


model_zoo/mass/src/transformer/beam_search.py → model_zoo/official/nlp/mass/src/transformer/beam_search.py View File


model_zoo/mass/src/transformer/components.py → model_zoo/official/nlp/mass/src/transformer/components.py View File


model_zoo/mass/src/transformer/create_attn_mask.py → model_zoo/official/nlp/mass/src/transformer/create_attn_mask.py View File


model_zoo/mass/src/transformer/decoder.py → model_zoo/official/nlp/mass/src/transformer/decoder.py View File


model_zoo/mass/src/transformer/embedding.py → model_zoo/official/nlp/mass/src/transformer/embedding.py View File


model_zoo/mass/src/transformer/encoder.py → model_zoo/official/nlp/mass/src/transformer/encoder.py View File


model_zoo/mass/src/transformer/feed_forward_network.py → model_zoo/official/nlp/mass/src/transformer/feed_forward_network.py View File


model_zoo/mass/src/transformer/grad_clip.py → model_zoo/official/nlp/mass/src/transformer/grad_clip.py View File


model_zoo/mass/src/transformer/infer_mass.py → model_zoo/official/nlp/mass/src/transformer/infer_mass.py View File


model_zoo/mass/src/transformer/multi_head_attention.py → model_zoo/official/nlp/mass/src/transformer/multi_head_attention.py View File


model_zoo/mass/src/transformer/positional_embedding.py → model_zoo/official/nlp/mass/src/transformer/positional_embedding.py View File


model_zoo/mass/src/transformer/residual_conn.py → model_zoo/official/nlp/mass/src/transformer/residual_conn.py View File


model_zoo/mass/src/transformer/self_attention.py → model_zoo/official/nlp/mass/src/transformer/self_attention.py View File


model_zoo/mass/src/transformer/transformer.py → model_zoo/official/nlp/mass/src/transformer/transformer.py View File


model_zoo/mass/src/transformer/transformer_for_infer.py → model_zoo/official/nlp/mass/src/transformer/transformer_for_infer.py View File


model_zoo/mass/src/transformer/transformer_for_train.py → model_zoo/official/nlp/mass/src/transformer/transformer_for_train.py View File


model_zoo/mass/src/utils/__init__.py → model_zoo/official/nlp/mass/src/utils/__init__.py View File


model_zoo/mass/src/utils/byte_pair_encoding.py → model_zoo/official/nlp/mass/src/utils/byte_pair_encoding.py View File


model_zoo/mass/src/utils/dictionary.py → model_zoo/official/nlp/mass/src/utils/dictionary.py View File


model_zoo/mass/src/utils/eval_score.py → model_zoo/official/nlp/mass/src/utils/eval_score.py View File


model_zoo/mass/src/utils/initializer.py → model_zoo/official/nlp/mass/src/utils/initializer.py View File


model_zoo/mass/src/utils/load_weights.py → model_zoo/official/nlp/mass/src/utils/load_weights.py View File


model_zoo/mass/src/utils/loss_monitor.py → model_zoo/official/nlp/mass/src/utils/loss_monitor.py View File


model_zoo/mass/src/utils/lr_scheduler.py → model_zoo/official/nlp/mass/src/utils/lr_scheduler.py View File


model_zoo/mass/src/utils/ppl_score.py → model_zoo/official/nlp/mass/src/utils/ppl_score.py View File


model_zoo/mass/src/utils/preprocess.py → model_zoo/official/nlp/mass/src/utils/preprocess.py View File


model_zoo/mass/src/utils/rouge_score.py → model_zoo/official/nlp/mass/src/utils/rouge_score.py View File


model_zoo/mass/tokenize_corpus.py → model_zoo/official/nlp/mass/tokenize_corpus.py View File


model_zoo/mass/train.py → model_zoo/official/nlp/mass/train.py View File


model_zoo/mass/weights_average.py → model_zoo/official/nlp/mass/weights_average.py View File


Loading…
Cancel
Save