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

Jump to bottom

ARROW-4226: [C++] Add sparse CSF tensor support #5716

Closed
wants to merge 18 commits into from
Closed

ARROW-4226: [C++] Add sparse CSF tensor support #5716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
2d10104
WIP
rok Nov 8, 2019
6b938f7
Documentation.
rok Nov 16, 2019
05a47a5
Using axis_order in CSF.
rok Nov 18, 2019
7d17995
Adding Tensor to SparseCSFTensor conversion.
rok Nov 24, 2019
f44d92c
Adding SparseCSFIndex::Make.
rok Nov 25, 2019
a322ff5
Adding tests for multiple index value types for SparseCSFIndex.
rok Nov 25, 2019
eb51947
Switching SparseCSFIndex to '2D' data structure.
rok Dec 8, 2019
bd0d8c2
Dense to sparse CSF conversion now in order of dimension size.
rok Dec 13, 2019
6ceb406
Implementing review feedback.
rok Dec 17, 2019
4f2bf00
Work on CSF index tests.
rok Dec 17, 2019
24a831f
Style.
rok Dec 18, 2019
d9ff47e
Further work and implementing review feedback.
rok Jan 9, 2020
3291abc
Marking indptrBuffers, indicesBuffers and axisOrder required.
rok Jan 28, 2020
28d38cb
Removing backslashes from comments.
rok Jan 28, 2020
6f4f4a8
Implementing feedback review.
rok Jan 30, 2020
11b81bb
Factoring out index incrementing for dense to COO and CSF indices.
rok Feb 3, 2020
1b922f6
Implementing review feedback.
rok Feb 4, 2020
9ca93ab
Implementing review feedback.
rok Feb 5, 2020
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
12 changes: 12 additions & 0 deletions cpp/src/arrow/compare.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1196,6 +1196,13 @@ inline bool SparseTensorEqualsImplDispatch(const SparseTensorImpl<SparseIndexTyp
right_csc);
}

case SparseTensorFormat::CSF: {
const auto& right_csf =
checked_cast<const SparseTensorImpl<SparseCSFIndex>&>(right);
return SparseTensorEqualsImpl<SparseIndexType, SparseCSFIndex>::Compare(left,
right_csf);
}

default:
return false;
}
Expand Down Expand Up @@ -1232,6 +1239,11 @@ bool SparseTensorEquals(const SparseTensor& left, const SparseTensor& right) {
return SparseTensorEqualsImplDispatch(left_csc, right);
}

case SparseTensorFormat::CSF: {
const auto& left_csf = checked_cast<const SparseTensorImpl<SparseCSFIndex>&>(left);
return SparseTensorEqualsImplDispatch(left_csf, right);
}

default:
return false;
}
Expand Down
5 changes: 5 additions & 0 deletions cpp/src/arrow/python/serialize.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -654,6 +654,7 @@ Status CountSparseTensors(
OwnedRef num_sparse_tensors(PyDict_New());
size_t num_coo = 0;
size_t num_csr = 0;
size_t num_csf = 0;

for (const auto& sparse_tensor : sparse_tensors) {
switch (sparse_tensor->format_id()) {
Expand All @@ -663,6 +664,9 @@ Status CountSparseTensors(
case SparseTensorFormat::CSR:
++num_csr;
break;
case SparseTensorFormat::CSF:
++num_csf;
break;
case SparseTensorFormat::CSC:
// TODO(mrkn): support csc
break;
Expand All @@ -671,6 +675,7 @@ Status CountSparseTensors(

PyDict_SetItemString(num_sparse_tensors.obj(), "coo", PyLong_FromSize_t(num_coo));
PyDict_SetItemString(num_sparse_tensors.obj(), "csr", PyLong_FromSize_t(num_csr));
PyDict_SetItemString(num_sparse_tensors.obj(), "csf", PyLong_FromSize_t(num_csf));
RETURN_IF_PYERROR();

*out = num_sparse_tensors.detach();
Expand Down
Loading