Remove deprecated alexnet (#3898)

Wovchena · web-flow · commit 5f8c49852d05 · 2024-01-26T17:11:26.000+04:00
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -263,7 +263,7 @@ The documentation should contain:
 * detailed description of input and output for original and converted models
 * the model's licensing terms
 
-Learn the detailed structure and headers naming convention from any model documentation (for example, [alexnet](./models/public/alexnet/README.md)).
+Learn the detailed structure and headers naming convention from any model documentation (for example, [densenet-121-tf](./models/public/densenet-121-tf/README.md)).
 
 ## Legal Information
 
diff --git a/data/datasets.md b/data/datasets.md
@@ -39,7 +39,7 @@ To use this dataset with OMZ tools, make sure `<DATASET_DIR>` contains the follo
 * `val15.txt` - annotation file used for ILSVRC 2015
 
 ### Datasets in dataset_definitions.yml
-* `imagenet_1000_classes` used for evaluation models trained on ILSVRC 2012 dataset with 1000 classes. (model examples: [alexnet](../models/public/alexnet/README.md), [vgg16](../models/public/vgg16/README.md))
+* `imagenet_1000_classes` used for evaluation models trained on ILSVRC 2012 dataset with 1000 classes. (model examples: [densenet-121-tf](../models/public/densenet-121-tf/README.md), [vgg16](../models/public/vgg16/README.md))
 * `imagenet_1000_classes_2015` used for evaluation models trained on ILSVRC 2015 dataset with 1000 classes. (model examples: [se-resnet-50](../models/public/se-resnet-50/README.md), [se-resnext-50](../models/public/se-resnext-50/README.md))
 * `imagenet_1001_classes` used for evaluation models trained on ILSVRC 2012 dataset with 1001 classes (background label + original labels). (model examples: [googlenet-v2-tf](../models/public/googlenet-v2-tf/README.md), [resnet-50-tf](../models/public/resnet-50-tf/README.md))
 
diff --git a/demos/classification_benchmark_demo/cpp/README.md b/demos/classification_benchmark_demo/cpp/README.md
@@ -35,7 +35,6 @@ omz_converter --list models.lst
 
 ### Supported Models
 
-* alexnet
 * caffenet
 * convnext-tiny
 * densenet-121
diff --git a/demos/classification_benchmark_demo/cpp/models.lst b/demos/classification_benchmark_demo/cpp/models.lst
@@ -1,5 +1,4 @@
 # This file can be used with the --list option of the model downloader.
-alexnet
 caffenet
 convnext-tiny
 densenet-121
diff --git a/demos/classification_benchmark_demo/cpp_gapi/README.md b/demos/classification_benchmark_demo/cpp_gapi/README.md
@@ -35,7 +35,6 @@ omz_converter --list models.lst
 
 ### Supported Models
 
-* alexnet
 * caffenet
 * convnext-tiny
 * densenet-121
diff --git a/demos/classification_benchmark_demo/cpp_gapi/models.lst b/demos/classification_benchmark_demo/cpp_gapi/models.lst
@@ -1,5 +1,4 @@
 # This file can be used with the --list option of the model downloader.
-alexnet
 caffenet
 convnext-tiny
 densenet-121
diff --git a/demos/classification_demo/python/README.md b/demos/classification_demo/python/README.md
@@ -37,7 +37,6 @@ omz_converter --list models.lst
 
 ### Supported Models
 
-* alexnet
 * caffenet
 * convnext-tiny
 * densenet-121
diff --git a/demos/classification_demo/python/models.lst b/demos/classification_demo/python/models.lst
@@ -1,5 +1,4 @@
 # This file can be used with the --list option of the model downloader.
-alexnet
 caffenet
 convnext-tiny
 densenet-121
diff --git a/demos/tests/cases.py b/demos/tests/cases.py
@@ -356,7 +356,6 @@ def single_option_cases(key, *args):
             '-gt': TestDataArg("ILSVRC2012_img_val/ILSVRC2012_val.txt")}),
         single_option_cases(
             '-m',
-            ModelArg('alexnet'),
             ModelArg('caffenet'),
             ModelArg('convnext-tiny'),
             ModelArg('densenet-121'),
@@ -986,7 +985,6 @@ def single_option_cases(key, *args):
         [
             *single_option_cases(
                 '-m',
-                ModelArg('alexnet'),
                 ModelArg('caffenet'),
                 ModelArg('convnext-tiny'),
                 ModelArg('densenet-121'),
diff --git a/models/public/alexnet/README.md b/models/public/alexnet/README.md
diff --git a/models/public/alexnet/accuracy-check.yml b/models/public/alexnet/accuracy-check.yml
diff --git a/models/public/alexnet/model.yml b/models/public/alexnet/model.yml
diff --git a/models/public/device_support.md b/models/public/device_support.md
@@ -4,7 +4,6 @@
 |------------|-----|-----|
 | aclnet | YES |    |
 | aclnet-int8 | YES |    |
-| alexnet | YES | YES |
 | anti-spoof-mn3 | YES | YES |
 | background-matting-mobilenetv2 | YES |    |
 | bert-base-ner | YES |    |
diff --git a/models/public/index.md b/models/public/index.md
@@ -11,7 +11,6 @@
    omz_models_public_device_support
    omz_models_model_aclnet
    omz_models_model_aclnet_int8
-   omz_models_model_alexnet
    omz_models_model_anti_spoof_mn3
    omz_models_model_background_matting_mobilenetv2
    omz_models_model_bert_base_ner
@@ -175,7 +174,6 @@ You can download models and convert them into OpenVINO™ IR format (\*.xml + \*
 
 | Model Name                  | Implementation                     | OMZ Model Name | Accuracy | GFlops | mParams |
 | --------------------------- | -----------------------------------| -------------- | -------- | ------ | ------- |
-| AlexNet                     | Caffe\*                            | [alexnet](./alexnet/README.md)   | 56.598%/79.812% | 1.5 | 60.965 |
 | AntiSpoofNet                | PyTorch\*                          | [anti-spoof-mn3](./anti-spoof-mn3/README.md) | 3.81% | 0.15 | 3.02 |
 | CaffeNet                    | Caffe\*                            | [caffenet](./caffenet/README.md)  | 56.714%/79.916% | 1.5 | 60.965 |
 | ConvNeXt Tiny               | PyTorch\*                          | [convnext-tiny](./convnext-tiny/README.md) | 82.05%/95.86% | 8.9419 | 28.5892 |
diff --git a/tools/accuracy_checker/README.md b/tools/accuracy_checker/README.md
@@ -184,15 +184,27 @@ Example:
 
 ```yaml
 models:
-- name: model_name
+- name: densenet-121-tf
   launchers:
-    - framework: caffe
-      model:   bvlc_alexnet.prototxt
-      weights: bvlc_alexnet.caffemodel
+    - framework: openvino
       adapter: classification
-      batch: 128
+
   datasets:
-    - name: dataset_name
+    - name: imagenet_1000_classes
+      preprocessing:
+        - type: resize
+          size: 256
+        - type: crop
+          size: 224
+      metrics:
+        - name: accuracy@top1
+          type: accuracy
+          top_k: 1
+          reference: 0.7446
+        - name: accuracy@top5
+          type: accuracy
+          top_k: 5
+          reference: 0.9213
 ```
 Optionally you can use global configuration. It can be useful for avoiding duplication if you have several models which should be run on the same dataset.
 Example of global definitions file can be found at `<omz_dir>/data/dataset_definitions.yml`. Global definitions will be merged with evaluation config in the runtime by dataset name.
diff --git a/tools/accuracy_checker/configs/README.md b/tools/accuracy_checker/configs/README.md
@@ -51,7 +51,7 @@ Predefined configuration file `accuracy-check.yml` for each Open Model Zoo model
 
 Example:
 
-`<omz_dir>/tools/accuracy_checker/configs/alexnet.yml` is a link for configuration file `<omz_dir>/models/public/alexnet/accuracy-check.yml` for [alexnet](../../../models/public/alexnet/README.md) model.
+`<omz_dir>/tools/accuracy_checker/configs/densenet-121-tf.yml` is a link for configuration file `<omz_dir>/models/public/densenet-121-tf/accuracy-check.yml` for [densenet-121-tf](../../../models/public/densenet-121-tf/README.md) model.
 
 ## Options
 
diff --git a/tools/accuracy_checker/configs/alexnet.yml b/tools/accuracy_checker/configs/alexnet.yml
diff --git a/tools/accuracy_checker/openvino/tools/accuracy_checker/launcher/gapi_launcher_readme.md b/tools/accuracy_checker/openvino/tools/accuracy_checker/launcher/gapi_launcher_readme.md
@@ -32,8 +32,8 @@ G-API launcher config example:
 launchers:
   - framework: g-api
     device: CPU
-    model: path_to_model/alexnet.xml
-    weights: path_to_weights/alexnet.bin
+    model: path_to_model/densenet-121-tf.xml
+    weights: path_to_weights/densenet-121-tf.bin
     inputs:
       - name: 'data'
         type: INPUT
diff --git a/tools/accuracy_checker/openvino/tools/accuracy_checker/launcher/openvino_launcher_readme.md b/tools/accuracy_checker/openvino/tools/accuracy_checker/launcher/openvino_launcher_readme.md
@@ -64,8 +64,8 @@ OpenVINO™ launcher config example:
 launchers:
   - framework: openvino
     device: CPU
-    model: path_to_model/alexnet.xml
-    weights: path_to_weights/alexnet.bin
+    model: path_to_model/ensenet-121-tf.xml
+    weights: path_to_weights/ensenet-121-tf.bin
     adapter: classification
 ```
 
@@ -135,8 +135,8 @@ OpenVINO™ launcher config example:
 launchers:
   - framework: dlsdk
     device: CPU
-    model: path_to_model/alexnet.xml
-    weights: path_to_weights/alexnet.bin
+    model: path_to_model/ensenet-121-tf.xml
+    weights: path_to_weights/ensenet-121-tf.bin
     adapter: classification
 ```
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`# This file can be used with the --list option of the model downloader.`
`2`		`-alexnet`
`3`	`2`	`caffenet`
`4`	`3`	`convnext-tiny`
`5`	`4`	`densenet-121`