Merge pull request #9 from codewithdark-git/fix/awq-quantization-issues

Hi there! I've made some improvements to the AWQ quantization impleme…

Author: codewithdark-git

quantllm/quant/awq.py

@@ -90,7 +90,30 @@ def quantize(
                 self.logger.log_info(f"Processing layer: {name}")
 
                 # Get activation scale for this layer
-                act_scale = self.act_scales.get(name)
+                act_scale_list_or_tensor = self.act_scales.get(name)
+
+                if act_scale_list_or_tensor is not None:
+                    if isinstance(act_scale_list_or_tensor, list):
+                        if all(isinstance(t, torch.Tensor) for t in act_scale_list_or_tensor):
+                            # Average the list of tensors
+                            act_scale = torch.stack(act_scale_list_or_tensor).mean(dim=0)
+                        else:
+                            # Handle unexpected content in the list
+                            self.logger.log_error(f"Activation scales for {name} contain non-tensor elements. Quantization may be incorrect.")
+                            # Fallback: attempt to use the list directly if _quantize_layer can handle it, or create a default
+                            # For safety, creating a default scale here.
+                            act_scale = torch.ones(module.in_features, device=self.device_manager.primary_device)
+                    elif isinstance(act_scale_list_or_tensor, torch.Tensor):
+                        # If it's already a tensor (e.g., if averaging was done elsewhere or only one batch)
+                        act_scale = act_scale_list_or_tensor
+                    else:
+                        self.logger.log_error(f"Unexpected type for activation scales of {name}: {type(act_scale_list_or_tensor)}. Using default.")
+                        act_scale = torch.ones(module.in_features, device=self.device_manager.primary_device)
+                else:
+                    self.logger.log_warning(f"No activation scales found for {name}. Using default scale of 1.0.")
+                    # module.in_features should correspond to the expected dimension of the scale
+                    act_scale = torch.ones(module.in_features, device=self.device_manager.primary_device)
+                
                 quantized = self._quantize_layer(module, act_scale)
 
                 # Replace layer in model
@@ -135,10 +158,13 @@ def fn(module, input, output):
                       # Handle both 2D and 3D inputs
                       if len(x.shape) == 3:
                           # For 3D input (batch_size, seq_len, hidden_size)
-                          scale = torch.max(torch.abs(x.view(-1, x.size(-1))))
+                          # Compute scales per hidden channel: (hidden_size,)
+                          scale = torch.amax(torch.abs(x), dim=[0, 1])
                       else:
-                          scale = torch.max(torch.abs(x))
-                      # Store scale in our temporary dictionary
+                          # For 2D input (batch_size, hidden_size)
+                          # Compute scales per hidden channel: (hidden_size,)
+                          scale = torch.amax(torch.abs(x), dim=0)
+                      # Store scale tensor (moved to CPU) in our temporary dictionary
                       batch_scales[name].append(scale.cpu())
                   return fn
 
@@ -150,6 +176,7 @@ def fn(module, input, output):
       with torch.no_grad():
           data_on_device = move_to_device(data, self.device_manager.primary_device)
           self.model(data_on_device)
+          del data_on_device # Free memory after forward pass
 
       # Remove hooks
       for handle in handles:
@@ -158,12 +185,12 @@ def fn(module, input, output):
       # Process the collected scales
       for name in batch_scales:
           if batch_scales[name]:  # If we collected any scales for this layer
-              scales_tensor = torch.stack(batch_scales[name])
-              # If this is the first batch
+              # If this is the first batch for this layer
               if name not in self.act_scales:
                   self.act_scales[name] = []
-              # Add the processed scales to our main storage
-              self.act_scales[name].extend([s.item() for s in scales_tensor])
+              # Extend the list of scale tensors for this layer
+              # batch_scales[name] already contains CPU tensors
+              self.act_scales[name].extend(batch_scales[name])
 
       # Clean up
       del batch_scales
@@ -206,13 +233,43 @@ def _quantize_layer(
 
         # Ensure act_scale is on the same device as W before division
         act_scale_on_device = move_to_device(act_scale, W.device)
-        W = W / act_scale_on_device.view(1, -1)
+        
+        try:
+            W = W / act_scale_on_device.view(1, -1)
+        except RuntimeError as e:
+            error_message = (
+                f"Failed to scale weights with activation scales in _quantize_layer.\n"
+                f"  Weight (W) shape: {W.shape}\n"
+                f"  Activation scale (act_scale_on_device) shape: {act_scale_on_device.shape}\n"
+                f"  Original error: {str(e)}"
+            )
+            self.logger.log_error(error_message)
+            raise RuntimeError(error_message) from e
 
         # Compute quantization scales per group
         # All computations for scales and zero_points should happen on target_device
         if self.group_size > 0:
+            if W.shape[0] % self.group_size != 0:
+                error_message = (
+                    f"Weight dimension {W.shape[0]} is not divisible by group_size {self.group_size} "
+                    f"in _quantize_layer for layer being processed."
+                )
+                self.logger.log_error(error_message)
+                raise ValueError(error_message) # ValueError is more appropriate here
+
             n_groups = W.shape[0] // self.group_size
-            W_groups = W.view(n_groups, self.group_size, -1)
+            try:
+                W_groups = W.view(n_groups, self.group_size, -1)
+            except RuntimeError as e:
+                error_message = (
+                    f"Failed to create view for grouped weights in _quantize_layer.\n"
+                    f"  Weight (W) shape: {W.shape}\n"
+                    f"  Calculated n_groups: {n_groups}\n"
+                    f"  Group size: {self.group_size}\n"
+                    f"  Original error: {str(e)}"
+                )
+                self.logger.log_error(error_message)
+                raise RuntimeError(error_message) from e
 
             scales_list = [] # Renamed from scales to scales_list
             zero_points_list = [] if self.zero_point else None # Renamed
@@ -246,12 +303,14 @@ def _quantize_layer(
         # W, scales, zero_points are on target_device
         W_quant = torch.round(W * scales.view(-1, 1) - zero_points.view(-1, 1))
         W_quant = W_quant.to(torch.int8) # Cast to int8
+        del W # Free memory for W as it's no longer needed
 
         # Store quantized weights and parameters
         # quantized module and its buffers are already on target_device
         quantized.weight_quantized.copy_(W_quant) # W_quant is already on target_device and int8
         quantized.weight_scale.copy_(1.0 / scales) # scales is on target_device
         quantized.weight_zero_point.copy_(zero_points) # zero_points is on target_device
+        del scales, zero_points # Free memory for scales and zero_points
 
         # Store additional AWQ-specific information
         # Ensure act_scale is on the same device as the quantized layer's parameters

quantllm/quant/quantization_engine.py

@@ -572,9 +572,15 @@ def prepare_calibration_data(self, calibration_data: torch.Tensor) -> torch.Tens
 
         return calibration_data
 
+import gc # Moved import to top of file
+
+# ... (other imports and code) ...
+
+class BaseQuantizer:
+    # ... (other methods) ...
+
     def _clear_memory(self):
         """Clear GPU memory and run garbage collection."""
-        import gc
         gc.collect()
         if torch.cuda.is_available():
             torch.cuda.empty_cache()

quantllm/quant/tests/test_awq_quantizer.py

@@ -0,0 +1,153 @@
+import unittest
+import torch
+import torch.nn as nn
+from typing import List
+
+# Assuming AWQQuantizer and QuantizedLinear are accessible from this path
+# Adjust the import path based on your project structure if necessary
+from quantllm.quant.awq import AWQQuantizer
+from quantllm.quant.quantization_engine import QuantizedLinear, QuantizationConfig
+
+# 1. Dummy Model Definition
+class DummyModel(nn.Module):
+    def __init__(self, in_features, out_features, hidden_features):
+        super().__init__()
+        self.fc1 = nn.Linear(in_features, hidden_features)
+        self.relu = nn.ReLU()
+        self.fc2 = nn.Linear(hidden_features, out_features)
+
+    def forward(self, x):
+        # If input is 3D (batch, seq, features), flatten sequence for linear layers
+        original_shape = x.shape
+        if x.ndim == 3:
+            x = x.view(-1, original_shape[-1])
+        
+        x = self.relu(self.fc1(x))
+        x = self.fc2(x)
+
+        # Reshape back if original input was 3D
+        if len(original_shape) == 3:
+            x = x.view(original_shape[0], original_shape[1], -1)
+        return x
+
+class TestAWQQuantizer(unittest.TestCase):
+    def setUp(self):
+        self.in_features = 16
+        self.hidden_features = 32 # Must be divisible by group_size if group_size is not -1 or 1
+        self.out_features = 8
+        self.seq_len = 10
+        self.batch_size = 4
+
+        # Instantiate the dummy model
+        self.model = DummyModel(self.in_features, self.out_features, self.hidden_features)
+        self.model.eval() # Important for quantization
+
+        # Create dummy calibration data
+        # Shape: (batch_size, seq_len, in_features) - typical for NLP tasks
+        self.dummy_calibration_data = torch.randn(self.batch_size, self.seq_len, self.in_features)
+        
+        # Device configuration
+        self.device = torch.device("cuda" if torch.cuda.is_available() else "cpu")
+        self.model.to(self.device)
+        self.dummy_calibration_data = self.dummy_calibration_data.to(self.device)
+
+    def test_awq_scale_computation_and_application(self):
+        # Instantiate AWQQuantizer
+        # group_size chosen to be compatible with hidden_features for fc2's input
+        # and in_features for fc1's input if group_size were applied to fc1's weights
+        # For this test, group_size = -1 would also work if not testing grouping specifically for fc1.
+        # Let's use a group_size that divides in_features for fc1 and hidden_features for fc2
+        group_size = 16 # Divides self.in_features (16) and self.hidden_features (32)
+        
+        quantizer = AWQQuantizer(
+            model_name=self.model, # Pass the model instance
+            bits=4,
+            group_size=group_size, 
+            zero_point=True,
+            device=self.device
+        )
+
+        # --- Collect Activation Stats ---
+        # Process a single batch for simplicity in checking act_scales structure
+        # _collect_activation_stats expects a single batch
+        quantizer._collect_activation_stats(self.dummy_calibration_data[0].unsqueeze(0)) # Pass one sample from batch
+
+        # Assert: Check quantizer.act_scales
+        self.assertIn('fc1', quantizer.act_scales)
+        self.assertIn('fc2', quantizer.act_scales)
+
+        # For fc1
+        fc1_scales_list = quantizer.act_scales['fc1']
+        self.assertIsInstance(fc1_scales_list, list)
+        self.assertTrue(len(fc1_scales_list) > 0, "fc1_scales_list should not be empty")
+        for scale_tensor in fc1_scales_list:
+            self.assertIsInstance(scale_tensor, torch.Tensor)
+            self.assertEqual(scale_tensor.ndim, 1)
+            self.assertEqual(scale_tensor.shape[0], self.in_features) # in_features of fc1
+
+        # For fc2
+        fc2_scales_list = quantizer.act_scales['fc2']
+        self.assertIsInstance(fc2_scales_list, list)
+        self.assertTrue(len(fc2_scales_list) > 0, "fc2_scales_list should not be empty")
+        for scale_tensor in fc2_scales_list:
+            self.assertIsInstance(scale_tensor, torch.Tensor)
+            self.assertEqual(scale_tensor.ndim, 1)
+            self.assertEqual(scale_tensor.shape[0], self.hidden_features) # in_features of fc2
+
+        # --- Quantize Layer (Focusing on Scale Application for fc1) ---
+        layer_to_quantize_fc1 = self.model.fc1
+        act_scale_list_fc1 = quantizer.act_scales.get('fc1')
+        self.assertIsNotNone(act_scale_list_fc1)
+        self.assertIsInstance(act_scale_list_fc1, list)
+        
+        # Average the collected scales
+        act_scale_tensor_fc1 = torch.stack(act_scale_list_fc1).mean(dim=0)
+        
+        self.assertEqual(act_scale_tensor_fc1.ndim, 1)
+        self.assertEqual(act_scale_tensor_fc1.shape[0], self.in_features)
+
+        try:
+            quantized_layer_fc1 = quantizer._quantize_layer(layer_to_quantize_fc1, act_scale_tensor_fc1)
+        except RuntimeError as e:
+            self.fail(f"_quantize_layer raised RuntimeError unexpectedly: {e}")
+        
+        self.assertIsInstance(quantized_layer_fc1, QuantizedLinear)
+
+        # --- Full Quantization and Forward Pass (Integration Check) ---
+        # Re-instantiate quantizer for a clean full run or clear previous act_scales
+        quantizer_full = AWQQuantizer(
+            model_name=self.model, # Pass a new copy or re-initialize
+            bits=4,
+            group_size=group_size,
+            zero_point=True,
+            device=self.device
+        )
+        
+        try:
+            # Use the full calibration dataset and specify steps (can be number of batches)
+            quantized_model = quantizer_full.quantize(
+                calibration_data=self.dummy_calibration_data, 
+                calibration_steps=self.batch_size 
+            )
+        except Exception as e: # Catch any exception during full quantization
+            self.fail(f"quantizer.quantize raised an exception unexpectedly: {e}")
+
+        self.assertIsNotNone(quantized_model)
+        # Check if layers are replaced
+        self.assertIsInstance(quantized_model.fc1, QuantizedLinear)
+        self.assertIsInstance(quantized_model.fc2, QuantizedLinear)
+
+        # Perform a forward pass
+        sample_input = self.dummy_calibration_data[0].unsqueeze(0) # Take one sample
+        try:
+            output = quantized_model(sample_input.to(self.device))
+        except RuntimeError as e:
+            self.fail(f"Forward pass on quantized_model raised RuntimeError unexpectedly: {e}")
+
+        # Assert output shape
+        # Output shape should be (batch_size_sample, seq_len_sample, out_features)
+        # For sample_input: (1, self.seq_len, self.out_features)
+        self.assertEqual(output.shape, (1, self.seq_len, self.out_features))
+
+if __name__ == '__main__':
+    unittest.main()