Skip to content

Commit 6a7df1c

Browse files
saltykoxsaltykox
committed
Merge branch 'develop' into vsaltykovx/add_mmdetection_input_parameters_validation
# Conflicts: # external/mmdetection/detection_tasks/apis/detection/openvino_task.py
2 parents 31e179c + 33d11e6 commit 6a7df1c

File tree

137 files changed

+3800
-1411
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

137 files changed

+3800
-1411
lines changed

‎.pre-commit-config.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ repos:
1818
exclude: "tests/"
1919

2020
- repo: https://github.com/psf/black
21-
rev: 21.7b0
21+
rev: 22.3.0
2222
hooks:
2323
- id: black
2424
name: "black (ote_sdk|ote_cli)"

‎.pylintrc

+2-1
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,8 @@ disable=logging-fstring-interpolation,
142142
deprecated-sys-function,
143143
exception-escape,
144144
comprehension-escape,
145-
import-outside-toplevel
145+
import-outside-toplevel,
146+
arguments-differ
146147

147148
# Enable the message, report, category or checker with the given id(s). You can
148149
# either give multiple identifier separated by comma (,) or put this option

‎external/README.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,10 @@ ID | Name | Complexity (GFlops) | Model size (MB) | Path
4747
Custom_Rotated_Detection_via_Instance_Segmentation_MaskRCNN_EfficientNetB2B | MaskRCNN-EfficientNetB2B | 68.48 | 13.27 | mmdetection/configs/rotated_detection/efficientnetb2b_maskrcnn/template.yaml
4848
Custom_Rotated_Detection_via_Instance_Segmentation_MaskRCNN_ResNet50 | MaskRCNN-ResNet50 | 533.8 | 177.9 | mmdetection/configs/rotated_detection/resnet50_maskrcnn/template.yaml
4949

50-
## Semantic Segmentaion
50+
## Semantic Segmentation
5151
ID | Name | Complexity (GFlops) | Model size (MB) | Path
5252
------- | ------- | ------- | ------- | -------
53+
Custom_Semantic_Segmentation_Lite-HRNet-s-mod2_OCR | Lite-HRNet-s-mod2 OCR | 1.82 | 3.5 | mmsegmentation/configs/custom-sematic-segmentation/ocr-lite-hrnet-s-mod2/template.yaml
5354
Custom_Semantic_Segmentation_Lite-HRNet-18_OCR | Lite-HRNet-18 OCR | 3.45 | 4.5 | mmsegmentation/configs/custom-sematic-segmentation/ocr-lite-hrnet-18/template.yaml
5455
Custom_Semantic_Segmentation_Lite-HRNet-18-mod2_OCR | Lite-HRNet-18-mod2 OCR | 3.63 | 4.8 | mmsegmentation/configs/custom-sematic-segmentation/ocr-lite-hrnet-18-mod2/template.yaml
5556
Custom_Semantic_Segmentation_Lite-HRNet-x-mod3_OCR | Lite-HRNet-x-mod3 OCR | 13.97 | 6.4 | mmsegmentation/configs/custom-sematic-segmentation/ocr-lite-hrnet-x-mod3/template.yaml

‎external/anomaly/anomaly_classification/configs/padim/compression_config.json

+42
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
{
2+
"base": {
3+
"find_unused_parameters": true,
4+
"target_metric_name": "image_F1",
5+
"nncf_config": {
6+
"input_info": {
7+
"sample_size": [1, 3, 256, 256]
8+
},
9+
"compression": [],
10+
"log_dir": "/tmp"
11+
}
12+
},
13+
"nncf_quantization": {
14+
"nncf_config": {
15+
"compression": [
16+
{
17+
"algorithm": "quantization",
18+
"preset": "mixed",
19+
"initializer": {
20+
"range": {
21+
"num_init_samples": 250
22+
},
23+
"batchnorm_adaptation": {
24+
"num_bn_adaptation_samples": 250
25+
}
26+
},
27+
"ignored_scopes": [
28+
"PadimModel/sqrt_0",
29+
"PadimModel/interpolate_2",
30+
"PadimModel/__truediv___0",
31+
"PadimModel/__truediv___1",
32+
"PadimModel/matmul_1",
33+
"PadimModel/conv2d_0"
34+
]
35+
}
36+
]
37+
}
38+
},
39+
"order_of_parts": [
40+
"nncf_quantization"
41+
]
42+
}

‎external/anomaly/anomaly_classification/configs/padim/configuration.yaml

