Skip to content

Commit 595246d

Browse files
authoredNov 21, 2024
Support NNCF 2.14 and OV 2024.5 (#997)
* Tweak reference values * Update requirements to OV 2024.5 * Update tokenizers condition in tests * Fix condition * Trigger Tests * Trigger Tests
1 parent f755590 commit 595246d

File tree

3 files changed

+12
-11
lines changed

3 files changed

+12
-11
lines changed
 

‎setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262

6363
EXTRAS_REQUIRE = {
6464
"nncf": ["nncf>=2.11.0"],
65-
"openvino": ["nncf>=2.11.0", "openvino==2024.4.1.dev20240926", "openvino-tokenizers==2024.4.1.0.dev20240926"],
65+
"openvino": ["nncf>=2.11.0", "openvino==2024.5.0", "openvino-tokenizers==2024.5.0"],
6666
"neural-compressor": ["neural-compressor[pt]>3.0", "accelerate", "transformers<4.46"],
6767
"ipex": ["intel-extension-for-pytorch", "transformers>=4.39,<4.45"],
6868
"diffusers": ["diffusers"],

‎tests/openvino/test_exporters_cli.py

+9-8
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
from optimum.intel.utils.import_utils import (
5151
compare_versions,
5252
is_openvino_tokenizers_available,
53+
is_openvino_version,
5354
is_tokenizers_version,
5455
is_transformers_version,
5556
)
@@ -80,20 +81,20 @@ class OVCLIExportTestCase(unittest.TestCase):
8081
if is_transformers_version(">=", "4.45"):
8182
SUPPORTED_ARCHITECTURES.extend([("text-to-image", "stable-diffusion-3"), ("text-to-image", "flux")])
8283
EXPECTED_NUMBER_OF_TOKENIZER_MODELS = {
83-
"gpt2": 2 if is_tokenizers_version("<", "0.20") else 0,
84+
"gpt2": 2 if is_tokenizers_version("<", "0.20") or is_openvino_version(">=", "2024.5") else 0,
8485
"t5": 0, # no .model file in the repository
8586
"albert": 0, # not supported yet
8687
"distilbert": 1, # no detokenizer
87-
"roberta": 2 if is_tokenizers_version("<", "0.20") else 0,
88+
"roberta": 2 if is_tokenizers_version("<", "0.20") or is_openvino_version(">=", "2024.5") else 0,
8889
"vit": 0, # no tokenizer for image model
8990
"wav2vec2": 0, # no tokenizer
9091
"bert": 1, # no detokenizer
91-
"blenderbot": 2 if is_tokenizers_version("<", "0.20") else 0,
92-
"stable-diffusion": 2 if is_tokenizers_version("<", "0.20") else 0,
93-
"stable-diffusion-xl": 4 if is_tokenizers_version("<", "0.20") else 0,
94-
"stable-diffusion-3": 6 if is_tokenizers_version("<", "0.20") else 2,
95-
"flux": 4 if is_tokenizers_version("<", "0.20") else 0,
96-
"llava": 2 if is_tokenizers_version("<", "0.20") else 0,
92+
"blenderbot": 2 if is_tokenizers_version("<", "0.20") or is_openvino_version(">=", "2024.5") else 0,
93+
"stable-diffusion": 2 if is_tokenizers_version("<", "0.20") or is_openvino_version(">=", "2024.5") else 0,
94+
"stable-diffusion-xl": 4 if is_tokenizers_version("<", "0.20") or is_openvino_version(">=", "2024.5") else 0,
95+
"stable-diffusion-3": 6 if is_tokenizers_version("<", "0.20") or is_openvino_version(">=", "2024.5") else 2,
96+
"flux": 4 if is_tokenizers_version("<", "0.20") or is_openvino_version(">=", "2024.5") else 0,
97+
"llava": 2 if is_tokenizers_version("<", "0.20") or is_openvino_version(">=", "2024.5") else 0,
9798
}
9899

99100
SUPPORTED_SD_HYBRID_ARCHITECTURES = [

‎tests/openvino/test_quantization.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ class OVWeightCompressionTest(unittest.TestCase):
258258
sensitivity_metric="mean_activation_magnitude",
259259
dataset=["one two, " * i for i in range(10)],
260260
),
261-
{"int4": 25, "int8": 14},
261+
{"int4": 24, "int8": 16},
262262
),
263263
(
264264
OVModelForCausalLM,
@@ -915,7 +915,7 @@ def preprocess_function(examples, tokenizer):
915915

916916

917917
class OVTrainerTest(unittest.TestCase):
918-
SUPPORTED_ARCHITECTURES_WITH_EXPECTED_QUANTIZED_MATMULS = (("albert", 64, 39),)
918+
SUPPORTED_ARCHITECTURES_WITH_EXPECTED_QUANTIZED_MATMULS = (("albert", 63, 39),)
919919

920920
@parameterized.expand(SUPPORTED_ARCHITECTURES_WITH_EXPECTED_QUANTIZED_MATMULS)
921921
@unittest.skipIf(

0 commit comments

Comments
 (0)