Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions include/matx/transforms/convert/dense2sparse_cusparse.h
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,7 @@ void dense2sparse_impl(OutputTensorType &o, const InputTensorType &A,
if (!is_matx_transform_op<InputTensorType>() && !a.isSameView(A)) {
(a = A).run(stream);
}

using atype = decltype(a);
using otype = OutputTensorType;

Expand Down
22 changes: 20 additions & 2 deletions include/matx/transforms/convert/sparse2dense_cusparse.h
Original file line number Diff line number Diff line change
Expand Up @@ -207,16 +207,29 @@ using sparse2dense_cache_t =
std::unordered_map<Sparse2DenseParams_t, std::any,
Sparse2DenseParamsKeyHash, Sparse2DenseParamsKeyEq>;

template <typename Op>
__MATX_INLINE__ auto getS2DSupportedTensor(const Op &in, cudaStream_t stream) {
const auto func = [&]() {
if constexpr (is_tensor_view_v<Op>)
return in.Stride(Op::Rank() - 1) == 1;
return true;
};
return GetSupportedTensor(in, func, MATX_ASYNC_DEVICE_MEMORY, stream);
}

} // end namespace detail

template <typename OutputTensorType, typename InputTensorType>
void sparse2dense_impl(OutputTensorType &o, const InputTensorType &a,
void sparse2dense_impl(OutputTensorType &O, const InputTensorType &a,
const cudaExecutor &exec) {
MATX_NVTX_START("", matx::MATX_NVTX_LOG_API)
const auto stream = exec.getStream();

// Transform into supported form.
auto o = getS2DSupportedTensor(O, stream);

using atype = InputTensorType;
using otype = OutputTensorType;
using otype = decltype(o);

using TA = typename atype::value_type;
using TO = typename otype::value_type;
Expand Down Expand Up @@ -248,6 +261,11 @@ void sparse2dense_impl(OutputTensorType &o, const InputTensorType &a,
[&](std::shared_ptr<cache_val_type> cache_type) {
cache_type->Exec(o, a);
});

// Copy transformed output back.
if (!o.isSameView(O)) {
(O = o).run(stream);
}
}

} // end namespace matx
11 changes: 11 additions & 0 deletions test/00_sparse/Convert.cu
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,17 @@ TYPED_TEST(ConvertSparseTestsAll, ConvertCSR) {
}
}

// Allow transforming output.
(transpose(O) = sparse2dense(S)).run(exec);

// Verify result.
exec.sync();
for (index_t i = 0; i < m; i++) {
for (index_t j = 0; j < n; j++) {
ASSERT_EQ(O(j, i), D(i, j));
}
}

MATX_EXIT_HANDLER();
}

Expand Down