Skip to content

Commit d46ab83

Browse files
committed
make qc smaller
1 parent 30414ab commit d46ab83

File tree

2 files changed

+17
-27
lines changed

2 files changed

+17
-27
lines changed

src/rapids_singlecell/preprocessing/_qc.py

Lines changed: 13 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -127,32 +127,22 @@ def _basic_qc(
127127
from rapids_singlecell._cuda import _qc_cuda as _qc
128128

129129
if sparse.isspmatrix_csr(X):
130-
_qc.sparse_qc_csr(
131-
X.indptr.data.ptr,
132-
X.indices.data.ptr,
133-
X.data.data.ptr,
134-
sums_cells.data.ptr,
135-
sums_genes.data.ptr,
136-
genes_per_cell.data.ptr,
137-
cells_per_gene.data.ptr,
138-
int(X.shape[0]),
139-
int(cp.dtype(X.data.dtype).itemsize),
140-
)
130+
sparse_qc = _qc.sparse_qc_csr
141131
elif sparse.isspmatrix_csc(X):
142-
_qc.sparse_qc_csc(
143-
X.indptr.data.ptr,
144-
X.indices.data.ptr,
145-
X.data.data.ptr,
146-
sums_cells.data.ptr,
147-
sums_genes.data.ptr,
148-
genes_per_cell.data.ptr,
149-
cells_per_gene.data.ptr,
150-
int(X.shape[1]),
151-
int(cp.dtype(X.data.dtype).itemsize),
152-
)
153-
132+
sparse_qc = _qc.sparse_qc_csc
154133
else:
155134
raise ValueError("Please use a csr or csc matrix")
135+
sparse_qc(
136+
X.indptr.data.ptr,
137+
X.indices.data.ptr,
138+
X.data.data.ptr,
139+
sums_cells.data.ptr,
140+
sums_genes.data.ptr,
141+
genes_per_cell.data.ptr,
142+
cells_per_gene.data.ptr,
143+
int(X.shape[1]),
144+
int(cp.dtype(X.data.dtype).itemsize),
145+
)
156146
else:
157147
from rapids_singlecell._cuda import _qc_cuda as _qc
158148

src/rapids_singlecell/preprocessing/_utils.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -185,8 +185,8 @@ def _mean_var_dense_dask(X, axis):
185185
from ._kernels._mean_var_kernel import mean_sum, sq_sum
186186

187187
def __mean_var(X_part):
188-
var = sq_sum(X=X_part, axis=axis)
189-
mean = mean_sum(X=X_part, axis=axis)
188+
var = sq_sum(X_part, axis=axis)
189+
mean = mean_sum(X_part, axis=axis)
190190
if axis == 0:
191191
return cp.vstack([mean, var])[None, ...]
192192
else:
@@ -217,8 +217,8 @@ def __mean_var(X_part):
217217
def _mean_var_dense(X, axis):
218218
from ._kernels._mean_var_kernel import mean_sum, sq_sum
219219

220-
var = sq_sum(X=X, axis=axis)
221-
mean = mean_sum(X=X, axis=axis)
220+
var = sq_sum(X, axis=axis)
221+
mean = mean_sum(X, axis=axis)
222222
mean = mean / X.shape[axis]
223223
var = var / X.shape[axis]
224224
var -= cp.power(mean, 2)

0 commit comments

Comments
 (0)