Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added MinMax algorithm for OpenVINO backend #1444

Merged
merged 33 commits into from
Jan 19, 2023
Merged

Added MinMax algorithm for OpenVINO backend #1444

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
96694bf
Introduce OpenVINO native ModelTransformer
l-bat Nov 28, 2022
6505919
refactoring
l-bat Nov 29, 2022
afe600d
Fix comments
l-bat Nov 30, 2022
d901767
[OV native] Support MinMax algo
l-bat Nov 30, 2022
49e1afd
Update patterns
l-bat Dec 2, 2022
f0026e8
Refactor quantization parameters
l-bat Dec 6, 2022
95c48c5
Refactoring
l-bat Dec 6, 2022
41fa4c4
rebase
l-bat Dec 19, 2022
6b353e3
Add layer attrs
l-bat Dec 20, 2022
e46b55f
Fix minmax algo
l-bat Dec 20, 2022
e8d1a4c
Fix FQ params
l-bat Dec 20, 2022
a4208d0
Fix tests
l-bat Dec 20, 2022
abf24b5
Update tests
l-bat Dec 22, 2022
5ce28af
Fix FQ calculation and add tests
l-bat Dec 28, 2022
879693f
Add AC
l-bat Dec 29, 2022
d04fcb8
Add graph tests
l-bat Dec 29, 2022
4431aee
Add docstring
l-bat Jan 3, 2023
017200b
Fix comments
l-bat Jan 4, 2023
c3a0d5c
Add comparator for OV models
l-bat Jan 9, 2023
59de220
Add references
l-bat Jan 9, 2023
f94295c
Minor fixes
l-bat Jan 12, 2023
120d92f
Broadcast FQ values and support FP16 models
l-bat Jan 16, 2023
9d666ab
Update references
l-bat Jan 16, 2023
9f4001b
pylint
l-bat Jan 16, 2023
b8cb3eb
fix test
l-bat Jan 16, 2023
f2a02fd
Update dates
l-bat Jan 17, 2023
8ec6112
rebase
l-bat Jan 17, 2023
34fbe43
fix pylint
l-bat Jan 18, 2023
fdc7d02
Refactoring
l-bat Jan 18, 2023
9b59a99
regen stats
l-bat Jan 18, 2023
40d14d4
Fixed OV NNCF graph builder
l-bat Jan 18, 2023
c9af10d
Change Copyright year
l-bat Jan 19, 2023
c4de3fb
fix imports
l-bat Jan 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix tests
  • Loading branch information
@l-bat
l-bat committed Jan 18, 2023
commit a4208d0b925e2093b57e8abe39781d465c8a01fb
29 changes: 13 additions & 16 deletions tests/openvino/native/test_metatypes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,8 @@
limitations under the License.
"""

from collections import Counter

import pytest
from collections import Counter

from nncf.common.graph.operator_metatypes import InputNoopMetatype
from nncf.common.graph.operator_metatypes import OutputNoopMetatype
Expand All @@ -27,8 +26,6 @@
from nncf.experimental.openvino_native.graph.metatypes.openvino_metatypes import OVReshapeMetatype
from nncf.experimental.openvino_native.graph.metatypes.openvino_metatypes import OVSubtractMetatype
from nncf.experimental.openvino_native.graph.metatypes.openvino_metatypes import OVTransposeMetatype
from nncf.experimental.openvino_native.graph.metatypes.openvino_metatypes import GENERAL_WEIGHT_LAYER_METATYPES

from nncf.experimental.openvino_native.graph.nncf_graph_builder import GraphConverter

from tests.openvino.native.models import ConvModel
Expand Down Expand Up @@ -56,19 +53,19 @@ def test_mapping_openvino_metatypes(model_creator_func, ref_metatypes):


REF_WEIGHTS_PORT_IDS = {
'Conv': 1,
'Conv_backprop': 1,
'MatMul_1': 1,
'MatMul_0': 0,
'Conv': 1,
'Conv_backprop': 1,
'MatMul_1': 1,
'MatMul_0': 0,
}


def test_determining_weights_port():
model = WeightsModel().ov_model
nncf_graph = GraphConverter.create_nncf_graph(model)
counter = 0
for node in nncf_graph.get_all_nodes():
if node.layer_attributes is not None:
counter += 1
assert node.layer_attributes.weight_port_id == REF_WEIGHTS_PORT_IDS[node.node_name]
assert counter == len(REF_WEIGHTS_PORT_IDS)
model = WeightsModel().ov_model
nncf_graph = GraphConverter.create_nncf_graph(model)
counter = 0
for node in nncf_graph.get_all_nodes():
if node.layer_attributes is not None:
counter += 1
assert node.layer_attributes.weight_port_id == REF_WEIGHTS_PORT_IDS[node.node_name]
assert counter == len(REF_WEIGHTS_PORT_IDS)
17 changes: 6 additions & 11 deletions tests/openvino/native/test_statistics_aggregator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,13 @@
"""

import pytest

from typing import List, Tuple

import numpy as np

from nncf import Dataset

from nncf.quantization.algorithms.definitions import RangeType
from nncf.quantization.algorithms.min_max.algorithm import MinMaxQuantizationParameters
from nncf.quantization.algorithms.min_max.algorithm import MinMaxQuantization
from nncf.quantization.algorithms.post_training.algorithm import PostTrainingQuantization
from nncf.quantization.algorithms.post_training.algorithm import PostTrainingQuantizationParameters
from nncf.experimental.openvino_native.statistics.aggregator import OVStatisticsAggregator

from tests.openvino.native.models import LinearModel
Expand All @@ -34,14 +29,14 @@
np.zeros(INPUT_SHAPE, dtype=np.float32),
np.zeros(INPUT_SHAPE, dtype=np.float32)]

DATASET_SAMPLES[0][0][0, 0, 0, 0] = 128 # max
DATASET_SAMPLES[0][0][0, 0, 0, 1] = -128 # min
DATASET_SAMPLES[0][0, 0, 0, 0] = 128 # max
DATASET_SAMPLES[0][0, 0, 0, 1] = -128 # min

DATASET_SAMPLES[1][0][0, 0, 0, 0] = 1 # max
DATASET_SAMPLES[1][0][0, 0, 0, 1] = -10 # min
DATASET_SAMPLES[1][0, 0, 0, 0] = 1 # max
DATASET_SAMPLES[1][0, 0, 0, 1] = -10 # min

DATASET_SAMPLES[2][0][0, 0, 0, 0] = 0.1 # max
DATASET_SAMPLES[2][0][0, 0, 0, 1] = -1 # min
DATASET_SAMPLES[2][0, 0, 0, 0] = 0.1 # max
DATASET_SAMPLES[2][0, 0, 0, 1] = -1 # min


class TestParameters:
Expand Down