IntenseWebs/openvino
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update ONNX models to latest master (#3658)

Browse Source 
* Update ONNX models to 00d95ba9e5758fd0bc5e6978033fabc4f2a95e61

That version fixes yolov4 and roberta models

* remove yolov4 post processing

* remove model directory before unpacking
This commit is contained in:
Mateusz Tabaka 2020-12-22 06:04:32 +01:00 committed by GitHub
parent 977c3dda23
commit 4f14e842c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ngraph/python/tests/__init__.py
View File

@ -184,14 +184,6 @@ xfail_issue_44970 = xfail_test(reason="Assertion error")
xfail_issue_44976 = xfail_test(reason="E RuntimeError: Quantize layer with name:"
"FakeQuantize_xxx has non const input on 1 port")
# Model ONNX Zoo issues:
xfail_issue_39684 = xfail_test(reason="ngraph.exceptions.UserInputError:"
"('Expected %s parameters, received %s.', 1, 3)")
xfail_issue_39685 = xfail_test(reason="RuntimeError: While validating node 'v1::Transpose 315,"
"Constant_9353 -> (f32{?,?,?,?})' with friendly_name '315':"
"Input order must have shape [n], where n is the rank of arg.")
# Model MSFT issues:
xfail_issue_37957 = xfail_test(reason="RuntimeError: nGraph does not support the following ONNX operations:"
"com.microsoft.CropAndResize, com.microsoft.GatherND,"

13
ngraph/python/tests/test_onnx/model_zoo_preprocess.sh
View File

@ -2,7 +2,7 @@
set -e
# provide ONNX Model Zoo commit hash ID to update:
ONNX_SHA=5c9f64f470c825ccbe1bbaa8d460c0463ff6efec
ONNX_SHA=00d95ba9e5758fd0bc5e6978033fabc4f2a95e61
MODELS_DIR="$HOME/.onnx/model_zoo"
ENABLE_MSFT=false
@ -62,18 +62,9 @@ function pull_and_postprocess_onnx_model_zoo() {
find "$ONNX_MODELS_DIR" -name "*.onnx" | while read filename; do rm "$filename"; done;
printf "Extracting tar.gz archives into %s\n" "$ONNX_MODELS_DIR"
find "$ONNX_MODELS_DIR" -name '*.tar.gz' -execdir sh -c 'BASEDIR=$(basename "{}" .tar.gz) && mkdir -p $BASEDIR' \; -execdir sh -c 'BASEDIR=$(basename "{}" .tar.gz) && tar --warning=no-unknown-keyword -xzf "{}" -C $BASEDIR' \;
find "$ONNX_MODELS_DIR" -name '*.tar.gz' -execdir sh -c 'BASEDIR=$(basename "{}" .tar.gz) && rm -rf $BASEDIR && mkdir -p $BASEDIR' \; -execdir sh -c 'BASEDIR=$(basename "{}" .tar.gz) && tar --warning=no-unknown-keyword -xzf "{}" -C $BASEDIR' \;
echo "Postprocessing of ONNX Model Zoo models:"
echo "Fix yolo v4 model"
cd "$ONNX_MODELS_DIR/vision/object_detection_segmentation/yolov4/model/yolov4/yolov4/test_data_set"
mv input0.pb input_0.pb
mv input1.pb input_1.pb
mv input2.pb input_2.pb
mv output0.pb output_0.pb
mv output1.pb output_1.pb
mv output2.pb output_2.pb
echo "Fix roberta model"
cd "$ONNX_MODELS_DIR/text/machine_comprehension/roberta/model/roberta-sequence-classification-9/roberta-sequence-classification-9"

7
ngraph/python/tests/test_onnx/test_zoo_models.py
View File

@ -30,9 +30,7 @@ from tests import (
xfail_issue_43742,
xfail_issue_43380,
xfail_issue_45457,
xfail_issue_39684,
xfail_issue_40957,
xfail_issue_39685,
xfail_issue_37957,
xfail_issue_38084,
xfail_issue_39669,
@ -114,7 +112,8 @@ tolerance_map = {
"test_tiny_yolov2": {"atol": 1e-05, "rtol": 0.001},
"test_resnet152v2": {"atol": 1e-04, "rtol": 0.001},
"test_mobilenetv2-1": {"atol": 1e-04, "rtol": 0.001},
"yolov3": {"atol": 0.001, "rtol": 0.001}
"yolov3": {"atol": 0.001, "rtol": 0.001},
"yolov4": {"atol": 1e-04, "rtol": 0.001},
}
zoo_models = []
@ -166,13 +165,11 @@ if len(zoo_models) > 0:
# ONNX Model Zoo
(xfail_issue_39704, "test_onnx_model_zoo_vision_object_detection_segmentation_duc_model_ResNet101_DUC_7_ResNet101_DUC_HDC_ResNet101_DUC_HDC_cpu"),
(xfail_issue_43213, "test_onnx_model_zoo_vision_object_detection_segmentation_retinanet_model_retinanet_9_test_retinanet_resnet101_retinanet_9_cpu"),
(xfail_issue_39684, "test_onnx_model_zoo_vision_object_detection_segmentation_yolov4_model_yolov4_yolov4_yolov4_cpu"),
(xfail_issue_43208, "test_onnx_model_zoo_text_machine_comprehension_gpt_2_model_gpt2_10_GPT2_model_cpu"),
(xfail_issue_43209, "test_onnx_model_zoo_text_machine_comprehension_gpt_2_model_gpt2_lm_head_10_GPT_2_LM_HEAD_model_cpu"),
(xfail_issue_40957, "test_onnx_model_zoo_text_machine_comprehension_bert_squad_model_bertsquad_10_download_sample_10_bertsquad10_cpu"),
(xfail_issue_40957, "test_onnx_model_zoo_text_machine_comprehension_roberta_model_roberta_base_11_roberta_base_11_roberta_base_11_cpu"),
(xfail_issue_40957, "test_onnx_model_zoo_text_machine_comprehension_bert_squad_model_bertsquad_8_download_sample_8_bertsquad8_cpu"),
(xfail_issue_39685, "test_onnx_model_zoo_text_machine_comprehension_roberta_model_roberta_sequence_classification_9_roberta_sequence_classification_9_roberta_sequence_classification_9_cpu"),
(xfail_issue_39669, "test_onnx_model_zoo_text_machine_comprehension_t5_model_t5_encoder_12_t5_encoder_cpu"),
(xfail_issue_38084, "test_onnx_model_zoo_vision_object_detection_segmentation_mask_rcnn_model_MaskRCNN_10_mask_rcnn_R_50_FPN_1x_cpu"),
(xfail_issue_38084, "test_onnx_model_zoo_vision_object_detection_segmentation_faster_rcnn_model_FasterRCNN_10_faster_rcnn_R_50_FPN_1x_cpu"),