Skip to content

Commit 902e145

Browse files
Update test to pass on NNCF develop (#1326)
1 parent cedd9f3 commit 902e145

File tree

2 files changed

+13
-1
lines changed

2 files changed

+13
-1
lines changed

optimum/intel/utils/import_utils.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -390,6 +390,15 @@ def is_openvino_version(operation: str, version: str):
390390
return compare_versions(parse(_openvino_version), operation, version)
391391

392392

393+
def is_nncf_version(operation: str, version: str):
394+
"""
395+
Compare the current NNCF version to a given reference with an operation.
396+
"""
397+
if not _nncf_available:
398+
return False
399+
return compare_versions(parse(_nncf_version), operation, version)
400+
401+
393402
def is_openvino_tokenizers_version(operation: str, version: str):
394403
if not is_openvino_available():
395404
return False

tests/openvino/test_exporters_cli.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
from optimum.intel.openvino.utils import _HEAD_TO_AUTOMODELS, TemporaryDirectory
6161
from optimum.intel.utils.import_utils import (
6262
compare_versions,
63+
is_nncf_version,
6364
is_openvino_tokenizers_available,
6465
is_openvino_version,
6566
is_tokenizers_version,
@@ -932,7 +933,9 @@ def test_exporters_cli_4bit(
932933

933934
check_compression_state_per_model(self, model.ov_submodels, expected_num_weight_nodes_per_model)
934935

935-
self.assertTrue("--awq" not in option or b"Applying AWQ" in result.stdout)
936+
# Starting from NNCF 2.17 there is a support for data-free AWQ
937+
awq_str = b"Applying data-aware AWQ" if is_nncf_version(">", "2.16") else b"Applying AWQ"
938+
self.assertTrue("--awq" not in option or awq_str in result.stdout)
936939
self.assertTrue("--scale-estimation" not in option or b"Applying Scale Estimation" in result.stdout)
937940
self.assertTrue("--gptq" not in option or b"Applying GPTQ" in result.stdout)
938941
self.assertTrue(

0 commit comments

Comments
 (0)