Skip to content

MAINT Adapt DistanceMetric in prevision for fused sparse-dense support #24223

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

Merged
merged 8 commits into from
Aug 25, 2022
Merged

MAINT Adapt DistanceMetric in prevision for fused sparse-dense support #24223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
79f6db9
MAINT Adapt DistanceMetric for fused sparse-dense
jjerphan Aug 22, 2022
1c7bd26
DOC Adapt docstring of dist_csr
jjerphan Aug 22, 2022
8e30ef1
FIX Correctly create Y_indptr for the sparse-dense case
jjerphan Aug 22, 2022
e181d94
Merge branch 'main' into maint/dist-metrics-sparse-support-follow-up
jjerphan Aug 22, 2022
732b464
Mimic SparseDenseDatasetsPair's frugal adaptation
jjerphan Aug 22, 2022
0db551d
DOC Clarify methods' purpose
jjerphan Aug 23, 2022
77e7f09
Make validation consistent
jjerphan Aug 25, 2022
d13687a
fixup! Make validation consistent
jjerphan Aug 25, 2022
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
14 changes: 7 additions & 7 deletions sklearn/metrics/_dist_metrics.pxd.tp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,9 @@ cdef class DistanceMetric{{name_suffix}}:

cdef DTYPE_t dist_csr(
self,
const {{INPUT_DTYPE_t}}[:] x1_data,
const {{INPUT_DTYPE_t}}* x1_data,
const SPARSE_INDEX_TYPE_t[:] x1_indices,
const {{INPUT_DTYPE_t}}[:] x2_data,
const {{INPUT_DTYPE_t}}* x2_data,
const SPARSE_INDEX_TYPE_t[:] x2_indices,
const SPARSE_INDEX_TYPE_t x1_start,
const SPARSE_INDEX_TYPE_t x1_end,
Expand All @@ -114,9 +114,9 @@ cdef class DistanceMetric{{name_suffix}}:

cdef DTYPE_t rdist_csr(
self,
const {{INPUT_DTYPE_t}}[:] x1_data,
const {{INPUT_DTYPE_t}}* x1_data,
const SPARSE_INDEX_TYPE_t[:] x1_indices,
const {{INPUT_DTYPE_t}}[:] x2_data,
const {{INPUT_DTYPE_t}}* x2_data,
const SPARSE_INDEX_TYPE_t[:] x2_indices,
const SPARSE_INDEX_TYPE_t x1_start,
const SPARSE_INDEX_TYPE_t x1_end,
Expand All @@ -140,7 +140,7 @@ cdef class DistanceMetric{{name_suffix}}:

cdef int pdist_csr(
self,
const {{INPUT_DTYPE_t}}[:] x1_data,
const {{INPUT_DTYPE_t}}* x1_data,
const SPARSE_INDEX_TYPE_t[:] x1_indices,
const SPARSE_INDEX_TYPE_t[:] x1_indptr,
const ITYPE_t size,
Expand All @@ -149,10 +149,10 @@ cdef class DistanceMetric{{name_suffix}}:

cdef int cdist_csr(
self,
const {{INPUT_DTYPE_t}}[:] x1_data,
const {{INPUT_DTYPE_t}}* x1_data,
const SPARSE_INDEX_TYPE_t[:] x1_indices,
const SPARSE_INDEX_TYPE_t[:] x1_indptr,
const {{INPUT_DTYPE_t}}[:] x2_data,
const {{INPUT_DTYPE_t}}* x2_data,
const SPARSE_INDEX_TYPE_t[:] x2_indices,
const SPARSE_INDEX_TYPE_t[:] x2_indptr,
const ITYPE_t size,
Expand Down
Loading