Skip to content
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

Guard all DIM/LVL recursion against completely empty format #835

Merged
merged 1 commit into from
Jan 22, 2025
Merged

Guard all DIM/LVL recursion against completely empty format #835

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
18 changes: 17 additions & 1 deletion examples/sparse_tensor.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,22 @@ int main([[maybe_unused]] int argc, [[maybe_unused]] char **argv)
cudaStream_t stream = 0;
cudaExecutor exec{stream};

//
// Print some formats that are used for the versatile sparse tensor
// type. Note that common formats like COO and CSR have good library
// support in e.g. cuSPARSE, but MatX provides a much more general
// way to define the sparse tensor storage through a DSL (see doc).
//
experimental::Scalar::print(); // scalars
experimental::SpVec::print(); // sparse vectors
experimental::COO::print(); // various sparse matrix formats
experimental::CSR::print();
experimental::CSC::print();
experimental::DCSR::print();
experimental::BSR<2,2>::print(); // 2x2 blocks
experimental::COO4::print(); // 4-dim tensor in COO
experimental::CSF5::print(); // 5-dim tensor in CSF

//
// Creates a COO matrix for the following 4x8 dense matrix with 5 nonzero
// elements, using the factory method that uses MatX tensors for the 1-dim
Expand Down Expand Up @@ -71,7 +87,7 @@ int main([[maybe_unused]] int argc, [[maybe_unused]] char **argv)
//
// This shows:
//
// tensor_impl_2_f32: Tensor{float} Rank: 2, Sizes:[4, 8], Levels:[4, 8]
// tensor_impl_2_f32: SparseTensor{float} Rank: 2, Sizes:[4, 8], Levels:[4, 8]
// nse = 5
// format = ( d0, d1 ) -> ( d0 : compressed(non-unique), d1 : singleton )
// crd[0] = ( 0 0 3 3 3 )
Expand Down
58 changes: 32 additions & 26 deletions include/matx/core/sparse_tensor_format.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,42 +255,48 @@ template <int D, typename... LvlSpecs> class SparseTensorFormat {
template <typename CRD, int L = 0>
__MATX_INLINE__ __MATX_HOST__ __MATX_DEVICE__ static void
dim2lvl(const CRD *dims, CRD *lvls, bool asSize) {
using ftype = std::tuple_element_t<L, LVLSPECS>;
if constexpr (ftype::expr::op == LvlOp::Id) {
lvls[L] = dims[ftype::expr::di];
} else if constexpr (ftype::expr::op == LvlOp::Div) {
lvls[L] = dims[ftype::expr::di] / ftype::expr::cj;
} else if constexpr (ftype::expr::op == LvlOp::Mod) {
lvls[L] =
asSize ? ftype::expr::cj : (dims[ftype::expr::di] % ftype::expr::cj);
}
if constexpr (L + 1 < LVL) {
dim2lvl<CRD, L + 1>(dims, lvls, asSize);
if constexpr (L < LVL) {
using ftype = std::tuple_element_t<L, LVLSPECS>;
if constexpr (ftype::expr::op == LvlOp::Id) {
lvls[L] = dims[ftype::expr::di];
} else if constexpr (ftype::expr::op == LvlOp::Div) {
lvls[L] = dims[ftype::expr::di] / ftype::expr::cj;
} else if constexpr (ftype::expr::op == LvlOp::Mod) {
lvls[L] = asSize ? ftype::expr::cj
: (dims[ftype::expr::di] % ftype::expr::cj);
}
if constexpr (L + 1 < LVL) {
dim2lvl<CRD, L + 1>(dims, lvls, asSize);
}
}
}

template <typename CRD, int L = 0>
__MATX_INLINE__ __MATX_HOST__ __MATX_DEVICE__ static void
lvl2dim(const CRD *lvls, CRD *dims) {
using ftype = std::tuple_element_t<L, LVLSPECS>;
if constexpr (ftype::expr::op == LvlOp::Id) {
dims[ftype::expr::di] = lvls[L];
} else if constexpr (ftype::expr::op == LvlOp::Div) {
dims[ftype::expr::di] = lvls[L] * ftype::expr::cj;
} else if constexpr (ftype::expr::op == LvlOp::Mod) {
dims[ftype::expr::di] += lvls[L]; // update (seen second)
}
if constexpr (L + 1 < LVL) {
lvl2dim<CRD, L + 1>(lvls, dims);
if constexpr (L < LVL) {
using ftype = std::tuple_element_t<L, LVLSPECS>;
if constexpr (ftype::expr::op == LvlOp::Id) {
dims[ftype::expr::di] = lvls[L];
} else if constexpr (ftype::expr::op == LvlOp::Div) {
dims[ftype::expr::di] = lvls[L] * ftype::expr::cj;
} else if constexpr (ftype::expr::op == LvlOp::Mod) {
dims[ftype::expr::di] += lvls[L]; // update (seen second)
}
if constexpr (L + 1 < LVL) {
lvl2dim<CRD, L + 1>(lvls, dims);
}
}
}

template <int L = 0> static void printLevel() {
using ftype = std::tuple_element_t<L, LVLSPECS>;
std::cout << " " << ftype::toString();
if constexpr (L + 1 < LVL) {
std::cout << ",";
printLevel<L + 1>();
if constexpr (L < LVL) {
using ftype = std::tuple_element_t<L, LVLSPECS>;
std::cout << " " << ftype::toString();
if constexpr (L + 1 < LVL) {
std::cout << ",";
printLevel<L + 1>();
}
}
}

Expand Down