[Tests] GPTQ Actorder Resolution Tests

tests/llmcompressor/modifiers/quantization/test_base.py

@@ -1,26 +1,76 @@
-import unittest
+from contextlib import nullcontext
 
 import pytest
 
-from llmcompressor.modifiers.factory import ModifierFactory
-from llmcompressor.modifiers.quantization import QuantizationModifier
-from tests.llmcompressor.modifiers.conf import setup_modifier_factory
+from llmcompressor.modifiers.quantization import GPTQModifier
 
 
-@pytest.mark.unit
-class TestQuantizationRegistered(unittest.TestCase):
-    def setUp(self):
-        setup_modifier_factory()
-        self.kwargs = dict(
-            index=0, group="quantization", start=2.0, end=-1.0, config_groups={}
+@pytest.fixture
+def q_config_kwargs(config_0, config_1):
+    return dict(
+        config_groups=dict(
+            group_0=dict(
+                targets=["Linear"],
+                input_activations=dict(num_bits=8, symmetric=False, strategy="token"),
+                weights=dict(
+                    num_bits=4,
+                    symmetric=True,
+                    strategy="group",
+                    group_size=128,
+                    actorder=config_0,
+                ),
+            ),
+            group_1=dict(
+                targets=["Linear"],
+                input_activations=dict(num_bits=8, symmetric=False, strategy="token"),
+                weights=dict(
+                    num_bits=4,
+                    symmetric=True,
+                    strategy="group",
+                    group_size=128,
+                    actorder=config_1,
+                ),
+            ),
         )
+    )
 
-    def test_quantization_registered(self):
-        quant_obj = ModifierFactory.create(
-            type_="QuantizationModifier",
-            allow_experimental=False,
-            allow_registered=True,
-            **self.kwargs,
-        )
 
-        self.assertIsInstance(quant_obj, QuantizationModifier)
+@pytest.mark.parametrize(
+    "has_actorder,actorder,config_0,config_1,expected_0,expected_1",
+    [
+        # defaults to None if nothing provided
+        (False, None, None, None, None, None),
+        # modifier overrides config if no config provided
+        (True, "group", None, None, "group", "group"),
+        # modifier overrides if config partially matches anyways
+        (True, "group", None, "group", "group", "group"),
+        (True, "group", "group", None, "group", "group"),
+        # modifier errors if conflict with config
+        (True, "group", None, "static", "error", "error"),
+        (True, "group", "static", None, "error", "error"),
+        # modifier does not override if not provided
+        (False, "N/A", None, None, None, None),
+        (False, "N/A", None, "static", None, "static"),
+        (False, "N/A", "static", None, "static", None),
+        (False, "N/A", "static", "static", "static", "static"),
+        (False, "N/A", None, "group", None, "group"),
+        (False, "N/A", "group", None, "group", None),
+        (False, "N/A", "group", "group", "group", "group"),
+    ],
+)
+def test_actorder_resolution(
+    has_actorder, actorder, q_config_kwargs, expected_0, expected_1
+):
+    if has_actorder:
+        modifier = GPTQModifier(**q_config_kwargs, actorder=actorder)
+    else:
+        modifier = GPTQModifier(**q_config_kwargs)
+
+    with pytest.raises(ValueError) if expected_0 == "error" else nullcontext():
+        resolved = modifier.resolve_quantization_config()
+
+    if expected_0 != "error":
+        assert resolved.config_groups["group_0"].input_activations.actorder is None
+        assert resolved.config_groups["group_0"].weights.actorder == expected_0
+        assert resolved.config_groups["group_1"].input_activations.actorder is None
+        assert resolved.config_groups["group_1"].weights.actorder == expected_1