Merge branch 'k_quant' of https://github.com/jiafatom/neural-compressor into k_quant

Author: jiafatom

neural_compressor/adaptor/ox_utils/weight_only.py

@@ -246,6 +246,7 @@ def quant_tensor(data, num_bits=4, group_size=32, scheme="asym", dtype="int", ra
 
     return q_weight, scale, zero_point
 
+
 def quant_tensor_k_quant_cpu(data, num_bits=4, group_size=32):
     """Quantize tensor per group based on k quant.
     Ref: https://github.com/ggml-org/llama.cpp/blob/64eda5deb9859e87a020e56bab5d2f9ca956f1de/ggml/src/ggml-quants.c
@@ -307,7 +308,7 @@ def quant_tensor_k_quant_cpu(data, num_bits=4, group_size=32):
         scale[idx_to_replace] = this_scale[idx_to_replace]
         rmin[idx_to_replace] = this_min[idx_to_replace]
 
-    zero_point = np.clip((( - rmin) / scale).round(), 0, maxq).astype("uint8")
+    zero_point = np.clip(((-rmin) / scale).round(), 0, maxq).astype("uint8")
     scale = scale.astype(np.float64)
     q_weight = np.empty_like(data, dtype=scale.dtype)
     np.divide(data, scale, out=q_weight)
@@ -334,45 +335,46 @@ def quant_tensor_k_quant_cuda(data, num_bits=4, group_size=32):
     try:
         import cupy as cp
         import torch
+
         if torch.cuda.is_available():
             data = cp.asarray(data)
-            data = data.reshape((-1, group_size)).astype(cp.float32)   # nb = data.shape[0], (nb, group_size)
+            data = data.reshape((-1, group_size)).astype(cp.float32)  # nb = data.shape[0], (nb, group_size)
             maxq = 2**num_bits - 1
             minq = 0
-            sum_x2 = cp.sum(data**2, axis=1, keepdims=True) # (nb, 1)
-            av_x = cp.sqrt(sum_x2 / group_size) # (nb, 1)
-            weights = cp.add(av_x, cp.abs(data)) # (nb, group_size)
-            rmin = cp.min(data, axis=1, keepdims=True) # (nb, 1)
-            rmax = cp.max(data, axis=1, keepdims=True) # (nb, 1)
-            sum_w = cp.sum(weights, axis=1, keepdims=True) # (nb, 1)
-            sum_x = cp.sum(weights * data, axis=1, keepdims=True) # (nb, group_size)
-            iscale = cp.ones(rmax.shape, dtype=data.dtype) # (nb, 1)
+            sum_x2 = cp.sum(data**2, axis=1, keepdims=True)  # (nb, 1)
+            av_x = cp.sqrt(sum_x2 / group_size)  # (nb, 1)
+            weights = cp.add(av_x, cp.abs(data))  # (nb, group_size)
+            rmin = cp.min(data, axis=1, keepdims=True)  # (nb, 1)
+            rmax = cp.max(data, axis=1, keepdims=True)  # (nb, 1)
+            sum_w = cp.sum(weights, axis=1, keepdims=True)  # (nb, 1)
+            sum_x = cp.sum(weights * data, axis=1, keepdims=True)  # (nb, group_size)
+            iscale = cp.ones(rmax.shape, dtype=data.dtype)  # (nb, 1)
             mask = rmin != rmax
             iscale[mask] = (maxq - minq) / (rmax[mask] - rmin[mask])
             scale = 1 / iscale
-            quant_data = cp.clip(cp.round(iscale * (data - rmin)), minq, maxq) # (nb, group_size)
-            diff = scale * quant_data + rmin - data # (nb, group_size)
-            best_mad = cp.sum(weights * diff ** 2, axis=1, keepdims=True) # (nb, 1)
+            quant_data = cp.clip(cp.round(iscale * (data - rmin)), minq, maxq)  # (nb, group_size)
+            diff = scale * quant_data + rmin - data  # (nb, group_size)
+            best_mad = cp.sum(weights * diff**2, axis=1, keepdims=True)  # (nb, 1)
             nstep = 20
             rdelta = 0.1
             rrmin = -1
             for is_ in range(nstep):
-                iscale_new = cp.ones(rmax.shape, dtype=data.dtype) # (nb, 1)
+                iscale_new = cp.ones(rmax.shape, dtype=data.dtype)  # (nb, 1)
                 factor = cp.array([rrmin + rdelta * is_ + maxq - minq]).astype(data.dtype)[0]
                 mask = rmin != rmax
                 iscale_new[mask] = factor / (rmax[mask] - rmin[mask])
-                quant_data_new = cp.clip(cp.round(iscale_new * (data - rmin)), minq, maxq) # (nb, group_size)
+                quant_data_new = cp.clip(cp.round(iscale_new * (data - rmin)), minq, maxq)  # (nb, group_size)
                 mul_weights_quant_data_new = weights * quant_data_new
-                sum_l = cp.sum(mul_weights_quant_data_new, axis=1, keepdims=True) # (nb, 1)
-                sum_l2 = cp.sum(mul_weights_quant_data_new * quant_data_new, axis=1, keepdims=True) # (nb, 1)
-                sum_xl = cp.sum(mul_weights_quant_data_new * data, axis=1, keepdims=True) # (nb, 1)
-                D = cp.subtract(sum_w * sum_l2, sum_l ** 2) # (nb, 1)
+                sum_l = cp.sum(mul_weights_quant_data_new, axis=1, keepdims=True)  # (nb, 1)
+                sum_l2 = cp.sum(mul_weights_quant_data_new * quant_data_new, axis=1, keepdims=True)  # (nb, 1)
+                sum_xl = cp.sum(mul_weights_quant_data_new * data, axis=1, keepdims=True)  # (nb, 1)
+                D = cp.subtract(sum_w * sum_l2, sum_l**2)  # (nb, 1)
 
-                this_scale = (sum_w * sum_xl - sum_x * sum_l) / D # (nb, 1)
-                this_min = (sum_l2 * sum_x - sum_l * sum_xl) / D # (nb, 1)
+                this_scale = (sum_w * sum_xl - sum_x * sum_l) / D  # (nb, 1)
+                this_min = (sum_l2 * sum_x - sum_l * sum_xl) / D  # (nb, 1)
 
-                diff = this_scale * quant_data_new + this_min - data # (nb, group_size)
-                mad = cp.sum(weights * diff ** 2, axis=1, keepdims=True) # (nb, 1)
+                diff = this_scale * quant_data_new + this_min - data  # (nb, group_size)
+                mad = cp.sum(weights * diff**2, axis=1, keepdims=True)  # (nb, 1)
 
                 mad_1 = cp.array(mad)
                 best_mad_1 = cp.array(best_mad)
@@ -382,7 +384,7 @@ def quant_tensor_k_quant_cuda(data, num_bits=4, group_size=32):
                 scale[idx_to_replace] = this_scale[idx_to_replace]
                 rmin[idx_to_replace] = this_min[idx_to_replace]
 
-            zero_point = cp.clip((( - rmin) / scale).round(), 0, maxq).astype("uint8")
+            zero_point = cp.clip(((-rmin) / scale).round(), 0, maxq).astype("uint8")
             scale = scale.astype(cp.float64)
             q_weight = cp.empty_like(data, dtype=scale.dtype)
             cp.divide(data, scale, out=q_weight)
@@ -392,20 +394,18 @@ def quant_tensor_k_quant_cuda(data, num_bits=4, group_size=32):
 
             return q_weight.get(), scale.get(), zero_point.get()
         else:
-            logger.warning("Try to use k-quant quantization on CUDA. However, CUDA is not available." \
-                           "Fall back to k-quant quantization on CPU.")
-            return quant_tensor_k_quant_cpu(
-                data, num_bits, group_size
+            logger.warning(
+                "Try to use k-quant quantization on CUDA. However, CUDA is not available."
+                "Fall back to k-quant quantization on CPU."
             )
+            return quant_tensor_k_quant_cpu(data, num_bits, group_size)
     except ImportError:
         logger.info(
-            "Now we are using k-quant quantization on cpu, which is time consuming." \
-            "Please consider install cupy to speed up on CUDA. See https://cupy.dev/" \
-            "Please also install torch to check CUDA availablity."
-            )
-        return quant_tensor_k_quant_cpu(
-            data, num_bits, group_size
+            "Now we are using k-quant quantization on cpu, which is time consuming."
+            "Please consider install cupy to speed up on CUDA. See https://cupy.dev/"
+            "Please also install torch to check CUDA availability."
         )
+        return quant_tensor_k_quant_cpu(data, num_bits, group_size)
 
 
 def qdq_tensor(data, num_bits=4, group_size=32, scheme="asym", dtype="int", ratio=1.0):