PTQ-Level Efficiency, QAT-Level Accuracy | 训练后量化的效率,量化感知训练的精度
fix: match layer names ending with a digit in ignore_layers (#2435)
Alexandre Kohler5aef837ed0ef
diff --git a/auto_round/compressors/layer_config_resolver.py b/auto_round/compressors/layer_config_resolver.pyindex 4a70576e2..1be0d2912 100644--- a/auto_round/compressors/layer_config_resolver.py+++ b/auto_round/compressors/layer_config_resolver.py@@ -205,7 +205,13 @@ def _resolve_layer_config_presets(ignore_layer_patterns = set()if ignore_layers:ignore_layers = ignore_layers.replace(" ", "").split(",")- ignore_layers = [name + "." if name[-1].isdigit() else name for name in ignore_layers]+ # "layers.1" -> "layers.1." so it does not also match "layers.10", but only when modules sit+ # under that name; a layer whose own name ends with a digit (e.g. "fc1") is kept as is.+ module_names = [n for n, _ in model.named_modules()]+ ignore_layers = [+ name + "." if name[-1].isdigit() and any(name + "." in n for n in module_names) else name+ for name in ignore_layers+ ]ignore_layer_patterns = set(ignore_layers)# 1. ignore_layers -> force 16diff --git a/test/unit/common/utils/test_set_layer_config.py b/test/unit/common/utils/test_set_layer_config.pyindex 45fdbfdcb..6d44d768f 100644--- a/test/unit/common/utils/test_set_layer_config.py+++ b/test/unit/common/utils/test_set_layer_config.py@@ -116,6 +116,13 @@ class TestIgnoreLayersDigitSuffix:assert layer_config["layers.0.fc1"]["bits"] == 16assert layer_config["layers.0.fc2"]["bits"] == 16+ def test_layer_name_ending_with_digit(self, model_12layers):+ """'fc1' and 'layers.0.fc2' end with a digit but name layers, so they must still be ignored."""+ layer_config, _, _ = _call_set_layer_config(model_12layers, ignore_layers="fc1,layers.0.fc2")+ assert layer_config["layers.11.fc1"]["bits"] == 16+ assert layer_config["layers.0.fc2"]["bits"] == 16+ assert layer_config["layers.1.fc2"]["bits"] == 4+class TestUnmatchedLayerConfigWarns:"""An unrecognised key in layer_config must trigger a warning, not ValueError."""