Skip to content

Commit 126fac1

Browse files
authored
Remove deprecated MXNet models (#3900)
1 parent f597a3d commit 126fac1

File tree

27 files changed

+8
-708
lines changed

27 files changed

+8
-708
lines changed

CONTRIBUTING.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ Frameworks supported by the Open Model Zoo:
1010
* TensorFlow\*
1111
* PyTorch\* (via conversion to ONNX\*)
1212
* PaddlePaddle\*
13-
* MXNet\*
1413

1514
Open Model Zoo also supports models already in the ONNX format.
1615

data/datasets.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ To use this dataset with OMZ tools, make sure `<DATASET_DIR>` contains the follo
9090

9191
### Datasets in dataset_definitions.yml
9292
* `wider` used for evaluation models on WIDER Face dataset where the face is the first class. (model example: [mtcnn](../models/public/mtcnn/README.md))
93-
* `wider_without_bkgr` used for evaluation models on WIDER Face dataset where the face is class zero. (model examples: [mobilefacedet-v1-mxnet](../models/public/mobilefacedet-v1-mxnet/README.md))
93+
* `wider_without_bkgr` used for evaluation models on WIDER Face dataset where the face is class zero. (model example: [face-detection-0204](../models/intel/face-detection-0204/README.md))
9494

9595
## Visual Object Classes Challenge 2012 (VOC2012)
9696

demos/3d_segmentation_demo/python/3d_segmentation_demo.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -367,9 +367,7 @@ def main():
367367
if args.output_nifti and is_nifti_data:
368368
for seg_res in list_seg_result:
369369
nii_filename = os.path.join(args.path_to_output, 'output_{}.nii.gz'.format(list_seg_result.index(seg_res)))
370-
# Nifti1Image expects uint8, but brain-tumor-segmentation-0001 gives int64.
371-
# brain-tumor-segmentation-0002 gives uint8
372-
nib.save(nib.Nifti1Image(seg_res.astype(np.uint8), affine=affine), nii_filename)
370+
nib.save(nib.Nifti1Image(seg_res, affine=affine), nii_filename)
373371
log.debug("Result nifti file was saved to {}".format(nii_filename))
374372

375373
if __name__ == "__main__":

demos/3d_segmentation_demo/python/README.md

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ omz_converter --list models.lst
2828

2929
### Supported Models
3030

31-
* brain-tumor-segmentation-0001
3231
* brain-tumor-segmentation-0002
3332

3433
> **NOTE**: Refer to the tables [Intel's Pre-Trained Models Device Support](../../../models/intel/device_support.md) and [Public Pre-Trained Models Device Support](../../../models/public/device_support.md) for the details on models inference support at different devices.
@@ -76,29 +75,29 @@ For example, to do inference on a 3D TIFF image using a trained network with mul
7675
command:
7776

7877
```sh
79-
python3 3d_segmentation_demo.py -i <path_to_image>/inputImage.tiff -m <path_to_model>/brain-tumor-segmentation-0001.xml -d CPU -o <path_to_output>
78+
python3 3d_segmentation_demo.py -i <path_to_image>/inputImage.tiff -m <path_to_model>/brain-tumor-segmentation-0002.xml -d CPU -o <path_to_output> -ms 1,2,3,0 --full_intensities_range
8079
```
8180

8281
For example, to do inference on 3D NIfTI images using a trained network with multiple outputs on CPU and save
8382
output TIFF and NIFTI images, run the following command:
8483

8584
```sh
86-
python3 3d_segmentation_demo.py -i <path_to_nifti_images> -m <path_to_model>/brain-tumor-segmentation-0001 -d CPU -o <path_to_output> -nii -ms 2,0,3,1
85+
python3 3d_segmentation_demo.py -i <path_to_nifti_images> -m <path_to_model>/brain-tumor-segmentation-0002 -d CPU -o <path_to_output> -nii -ms 1,2,3,0 --full_intensities_range
8786
```
8887

8988
For example, to do inference on a single 3D NIfTI image and save an output TIFF image, run the following command:
9089

9190
```sh
92-
python3 3d_segmentation_demo.py -i <path_to_nifti_image>/PackedImage.nii -m <path_to_model>/brain-tumor-segmentation-0001 -d CPU -o <path_to_output> -ms 2,0,3,1
91+
python3 3d_segmentation_demo.py -i <path_to_nifti_image>/PackedImage.nii -m <path_to_model>/brain-tumor-segmentation-0002 -d CPU -o <path_to_output> -ms 1,2,3,0 --full_intensities_range
9392
```
9493

95-
`-ms` option aligns input modalities that depend on a dataset. For example, [Medical Decathlon](http://medicaldecathlon.com/) brain tumor segmentation data modalities follow in different order than it's required by nets. To make a correct order using Medical Decathlon brain tumor data the correct option is `2,0,3,1` for `brain-tumor-segmentation-0001` and `1,2,3,0` for `brain-tumor-segmentation-0002`.
94+
`-ms` option aligns input modalities that depend on a dataset. For example, [Medical Decathlon](http://medicaldecathlon.com/) brain tumor segmentation data modalities follow in different order than it's required by nets. To make a correct order using Medical Decathlon brain tumor data the correct option is `1,2,3,0` for `brain-tumor-segmentation-0002`.
9695

9796
```sh
9897
python3 3d_segmentation_demo.py -i <path_to_nifti_images> -m <path_to_model>/brain-tumor-segmentation-0002 -d CPU -o <path_to_output> -nii -ms 1,2,3,0 --full_intensities_range
9998
```
10099

101-
`--full_intensities_range` option is related to preprocessing of input data. It can be different for different models, for example, `brain-tumor-segmentation-0001` expects normalized data in [0,1] range and nullified non-positive values, while `brain-tumor-segmentation-0002` just requires z-score normalization in a full range. So to use `brain-tumor-segmentation-0002` model, the flag `--full_intensities_range` should be set, while for `brain-tumor-segmentation-0001` no preprocessing option is required.
100+
`--full_intensities_range` option is related to preprocessing of input data. It can be different for different models, for example, `brain-tumor-segmentation-0002` just requires z-score normalization in a full range. So to use `brain-tumor-segmentation-0002` model, the flag `--full_intensities_range` should be set.
102101

103102
## Demo Output
104103

demos/classification_benchmark_demo/cpp/README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ omz_converter --list models.lst
6868
* mobilenet-v3-small-1.0-224-paddle
6969
* mobilenet-v3-small-1.0-224-tf
7070
* nfnet-f0
71-
* octave-resnet-26-0.25
7271
* regnetx-3.2gf
7372
* repvgg-a0
7473
* repvgg-b1

demos/classification_benchmark_demo/cpp/models.lst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ mobilenet-v3-large-1.0-224-tf
3232
mobilenet-v3-small-1.0-224-paddle
3333
mobilenet-v3-small-1.0-224-tf
3434
nfnet-f0
35-
octave-resnet-26-0.25
3635
regnetx-3.2gf
3736
repvgg-a0
3837
repvgg-b1

demos/classification_benchmark_demo/cpp_gapi/README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ omz_converter --list models.lst
6868
* mobilenet-v3-small-1.0-224-paddle
6969
* mobilenet-v3-small-1.0-224-tf
7070
* nfnet-f0
71-
* octave-resnet-26-0.25
7271
* regnetx-3.2gf
7372
* repvgg-a0
7473
* repvgg-b1

demos/classification_benchmark_demo/cpp_gapi/models.lst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ mobilenet-v3-large-1.0-224-paddle
3333
mobilenet-v3-small-1.0-224-paddle
3434
# mobilenet-v3-small-1.0-224-tf
3535
nfnet-f0
36-
octave-resnet-26-0.25
3736
regnetx-3.2gf
3837
repvgg-a0
3938
repvgg-b1

demos/classification_demo/python/README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ omz_converter --list models.lst
7070
* mobilenet-v3-small-1.0-224-paddle
7171
* mobilenet-v3-small-1.0-224-tf
7272
* nfnet-f0
73-
* octave-resnet-26-0.25
7473
* regnetx-3.2gf
7574
* repvgg-a0
7675
* repvgg-b1

demos/classification_demo/python/models.lst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ mobilenet-v3-large-1.0-224-tf
3232
mobilenet-v3-small-1.0-224-paddle
3333
mobilenet-v3-small-1.0-224-tf
3434
nfnet-f0
35-
octave-resnet-26-0.25
3635
regnetx-3.2gf
3736
repvgg-a0
3837
repvgg-b1

0 commit comments

Comments
 (0)