+50
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,56 @@ pot_parameters:
8383
visible_in_ui: true
8484
warning: null
8585
type: PARAMETER_GROUP
86+
visible_in_ui: true
87+
nncf_optimization:
88+
description: Optimization by NNCF
89+
header: Optimization by NNCF
90+
enable_quantization:
91+
affects_outcome_of: TRAINING
92+
default_value: true
93+
description: Enable quantization algorithm
94+
editable: true
95+
header: Enable quantization algorithm
96+
type: BOOLEAN
97+
ui_rules:
98+
action: DISABLE_EDITING
99+
operator: AND
100+
rules: []
101+
type: UI_RULES
102+
value: true
103+
visible_in_ui: true
104+
warning: null
105+
enable_pruning:
106+
affects_outcome_of: TRAINING
107+
default_value: false
108+
description: Enable filter pruning algorithm
109+
editable: true
110+
header: Enable filter pruning algorithm
111+
type: BOOLEAN
112+
ui_rules:
113+
action: DISABLE_EDITING
114+
operator: AND
115+
rules: []
116+
type: UI_RULES
117+
value: false
118+
visible_in_ui: true
119+
warning: null
120+
pruning_supported:
121+
affects_outcome_of: TRAINING
122+
default_value: false
123+
description: Whether filter pruning is supported
124+
editable: false
125+
header: Whether filter pruning is supported
126+
type: BOOLEAN
127+
ui_rules:
128+
action: DISABLE_EDITING
129+
operator: AND
130+
rules: []
131+
type: UI_RULES
132+
value: false
133+
visible_in_ui: false
134+
warning: null
135+
type: PARAMETER_GROUP
86136
visible_in_ui: false
87137
type: CONFIGURABLE_PARAMETERS
88138
visible_in_ui: true

‎external/anomaly/anomaly_classification/configs/padim/template.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@ framework: OTEAnomalyClassification v0.1.0
1212

1313
# Task implementations.
1414
entrypoints:
15-
base: ote_anomalib.BaseAnomalyTask
15+
base: ote_anomalib.AnomalyTrainingTask
1616
openvino: ote_anomalib.OpenVINOAnomalyTask
17+
nncf: ote_anomalib.AnomalyNNCFTask
1718

1819
# Hyper Parameters
1920
hyper_parameters:

‎external/anomaly/anomaly_classification/configs/stfpm/compression_config.json

+40
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
{
2+
"base": {
3+
"find_unused_parameters": true,
4+
"target_metric_name": "image_F1",
5+
"nncf_config": {
6+
"input_info": {
7+
"sample_size": [1, 3, 256, 256]
8+
},
9+
"compression": [],
10+
"log_dir": "/tmp"
11+
}
12+
},
13+
"nncf_quantization": {
14+
"model": {
15+
"lr": 0.004
16+
},
17+
"nncf_config": {
18+
"compression": [
19+
{
20+
"algorithm": "quantization",
21+
"preset": "mixed",
22+
"initializer": {
23+
"range": {
24+
"num_init_samples": 250
25+
},
26+
"batchnorm_adaptation": {
27+
"num_bn_adaptation_samples": 250
28+
}
29+
},
30+
"ignored_scopes": [
31+
"{re}.*__pow__.*"
32+
]
33+
}
34+
]
35+
}
36+
},
37+
"order_of_parts": [
38+
"nncf_quantization"
39+
]
40+
}

‎external/anomaly/anomaly_classification/configs/stfpm/configuration.yaml

+50
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,56 @@ pot_parameters:
132132
visible_in_ui: true
133133
warning: null
134134
type: PARAMETER_GROUP
135+
visible_in_ui: true
136+
nncf_optimization:
137+
description: Optimization by NNCF
138+
header: Optimization by NNCF
139+
enable_quantization:
140+
affects_outcome_of: TRAINING
141+
default_value: true
142+
description: Enable quantization algorithm
143+
editable: true
144+
header: Enable quantization algorithm
145+
type: BOOLEAN
146+
ui_rules:
147+
action: DISABLE_EDITING
148+
operator: AND
149+
rules: []
150+
type: UI_RULES
151+
value: true
152+
visible_in_ui: true
153+
warning: null
154+
enable_pruning:
155+
affects_outcome_of: TRAINING
156+
default_value: false
157+
description: Enable filter pruning algorithm
158+
editable: true
159+
header: Enable filter pruning algorithm
160+
type: BOOLEAN
161+
ui_rules:
162+
action: DISABLE_EDITING
163+
operator: AND
164+
rules: []
165+
type: UI_RULES
166+
value: false
167+
visible_in_ui: true
168+
warning: null
169+
pruning_supported:
170+
affects_outcome_of: TRAINING
171+
default_value: false
172+
description: Whether filter pruning is supported
173+
editable: false
174+
header: Whether filter pruning is supported
175+
type: BOOLEAN
176+
ui_rules:
177+
action: DISABLE_EDITING
178+
operator: AND
179+
rules: []
180+
type: UI_RULES
181+
value: false
182+
visible_in_ui: false
183+
warning: null
184+
type: PARAMETER_GROUP
135185
visible_in_ui: false
136186
type: CONFIGURABLE_PARAMETERS
137187
visible_in_ui: true

