-
Notifications
You must be signed in to change notification settings - Fork 13.2k
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
[mlir][sparse] code formatting (NFC) #74779
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
@llvm/pr-subscribers-mlir-sparse @llvm/pr-subscribers-mlir Author: Aart Bik (aartbik) ChangesFull diff: https://github.com/llvm/llvm-project/pull/74779.diff 2 Files Affected:
diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/dual_sparse_conv_2d.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/dual_sparse_conv_2d.mlir
index 7825e8fe9bafa..6c35e2b51ed8f 100644
--- a/mlir/test/Integration/Dialect/SparseTensor/CPU/dual_sparse_conv_2d.mlir
+++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/dual_sparse_conv_2d.mlir
@@ -41,8 +41,8 @@
module {
func.func @conv2d(%input: tensor<8x8xi32>,
- %filter: tensor<3x3xi32>,
- %output: tensor<6x6xi32>) -> tensor<6x6xi32> {
+ %filter: tensor<3x3xi32>,
+ %output: tensor<6x6xi32>) -> tensor<6x6xi32> {
%0 = linalg.conv_2d
ins (%input, %filter: tensor<8x8xi32>, tensor<3x3xi32>)
outs (%output: tensor<6x6xi32>) -> tensor<6x6xi32>
@@ -50,7 +50,7 @@ module {
}
func.func @conv2d_all_sparse_DCSR(%input: tensor<8x8xi32, #DCSR>,
- %filter: tensor<3x3xi32, #DCSR>) -> tensor<6x6xi32, #DCSR> {
+ %filter: tensor<3x3xi32, #DCSR>) -> tensor<6x6xi32, #DCSR> {
%s = tensor.empty() : tensor<6x6xi32, #DCSR>
%0 = linalg.conv_2d
ins (%input, %filter: tensor<8x8xi32, #DCSR>, tensor<3x3xi32, #DCSR>)
@@ -59,7 +59,7 @@ module {
}
func.func @conv2d_all_sparse_CSR(%input: tensor<8x8xi32, #CSR>,
- %filter: tensor<3x3xi32, #CSR>) -> tensor<6x6xi32, #CSR> {
+ %filter: tensor<3x3xi32, #CSR>) -> tensor<6x6xi32, #CSR> {
%s = tensor.empty() : tensor<6x6xi32, #CSR>
%0 = linalg.conv_2d
ins (%input, %filter: tensor<8x8xi32, #CSR>, tensor<3x3xi32, #CSR>)
@@ -68,7 +68,7 @@ module {
}
func.func @conv2d_all_sparse_CD(%input: tensor<8x8xi32, #CDR>,
- %filter: tensor<3x3xi32, #CDR>) -> tensor<6x6xi32, #CDR> {
+ %filter: tensor<3x3xi32, #CDR>) -> tensor<6x6xi32, #CDR> {
%s = tensor.empty() : tensor<6x6xi32, #CDR>
%0 = linalg.conv_2d
ins (%input, %filter: tensor<8x8xi32, #CDR>, tensor<3x3xi32, #CDR>)
@@ -77,7 +77,7 @@ module {
}
func.func @conv2d_all_sparse_CSC(%input: tensor<8x8xi32, #CSC>,
- %filter: tensor<3x3xi32, #CSC>) -> tensor<6x6xi32, #CSC> {
+ %filter: tensor<3x3xi32, #CSC>) -> tensor<6x6xi32, #CSC> {
%s = tensor.empty() : tensor<6x6xi32, #CSC>
%0 = linalg.conv_2d
ins (%input, %filter: tensor<8x8xi32, #CSC>, tensor<3x3xi32, #CSC>)
diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conv_2d.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conv_2d.mlir
index 80946f5388520..f2907db7d825b 100644
--- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conv_2d.mlir
+++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conv_2d.mlir
@@ -46,8 +46,8 @@
module {
func.func @conv2d(%input: tensor<8x8xi32>,
- %filter: tensor<3x3xi32>,
- %output: tensor<6x6xi32>) -> tensor<6x6xi32> {
+ %filter: tensor<3x3xi32>,
+ %output: tensor<6x6xi32>) -> tensor<6x6xi32> {
%0 = linalg.conv_2d
ins (%input, %filter: tensor<8x8xi32>, tensor<3x3xi32>)
outs (%output: tensor<6x6xi32>) -> tensor<6x6xi32>
@@ -70,7 +70,7 @@ module {
}
func.func @conv2d_sparse_out(%input: tensor<8x8xi32>,
- %filter: tensor<3x3xi32>) -> tensor<6x6xi32, #DCSR> {
+ %filter: tensor<3x3xi32>) -> tensor<6x6xi32, #DCSR> {
%s = tensor.empty() : tensor<6x6xi32, #DCSR>
%0 = linalg.conv_2d
ins (%input, %filter: tensor<8x8xi32>, tensor<3x3xi32>)
@@ -79,7 +79,7 @@ module {
}
func.func @conv2d_all_sparse_DCSR(%input: tensor<8x8xi32, #DCSR>,
- %filter: tensor<3x3xi32>) -> tensor<6x6xi32, #DCSR> {
+ %filter: tensor<3x3xi32>) -> tensor<6x6xi32, #DCSR> {
%s = tensor.empty() : tensor<6x6xi32, #DCSR>
%0 = linalg.conv_2d
ins (%input, %filter: tensor<8x8xi32, #DCSR>, tensor<3x3xi32>)
@@ -88,7 +88,7 @@ module {
}
func.func @conv2d_all_sparse_CSR(%input: tensor<8x8xi32, #CSR>,
- %filter: tensor<3x3xi32>) -> tensor<6x6xi32, #CSR> {
+ %filter: tensor<3x3xi32>) -> tensor<6x6xi32, #CSR> {
%s = tensor.empty() : tensor<6x6xi32, #CSR>
%0 = linalg.conv_2d
ins (%input, %filter: tensor<8x8xi32, #CSR>, tensor<3x3xi32>)
@@ -97,7 +97,7 @@ module {
}
func.func @conv2d_all_sparse_CD(%input: tensor<8x8xi32, #CDR>,
- %filter: tensor<3x3xi32>) -> tensor<6x6xi32, #CDR> {
+ %filter: tensor<3x3xi32>) -> tensor<6x6xi32, #CDR> {
%s = tensor.empty() : tensor<6x6xi32, #CDR>
%0 = linalg.conv_2d
ins (%input, %filter: tensor<8x8xi32, #CDR>, tensor<3x3xi32>)
@@ -106,7 +106,7 @@ module {
}
func.func @conv2d_all_sparse_CSC(%input: tensor<8x8xi32, #CSC>,
- %filter: tensor<3x3xi32>) -> tensor<6x6xi32, #CSC> {
+ %filter: tensor<3x3xi32>) -> tensor<6x6xi32, #CSC> {
%s = tensor.empty() : tensor<6x6xi32, #CSC>
%0 = linalg.conv_2d
ins (%input, %filter: tensor<8x8xi32, #CSC>, tensor<3x3xi32>)
@@ -125,7 +125,6 @@ module {
[ -1, 0, 1 ]
]> : tensor<3x3xi32>
-
%input = arith.constant dense<[
[ 1, 2, 3, 4, 0, 6, 7, 8 ],
[ 2, 2, 4, 4, 0, 0, 6, 8 ],
@@ -270,7 +269,6 @@ module {
: tensor<6x6xi32>, vector<6x6xi32>
vector.print %v : vector<6x6xi32>
-
// Release the resources.
bufferization.dealloc_tensor %sparse_input_DCSR : tensor<8x8xi32, #DCSR>
bufferization.dealloc_tensor %sparse_input_CSR : tensor<8x8xi32, #CSR>
|
PeimingLiu
approved these changes
Dec 7, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.