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

[backport] Fix csr2dense to avoid race conditions #7808

Merged
merged 1 commit into from
Sep 7, 2023
Merged

[backport] Fix csr2dense to avoid race conditions #7808

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
19 changes: 10 additions & 9 deletions cupyx/scipy/sparse/_csr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1108,25 1108,26 @@ def cupy_binopt_csr_step2(op_name):
def csr2dense(a, order):
out = cupy.zeros(a.shape, dtype=a.dtype, order=order)
m, n = a.shape
cupy_csr2dense()(m, n, a.indptr, a.indices, a.data,
(order == 'C'), out)
kern = _cupy_csr2dense(a.dtype)
kern(m, n, a.indptr, a.indices, a.data, (order == 'C'), out)
return out


@cupy._util.memoize(for_each_device=True)
def cupy_csr2dense():
def _cupy_csr2dense(dtype):
if dtype == '?':
op = "if (DATA) OUT[index] = true;"
else:
op = "atomicAdd(&OUT[index], DATA);"

return cupy.ElementwiseKernel(
'int32 M, int32 N, raw I INDPTR, I INDICES, T DATA, bool C_ORDER',
'raw T OUT',
'''
int row = get_row_id(i, 0, M - 1, &(INDPTR[0]));
int col = INDICES;
if (C_ORDER) {
OUT[col N * row] = DATA;
} else {
OUT[row M * col] = DATA;
}
''',
int index = C_ORDER ? col N * row : row M * col;
''' op,
'cupyx_scipy_sparse_csr2dense',
preamble=_GET_ROW_ID_
)
Expand Down