‎external/anomaly/anomaly_classification/configs/stfpm/template.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@ framework: OTEAnomalyClassification v0.1.0
1212

1313
# Task implementations.
1414
entrypoints:
15-
base: ote_anomalib.BaseAnomalyTask
15+
base: ote_anomalib.AnomalyTrainingTask
1616
openvino: ote_anomalib.OpenVINOAnomalyTask
17+
nncf: ote_anomalib.AnomalyNNCFTask
1718

1819
# Hyper Parameters
1920
hyper_parameters:

‎external/anomaly/anomaly_detection/configs/padim/compression_config.json

+42
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
{
2+
"base": {
3+
"find_unused_parameters": true,
4+
"target_metric_name": "image_F1",
5+
"nncf_config": {
6+
"input_info": {
7+
"sample_size": [1, 3, 256, 256]
8+
},
9+
"compression": [],
10+
"log_dir": "/tmp"
11+
}
12+
},
13+
"nncf_quantization": {
14+
"nncf_config": {
15+
"compression": [
16+
{
17+
"algorithm": "quantization",
18+
"preset": "mixed",
19+
"initializer": {
20+
"range": {
21+
"num_init_samples": 250
22+
},
23+
"batchnorm_adaptation": {
24+
"num_bn_adaptation_samples": 250
25+
}
26+
},
27+
"ignored_scopes": [
28+
"PadimModel/sqrt_0",
29+
"PadimModel/interpolate_2",
30+
"PadimModel/__truediv___0",
31+
"PadimModel/__truediv___1",
32+
"PadimModel/matmul_1",
33+
"PadimModel/conv2d_0"
34+
]
35+
}
36+
]
37+
}
38+
},
39+
"order_of_parts": [
40+
"nncf_quantization"
41+
]
42+
}

‎external/anomaly/anomaly_detection/configs/padim/configuration.yaml

+50
Original file line numberDiff line numberDiff line change
@@ -84,5 +84,55 @@ pot_parameters:
8484
warning: null
8585
type: PARAMETER_GROUP
8686
visible_in_ui: true
87+
nncf_optimization:
88+
description: Optimization by NNCF
89+
header: Optimization by NNCF
90+
enable_quantization:
91+
affects_outcome_of: TRAINING
92+
default_value: true
93+
description: Enable quantization algorithm
94+
editable: true
95+
header: Enable quantization algorithm
96+
type: BOOLEAN
97+
ui_rules:
98+
action: DISABLE_EDITING
99+
operator: AND
100+
rules: []
101+
type: UI_RULES
102+
value: true
103+
visible_in_ui: true
104+
warning: null
105+
enable_pruning:
106+
affects_outcome_of: TRAINING
107+
default_value: false
108+
description: Enable filter pruning algorithm
109+
editable: true
110+
header: Enable filter pruning algorithm
111+
type: BOOLEAN
112+
ui_rules:
113+
action: DISABLE_EDITING
114+
operator: AND
115+
rules: []
116+
type: UI_RULES
117+
value: false
118+
visible_in_ui: true
119+
warning: null
120+
pruning_supported:
121+
affects_outcome_of: TRAINING
122+
default_value: false
123+
description: Whether filter pruning is supported
124+
editable: false
125+
header: Whether filter pruning is supported
126+
type: BOOLEAN
127+
ui_rules:
128+
action: DISABLE_EDITING
129+
operator: AND
130+
rules: []
131+
type: UI_RULES
132+
value: false
133+
visible_in_ui: false
134+
warning: null
135+
type: PARAMETER_GROUP
136+
visible_in_ui: false
87137
type: CONFIGURABLE_PARAMETERS
88138
visible_in_ui: true

‎external/anomaly/anomaly_detection/configs/padim/template.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@ framework: OTEAnomalyClassification v0.1.0 # TODO: update after the name has bee
1212

1313
# Task implementations.
1414
entrypoints:
15-
base: ote_anomalib.BaseAnomalyTask
15+
base: ote_anomalib.AnomalyTrainingTask
1616
openvino: ote_anomalib.OpenVINOAnomalyTask
17+
nncf: ote_anomalib.AnomalyNNCFTask
1718

1819
# Hyper Parameters
1920
hyper_parameters:

0 commit comments

Comments
 (0)