Remove unnecessary runtime asserts from linear layers (#41729)
Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
This commit is contained in:
@@ -268,10 +268,13 @@ class LinearBase(PluggableLayer):
|
|||||||
self.quant_config = quant_config
|
self.quant_config = quant_config
|
||||||
self.prefix = prefix
|
self.prefix = prefix
|
||||||
self.allow_fp8_block_shape_mismatch = False
|
self.allow_fp8_block_shape_mismatch = False
|
||||||
|
self.quant_method: QuantizeMethodBase
|
||||||
if quant_config is None:
|
if quant_config is None:
|
||||||
self.quant_method: QuantizeMethodBase | None = UnquantizedLinearMethod()
|
self.quant_method = UnquantizedLinearMethod()
|
||||||
|
elif quant_method := quant_config.get_quant_method(self, prefix=prefix):
|
||||||
|
self.quant_method = quant_method
|
||||||
else:
|
else:
|
||||||
self.quant_method = quant_config.get_quant_method(self, prefix=prefix)
|
raise ValueError("All linear layers should support quant method.")
|
||||||
self.return_bias = return_bias
|
self.return_bias = return_bias
|
||||||
self.disable_tp = disable_tp
|
self.disable_tp = disable_tp
|
||||||
self.tp_rank = get_tensor_model_parallel_rank() if not disable_tp else 0
|
self.tp_rank = get_tensor_model_parallel_rank() if not disable_tp else 0
|
||||||
@@ -335,8 +338,6 @@ class ReplicatedLinear(LinearBase):
|
|||||||
disable_tp=disable_tp,
|
disable_tp=disable_tp,
|
||||||
)
|
)
|
||||||
|
|
||||||
# All the linear layer supports quant method.
|
|
||||||
assert self.quant_method is not None
|
|
||||||
self.quant_method.create_weights(
|
self.quant_method.create_weights(
|
||||||
self,
|
self,
|
||||||
self.input_size,
|
self.input_size,
|
||||||
@@ -389,7 +390,6 @@ class ReplicatedLinear(LinearBase):
|
|||||||
x: torch.Tensor,
|
x: torch.Tensor,
|
||||||
) -> torch.Tensor | tuple[torch.Tensor, Parameter | None]:
|
) -> torch.Tensor | tuple[torch.Tensor, Parameter | None]:
|
||||||
bias = self.bias if not self.skip_bias_add else None
|
bias = self.bias if not self.skip_bias_add else None
|
||||||
assert self.quant_method is not None
|
|
||||||
|
|
||||||
output = self.quant_method.apply(self, x, bias)
|
output = self.quant_method.apply(self, x, bias)
|
||||||
|
|
||||||
@@ -474,7 +474,6 @@ class ColumnParallelLinear(LinearBase):
|
|||||||
self._maybe_allow_fp8_block_shape_mismatch()
|
self._maybe_allow_fp8_block_shape_mismatch()
|
||||||
self.gather_output = gather_output
|
self.gather_output = gather_output
|
||||||
|
|
||||||
assert self.quant_method is not None
|
|
||||||
self.quant_method.create_weights(
|
self.quant_method.create_weights(
|
||||||
layer=self,
|
layer=self,
|
||||||
input_size_per_partition=self.input_size_per_partition,
|
input_size_per_partition=self.input_size_per_partition,
|
||||||
@@ -583,7 +582,6 @@ class ColumnParallelLinear(LinearBase):
|
|||||||
bias = self.bias if not self.skip_bias_add else None
|
bias = self.bias if not self.skip_bias_add else None
|
||||||
|
|
||||||
# Matrix multiply.
|
# Matrix multiply.
|
||||||
assert self.quant_method is not None
|
|
||||||
output_parallel = self.quant_method.apply(self, input_, bias)
|
output_parallel = self.quant_method.apply(self, input_, bias)
|
||||||
|
|
||||||
if self.gather_output and self.tp_size > 1:
|
if self.gather_output and self.tp_size > 1:
|
||||||
@@ -1463,7 +1461,6 @@ class RowParallelLinear(LinearBase):
|
|||||||
self.input_is_parallel = input_is_parallel
|
self.input_is_parallel = input_is_parallel
|
||||||
self.reduce_results = reduce_results
|
self.reduce_results = reduce_results
|
||||||
|
|
||||||
assert self.quant_method is not None
|
|
||||||
self.quant_method.create_weights(
|
self.quant_method.create_weights(
|
||||||
layer=self,
|
layer=self,
|
||||||
input_size_per_partition=self.input_size_per_partition,
|
input_size_per_partition=self.input_size_per_partition,
|
||||||
@@ -1553,7 +1550,6 @@ class RowParallelLinear(LinearBase):
|
|||||||
input_parallel = split_input[self.tp_rank].contiguous()
|
input_parallel = split_input[self.tp_rank].contiguous()
|
||||||
|
|
||||||
# Matrix multiply.
|
# Matrix multiply.
|
||||||
assert self.quant_method is not None
|
|
||||||
# Only fuse bias add into GEMM for rank 0 (this ensures that
|
# Only fuse bias add into GEMM for rank 0 (this ensures that
|
||||||
# bias will not get added more than once in TP>1 case)
|
# bias will not get added more than once in TP>1 case)
|
||||||
bias_ = None if (self.tp_rank > 0 or self.skip_bias_add) else self.bias
|
bias_ = None if (self.tp_rank > 0 or self.skip_bias_add) else self.bias
|
||||||
|
|||||||
Reference in New Issue
Block a user