modified:   README.md
	new file:   ascend310_infer/CMakeLists.txt
	new file:   ascend310_infer/build.sh
	new file:   ascend310_infer/inc/utils.h
	new file:   ascend310_infer/src/main.cc
	new file:   ascend310_infer/src/utils.cc
	new file:   export.py
	new file:   postprocess.py
	new file:   preprocess.py
	new file:   scripts/run_infer_310.sh
	modified:   src/network_define_eval.py

Merge pull request !1094 from 张晓晓/master

Merge pull request !1094 from 张晓晓/master

Merge pull request !15 from 谈宇隆/code_midas

Merge pull request !398 from pawn_sxy/master

	modified:   AVA_cifar/README.md
	new file:   AVA_cifar/ascend310_infer/CMakeLists.txt
	new file:   AVA_cifar/ascend310_infer/build.sh
	new file:   AVA_cifar/ascend310_infer/inc/utils.h
	new file:   AVA_cifar/ascend310_infer/src/main.cc
	new file:   AVA_cifar/ascend310_infer/src/utils.cc
	new file:   AVA_cifar/export.py
	new file:   AVA_cifar/postprocess.py
	new file:   AVA_cifar/preprocess.py
	new file:   AVA_cifar/scripts/run_infer_310.sh
	modified:   AVA_cifar/src/config.py
	modified:   AVA_cifar/src/knn_eval.py
	modified:   FaceDetection/export.py

Merge pull request !833 from Potino/code_protonet

Merge pull request !617 from 孟权令/master

Merge pull request !1069 from 谭华林/brdnet_mindx

Merge pull request !996 from 挣扎/master

"合并修改"

提交mindx推理部分

提交修改

修改部分代码

.

Merge pull request !785 from 谭华林/fastscnn_mxbase

Merge pull request !1036 from zhouneng/fix_issue_I4IWW0

Merge pull request !1036 from zhouneng/fix_issue_I4IWW0

Merge pull request !72 from 孙圣杰/master

Merge pull request !970 from 雷英鹏/adnet_master

Merge pull request !970 from 雷英鹏/adnet_master

Merge pull request !414 from 杨晴东/master

Merge pull request !1054 from 张晓晓/master

Merge pull request !971 from 杨羽频/code_senta

Merge pull request !806 from Huang Ganghong/master

Merge pull request !143 from Shawn/master

delete some annotations

using ast

first commit

delete some annotations

using ast

Merge pull request !1017 from zhouneng/fix_issue_I4J1UG

Merge pull request !1017 from zhouneng/fix_issue_I4J1UG

Merge pull request !335 from gitsYu/master

Merge pull request !975 from dengjian_uestc_2/master

Merge pull request !975 from dengjian_uestc_2/master

Merge pull request !960 from tian-siju/master

Merge pull request !923 from 白奕凡18030100374/sphereface_final

Merge pull request !1015 from chenweitao_295/shufflenetv1_issue

Merge pull request !961 from Maige/faster_rcnn_bug