-
Notifications
You must be signed in to change notification settings - Fork 872
[cortex_m] Fix linear weight layout: transpose in AOT pass, align meta/ref impl #16782
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -33,14 +33,19 @@ class ConvertToCortexMPass(XNNPACKPass): | |
| by call_operator. | ||
| """ | ||
|
|
||
| def _compute_kernel_sum(self, weights, bias, input_offset, weight_offset): | ||
| def _compute_kernel_sum( | ||
| self, weights_transposed, bias, input_offset, weight_offset | ||
| ): | ||
| """ | ||
| Computes the precomputed kernel sum term (bias optional) | ||
| a * sum_j(wij + b) + ci | ||
|
|
||
| for i = (1, ..., n), where j indexes the input activations. | ||
|
|
||
| Args: | ||
| weights_transposed: Weights already in [in_features, out_features] format | ||
| """ | ||
| weights_transposed = weights.T | ||
| # No transpose needed - weights already transposed by caller | ||
| weights_int32 = weights_transposed.to(torch.int32) | ||
| offset_weights = weights_int32 + weight_offset | ||
| kernel_sum = torch.sum(offset_weights, dim=0, keepdim=True, dtype=torch.int32) | ||
|
|
@@ -110,8 +115,12 @@ def _get_linear_replacement(self, node): | |
| if len(node.args) > 2 | ||
| else None | ||
| ) | ||
| # Transpose weights once from PyTorch format [out_features, in_features] | ||
| # to CMSIS-NN format [in_features, out_features] | ||
| weights_transposed = weights_tensor.T.contiguous() | ||
| # Pass already-transposed weights to kernel_sum computation | ||
| kernel_sum_tensor = self._compute_kernel_sum( | ||
| weights_tensor, bias_tensor, -input_zp, -weight_zp | ||
| weights_transposed, bias_tensor, -input_zp, -weight_zp | ||
| ) | ||
|
Comment on lines
+118
to
124
|
||
| with node.graph.inserting_after(weights): | ||
| kernel_sum = create_constant_placeholder( | ||
|
|
@@ -122,9 +131,17 @@ def _get_linear_replacement(self, node): | |
| kernel_sum_tensor, | ||
| ) | ||
|
|
||
| weights_transposed_node = create_constant_placeholder( | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Delete old weights here if they have no users left?
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Good point, will thoroughly test and provide fix in follow up PR : #16866 |
||
| self.exported_program, | ||
| node.graph, | ||
| node.name + "_weights_transposed", | ||
| InputKind.PARAMETER, | ||
| weights_transposed, | ||
| ) | ||
|
|
||
| args = ( | ||
| node.args[0], | ||
| weights, | ||
| weights_transposed_node, | ||
| None, | ||
| kernel_sum, | ||
| -input_zp, | ||
|
|
||
Uh oh!
There was an error while loading. Please reload this page.