Skip to content

[3D] Fixed bug in lowering CSF format for 3D tensor (#80) (also Fixed the commit history) #99

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Apr 7, 2025
Merged

[3D] Fixed bug in lowering CSF format for 3D tensor (#80) (also Fixed the commit history) #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/Dialect/TensorAlgebra/Transforms/TensorDeclLowering.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1110,7 +1110,7 @@ Value insertSparseTensorDeclOp(PatternRewriter & rewriter,
Value sptensor;
if (rank_size == 2)
{
Value dims = rewriter.create<tensor::FromElementsOp>(loc, ValueRange{array_sizes[9], array_sizes[10]});
Value dims = rewriter.create<tensor::FromElementsOp>(loc, ValueRange{array_sizes[9], array_sizes[10]}); /// I, J
sptensor = rewriter.create<tensorAlgebra::SparseTensorConstructOp>(loc, ty,
dims, /// Dim sizes
ValueRange{
Expand All @@ -1134,7 +1134,7 @@ Value insertSparseTensorDeclOp(PatternRewriter & rewriter,
}
else if (rank_size == 3)
{
Value dims = rewriter.create<tensor::FromElementsOp>(loc, ValueRange{array_sizes[16], array_sizes[17], array_sizes[18]});
Value dims = rewriter.create<tensor::FromElementsOp>(loc, ValueRange{array_sizes[13], array_sizes[14], array_sizes[15]}); /// I, J, K

sptensor = rewriter.create<tensorAlgebra::SparseTensorConstructOp>(loc, ty, dims,
ValueRange {
Expand Down
64 changes: 32 additions & 32 deletions lib/ExecutionEngine/SparseUtils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2118,45 +2118,45 @@ void read_input_sizes_3D(int32_t fileID,
/// std::cout << "CSF format\n";
Csf3DTensor<T> csf_3dtensor(FileReader.coo_3dtensor);

desc_sizes->data[0] = csf_3dtensor.A1pos_size;
desc_sizes->data[1] = csf_3dtensor.A1crd_size;
desc_sizes->data[2] = 0;
desc_sizes->data[3] = 0;
desc_sizes->data[4] = csf_3dtensor.A2pos_size;
desc_sizes->data[5] = csf_3dtensor.A2crd_size;
desc_sizes->data[6] = 0;
desc_sizes->data[7] = 0;
desc_sizes->data[8] = csf_3dtensor.A3pos_size;
desc_sizes->data[9] = csf_3dtensor.A3crd_size;
desc_sizes->data[10] = 0;
desc_sizes->data[11] = 0;
desc_sizes->data[12] = csf_3dtensor.Aval_size;
desc_sizes->data[13] = csf_3dtensor.num_index_i;
desc_sizes->data[14] = csf_3dtensor.num_index_j;
desc_sizes->data[15] = csf_3dtensor.num_index_k;
desc_sizes->data[0] = csf_3dtensor.A1pos_size; /// A1pos
desc_sizes->data[1] = csf_3dtensor.A1crd_size; /// A1crd
desc_sizes->data[2] = 0; /// A1_tile_pos
desc_sizes->data[3] = 0; /// A1_tile_crd
desc_sizes->data[4] = csf_3dtensor.A2pos_size; /// A2pos
desc_sizes->data[5] = csf_3dtensor.A2crd_size; /// A2crd
desc_sizes->data[6] = 0; /// A2_tile_pos
desc_sizes->data[7] = 0; /// A2_tile_crd
desc_sizes->data[8] = csf_3dtensor.A3pos_size; /// A3pos
desc_sizes->data[9] = csf_3dtensor.A3crd_size; /// A3crd
desc_sizes->data[10] = 0; /// A3_tile_pos
desc_sizes->data[11] = 0; /// A3_tile_crd
desc_sizes->data[12] = csf_3dtensor.Aval_size; /// Aval
desc_sizes->data[13] = csf_3dtensor.num_index_i; /// I
desc_sizes->data[14] = csf_3dtensor.num_index_j; /// J
desc_sizes->data[15] = csf_3dtensor.num_index_k; /// K
}
/// Mode-Generic
else if (A1format == Compressed_nonunique && A2format == singleton && A3format == Dense)
{
/// std::cout << "Mode-Generic format\n";
Mg3DTensor<T> mg_3dtensor(FileReader.coo_3dtensor);

desc_sizes->data[0] = mg_3dtensor.A1pos_size;
desc_sizes->data[1] = mg_3dtensor.A1crd_size;
desc_sizes->data[2] = 0;
desc_sizes->data[3] = 0;
desc_sizes->data[4] = mg_3dtensor.A2pos_size;
desc_sizes->data[5] = mg_3dtensor.A2crd_size;
desc_sizes->data[6] = 0;
desc_sizes->data[7] = 0;
desc_sizes->data[8] = mg_3dtensor.A3pos_size;
desc_sizes->data[9] = mg_3dtensor.A3crd_size;
desc_sizes->data[10] = 0;
desc_sizes->data[11] = 0;
desc_sizes->data[12] = mg_3dtensor.Aval_size;
desc_sizes->data[13] = mg_3dtensor.num_index_i;
desc_sizes->data[14] = mg_3dtensor.num_index_j;
desc_sizes->data[15] = mg_3dtensor.num_index_k;
desc_sizes->data[0] = mg_3dtensor.A1pos_size; /// A1pos
desc_sizes->data[1] = mg_3dtensor.A1crd_size; /// A1crd
desc_sizes->data[2] = 0; /// A1_tile_pos
desc_sizes->data[3] = 0; /// A1_tile_crd
desc_sizes->data[4] = mg_3dtensor.A2pos_size; /// A2pos
desc_sizes->data[5] = mg_3dtensor.A2crd_size; /// A2crd
desc_sizes->data[6] = 0; /// A2_tile_pos
desc_sizes->data[7] = 0; /// A2_tile_crd
desc_sizes->data[8] = mg_3dtensor.A3pos_size; /// A3pos
desc_sizes->data[9] = mg_3dtensor.A3crd_size; /// A3crd
desc_sizes->data[10] = 0; /// A3_tile_pos
desc_sizes->data[11] = 0; /// A3_tile_crd
desc_sizes->data[12] = mg_3dtensor.Aval_size; /// Aval
desc_sizes->data[13] = mg_3dtensor.num_index_i; /// I
desc_sizes->data[14] = mg_3dtensor.num_index_j; /// J
desc_sizes->data[15] = mg_3dtensor.num_index_k; /// K
}
else
{
Expand Down
Loading