Refactor sparse optimization code following DRY and single responsibility principles

- Split pack_bitmasks into modular functions with single responsibilities:
  - _validate_bitmask_shape(): Input validation
  - _pack_bits_torch(): Core PyTorch packing logic
  - _pack_bits_numpy_fallback(): NumPy fallback
- Refactored get_24_bytemasks with helper functions:
  - _validate_24_sparsity_tensor(): Tensor validation
  - _get_topk_mask(): Isolated mask generation algorithm
- Improved error messages with actual tensor dimensions
- Reduced test suite from 222 to 182 lines by removing redundancy
- Organized tests into focused classes by functionality
- All optimizations preserved, code is now more maintainable

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>

Author: rahul-tuli

src/compressed_tensors/compressors/sparse_compressors/sparse_24_bitmask.py

@@ -206,7 +206,38 @@ def sparse24_bitmask_decompress(
     return decompressed_tensor
 
 
-def get_24_bytemasks(tensor):
+def _validate_24_sparsity_tensor(tensor: torch.Tensor) -> None:
+    """
+    Validate that tensor is suitable for 2:4 sparsity.
+    
+    :param tensor: Input tensor to validate
+    :raises ValueError: If tensor size is not a multiple of 4
+    """
+    if tensor.numel() % 4 != 0:
+        raise ValueError(
+            f"Tensor size must be a multiple of 4 for 2:4 sparsity, "
+            f"got {tensor.numel()} elements"
+        )
+
+
+def _get_topk_mask(reshaped_tensor: torch.Tensor, k: int = 2) -> torch.Tensor:
+    """
+    Get mask for top-k elements per group based on absolute values.
+    
+    :param reshaped_tensor: Tensor reshaped into groups
+    :param k: Number of elements to keep per group
+    :return: Boolean mask tensor
+    """
+    abs_tensor = reshaped_tensor.abs()
+    # sorted=False provides performance improvement without affecting correctness
+    topk_indices = abs_tensor.topk(k, dim=1, largest=True, sorted=False).indices
+    
+    mask = torch.zeros_like(reshaped_tensor, dtype=torch.bool)
+    mask.scatter_(1, topk_indices, True)
+    return mask
+
+
+def get_24_bytemasks(tensor: torch.Tensor) -> torch.Tensor:
     """
     Generate a 2:4 sparsity mask for the given tensor.
 
@@ -222,22 +253,25 @@ def get_24_bytemasks(tensor):
     :raises ValueError: If the total number of elements in the tensor is not a
                         multiple of 4.
     """
+    # Validate input
+    _validate_24_sparsity_tensor(tensor)
+    
     original_dtype = tensor.dtype
+    original_shape = tensor.shape
+    
+    # Handle FP8 dtype by viewing as int8 for magnitude comparison
     if tensor.dtype == FP8_DTYPE:
         tensor = tensor.view(torch.int8)
-    original_shape = tensor.shape
-    num_elements = tensor.numel()
-
-    if num_elements % 4 != 0:
-        raise ValueError("Tensor size must be a multiple of 4 for TWO_FOUR sparsity")
-
+    
+    # Reshape into groups of 4 and get top-2 mask
     reshaped_tensor = tensor.view(-1, 4)
-    abs_tensor = reshaped_tensor.abs()
-    topk_indices = abs_tensor.topk(2, dim=1, largest=True, sorted=False).indices
-    mask = torch.zeros_like(reshaped_tensor, dtype=torch.bool)
-    mask.scatter_(1, topk_indices, True)
+    mask = _get_topk_mask(reshaped_tensor, k=2)
+    
+    # Restore original shape
     mask = mask.view(original_shape)
-    if tensor.dtype == torch.int8:
+    
+    # Restore tensor dtype if it was changed
+    if tensor.dtype == torch.int8 and original_dtype == FP8_DTYPE:
         tensor = tensor.view(original_dtype)
-
+    
     return mask

src/compressed_tensors/utils/helpers.py

@@ -293,39 +293,85 @@ def combine_shards(shards, dim=0):
     return combined
 
 
+def _validate_bitmask_shape(bytemasks: torch.Tensor) -> None:
+    """
+    Validates input tensor shape for bitmask packing.
+    
+    :param bytemasks: Input tensor to validate
+    :raises ValueError: If tensor is not 2D
+    """
+    if len(bytemasks.shape) != 2:
+        raise ValueError(
+            f"pack_bitmasks expects a 2D tensor, got shape {bytemasks.shape}"
+        )
+
+
+def _pack_bits_torch(bytemasks_uint8: torch.Tensor, rows: int, cols: int, 
+                     device: torch.device) -> torch.Tensor:
+    """
+    Pack bits using PyTorch operations.
+    
+    :param bytemasks_uint8: Boolean mask converted to uint8
+    :param rows: Number of rows in the mask
+    :param cols: Number of columns in the mask
+    :param device: Device to create the packed tensor on
+    :return: Packed bitmask tensor
+    """
+    packed_cols = (cols + 7) // 8
+    packed = torch.zeros(rows, packed_cols, dtype=torch.uint8, device=device)
+    
+    # Pack bits directly without padding
+    for i in range(cols):
+        packed[:, i // 8] |= bytemasks_uint8[:, i] << (i % 8)
+    
+    return packed
+
+
+def _pack_bits_numpy_fallback(bytemasks: torch.Tensor) -> torch.Tensor:
+    """
+    Fallback to NumPy implementation for compatibility.
+    
+    :param bytemasks: Input boolean mask tensor
+    :return: Packed bitmask tensor
+    """
+    if bytemasks.is_cuda:
+        bytemasks = bytemasks.cpu()
+    
+    packed_bits_numpy = numpy.packbits(bytemasks.numpy(), axis=-1, bitorder="little")
+    return torch.from_numpy(packed_bits_numpy)
+
+
 def pack_bitmasks(bytemasks: torch.Tensor) -> torch.Tensor:
     """
     Converts a bytemask tensor to a bitmask tensor to reduce memory. Shape RxC will be
-    compressed to R x ceil(C/8)
+    compressed to R x ceil(C/8).
+    
+    Supports both CPU and GPU tensors with automatic fallback to NumPy for compatibility.
 
-    :param bytemasks: mask tensor where each byte corresponds to a weight
-    :return: mask tensor where each bit corresounds to a weight
+    :param bytemasks: 2D boolean mask tensor where each element corresponds to a weight
+    :return: Packed mask tensor where each bit corresponds to a weight
+    :raises ValueError: If input tensor is not 2D
     """
+    # Validate input shape
+    _validate_bitmask_shape(bytemasks)
+    
     try:
         device = bytemasks.device
         dtype = bytemasks.dtype
 
+        # Ensure boolean type
         if dtype != torch.bool:
             bytemasks = bytemasks.bool()
 
         rows, cols = bytemasks.shape
-        packed_cols = (cols + 7) // 8
-        
         bytemasks_uint8 = bytemasks.to(torch.uint8)
-        packed = torch.zeros(rows, packed_cols, dtype=torch.uint8, device=device)
 
-        # Pack bits directly without padding
-        for i in range(cols):
-            packed[:, i // 8] |= bytemasks_uint8[:, i] << (i % 8)
-        
-        return packed
+        # Use PyTorch implementation
+        return _pack_bits_torch(bytemasks_uint8, rows, cols, device)
 
     except Exception:
-        if bytemasks.is_cuda:
-            bytemasks = bytemasks.cpu()
-        
-        packed_bits_numpy = numpy.packbits(bytemasks.numpy(), axis=-1, bitorder="little")
-        return torch.from_numpy(packed_bits_numpy)
+        # Fallback to NumPy for compatibility
+        return _pack_bits_numpy_fallback(bytemasks)
 
 
 def unpack_bitmasks(