CUSTOMIZED_QUANTIZATION_CONFIG is updated

Author: daniil-lyakhov

tests/openvino/test_training.py

@@ -276,24 +276,21 @@ def tearDown(self):
         shutil.rmtree(self.output_dir)
 
 
-TINY_RANDOM_BERT_CUSTOMIZED_QUANTIZATION_CONFIG = {
-    "algorithm": "quantization",
-    "overflow_fix": "disable",
-    "initializer": {
-        "range": {
-            "num_init_samples": 16,
-            "type": "percentile",
-            "params": {"min_percentile": 0.01, "max_percentile": 99.99},
+CUSTOMIZED_QUANTIZATION_CONFIG = deepcopy(DEFAULT_QUANTIZATION_CONFIG)
+CUSTOMIZED_QUANTIZATION_CONFIG.update(
+    {
+        "overflow_fix": "disable",
+        "initializer": {
+            "range": {
+                "num_init_samples": 16,
+                "type": "percentile",
+                "params": {"min_percentile": 0.01, "max_percentile": 99.99},
+            },
+            "batchnorm_adaptation": {"num_bn_adaptation_samples": 4},
         },
-        "batchnorm_adaptation": {"num_bn_adaptation_samples": 4},
-    },
-    "scope_overrides": {"activations": {"{re}.*matmul_0": {"mode": "asymmetric"}}},
-    "ignored_scopes": [
-        "BertForSequenceClassification/BertModel[bert]/__rsub___0",
-        "BertForSequenceClassification/BertModel[bert]/__mul___0",
-        "{re}BertLayer\\[[0-9]+\\]/BertAttention\\[attention\\]/BertSelfAttention\\[self\\]/__add___0",
-    ],
-}
+        "scope_overrides": {"activations": {"{re}.*matmul_0": {"mode": "asymmetric"}}},
+    }
+)
 
 STRUCTURED_MOVEMENT_SPARSITY_CONFIG_FOR_BERT = {
     "algorithm": "movement_sparsity",
@@ -339,17 +336,17 @@ def tearDown(self):
     ),
     "customized_quantization": OVTrainerTestDescriptor(
         model_id="hf-internal-testing/tiny-random-bert",
-        nncf_compression_config=TINY_RANDOM_BERT_CUSTOMIZED_QUANTIZATION_CONFIG,
-        expected_fake_quantize=64,
-        expected_int8=35,
+        nncf_compression_config=CUSTOMIZED_QUANTIZATION_CONFIG,
+        expected_fake_quantize=44,
+        expected_int8=32,
         compression_metrics=["compression_loss"],
     ),
     "distillation,customized_quantization": OVTrainerTestDescriptor(
         model_id="hf-internal-testing/tiny-random-bert",
         teacher_model_id="hf-internal-testing/tiny-random-bert",
-        nncf_compression_config=TINY_RANDOM_BERT_CUSTOMIZED_QUANTIZATION_CONFIG,
-        expected_fake_quantize=64,
-        expected_int8=35,
+        nncf_compression_config=CUSTOMIZED_QUANTIZATION_CONFIG,
+        expected_fake_quantize=44,
+        expected_int8=32,
         compression_metrics=["compression_loss", "distillation_loss", "task_loss"],
     ),
     "structured_movement_sparsity": OVTrainerTestDescriptor(
@@ -376,11 +373,11 @@ def tearDown(self):
     "customized_quantization,structured_movement_sparsity": OVTrainerTestDescriptor(
         model_id="hf-internal-testing/tiny-random-bert",
         nncf_compression_config=[
-            TINY_RANDOM_BERT_CUSTOMIZED_QUANTIZATION_CONFIG,
+            CUSTOMIZED_QUANTIZATION_CONFIG,
             STRUCTURED_MOVEMENT_SPARSITY_CONFIG_FOR_BERT,
         ],
-        expected_fake_quantize=64,
-        expected_int8=35,
+        expected_fake_quantize=44,
+        expected_int8=32,
         expected_binary_masks=60,
         compression_metrics=["compression_loss"],
     ),
@@ -397,11 +394,11 @@ def tearDown(self):
         model_id="hf-internal-testing/tiny-random-bert",
         teacher_model_id="hf-internal-testing/tiny-random-bert",
         nncf_compression_config=[
-            TINY_RANDOM_BERT_CUSTOMIZED_QUANTIZATION_CONFIG,
+            CUSTOMIZED_QUANTIZATION_CONFIG,
             STRUCTURED_MOVEMENT_SPARSITY_CONFIG_FOR_BERT,
         ],
-        expected_fake_quantize=64,
-        expected_int8=35,
+        expected_fake_quantize=44,
+        expected_int8=32,
         expected_binary_masks=60,
         compression_metrics=["compression_loss", "distillation_loss", "task_loss"],
     ),
@@ -429,11 +426,11 @@ def tearDown(self):
     "customized_quantization,unstructured_movement_sparsity": OVTrainerTestDescriptor(
         model_id="hf-internal-testing/tiny-random-bert",
         nncf_compression_config=[
-            TINY_RANDOM_BERT_CUSTOMIZED_QUANTIZATION_CONFIG,
+            CUSTOMIZED_QUANTIZATION_CONFIG,
             UNSTRUCTURED_MOVEMENT_SPARSITY_CONFIG_FOR_BERT,
         ],
-        expected_fake_quantize=64,
-        expected_int8=35,
+        expected_fake_quantize=44,
+        expected_int8=32,
         expected_binary_masks=60,
         compression_metrics=["compression_loss"],
     ),
@@ -450,11 +447,11 @@ def tearDown(self):
         model_id="hf-internal-testing/tiny-random-bert",
         teacher_model_id="hf-internal-testing/tiny-random-bert",
         nncf_compression_config=[
-            TINY_RANDOM_BERT_CUSTOMIZED_QUANTIZATION_CONFIG,
+            CUSTOMIZED_QUANTIZATION_CONFIG,
             UNSTRUCTURED_MOVEMENT_SPARSITY_CONFIG_FOR_BERT,
         ],
-        expected_fake_quantize=64,
-        expected_int8=35,
+        expected_fake_quantize=44,
+        expected_int8=32,
         expected_binary_masks=60,
         compression_metrics=["compression_loss", "distillation_loss", "task_loss"],
     ),