[go: up one dir, main page]
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

ENH Introduce dtype preservation semantics in DistanceMetric objects. #27006

Merged
merged 10 commits into from
Aug 10, 2023
Merged

ENH Introduce dtype preservation semantics in DistanceMetric objects. #27006

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
799e0bd
Initial dtype preservation work
Micky774 Aug 3, 2023
44455b0
Updated accumulator to be INPUT_DTYPE_t and reverted weights to f64
Micky774 Aug 3, 2023
5d486ac
Updated changelog
Micky774 Aug 3, 2023
1054140
Update doc/whats_new/v1.4.rst
Micky774 Aug 7, 2023
fd1c6c4
Merge branch 'main' into dm_float32
Micky774 Aug 7, 2023
14e9729
Merge branch 'dm_float32' of https://github.com/Micky774/scikit-learn…
Micky774 Aug 7, 2023
ee4faf4
Revert changes to {r}dist return type
Micky774 Aug 8, 2023
1144ada
Merge branch 'main' into dm_float32
Micky774 Aug 8, 2023
b79ebb0
Revert "Revert changes to {r}dist return type"
Micky774 Aug 9, 2023
f8b6027
Merge branch 'main' into dm_float32
jjerphan Aug 10, 2023
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
Prev Previous commit
Next Next commit
Revert "Revert changes to {r}dist return type" 
This reverts commit ee4faf4.
  • Loading branch information
@Micky774
Micky774 committed Aug 9, 2023
commit b79ebb0b1b3785d3c406759e8c861bfcad3d46ce
16 changes: 8 additions & 8 deletions sklearn/metrics/_dist_metrics.pxd.tp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,11 @@ cdef inline float64_t euclidean_rdist{{name_suffix}}(
return d


cdef inline float64_t euclidean_dist_to_rdist{{name_suffix}}(const float64_t dist) except -1 nogil:
cdef inline float64_t euclidean_dist_to_rdist{{name_suffix}}(const {{INPUT_DTYPE_t}} dist) except -1 nogil:
return dist * dist


cdef inline float64_t euclidean_rdist_to_dist{{name_suffix}}(const float64_t dist) except -1 nogil:
cdef inline float64_t euclidean_rdist_to_dist{{name_suffix}}(const {{INPUT_DTYPE_t}} dist) except -1 nogil:
return sqrt(dist)


Expand All @@ -71,21 +71,21 @@ cdef class DistanceMetric{{name_suffix}}(DistanceMetric):
cdef object func
cdef object kwargs

cdef float64_t dist(
cdef {{INPUT_DTYPE_t}} dist(
self,
const {{INPUT_DTYPE_t}}* x1,
const {{INPUT_DTYPE_t}}* x2,
intp_t size,
) except -1 nogil

cdef float64_t rdist(
cdef {{INPUT_DTYPE_t}} rdist(
self,
const {{INPUT_DTYPE_t}}* x1,
const {{INPUT_DTYPE_t}}* x2,
intp_t size,
) except -1 nogil

cdef float64_t dist_csr(
cdef {{INPUT_DTYPE_t}} dist_csr(
self,
const {{INPUT_DTYPE_t}}* x1_data,
const int32_t* x1_indices,
Expand All @@ -98,7 +98,7 @@ cdef class DistanceMetric{{name_suffix}}(DistanceMetric):
const intp_t size,
) except -1 nogil

cdef float64_t rdist_csr(
cdef {{INPUT_DTYPE_t}} rdist_csr(
self,
const {{INPUT_DTYPE_t}}* x1_data,
const int32_t* x1_indices,
Expand Down Expand Up @@ -145,8 +145,8 @@ cdef class DistanceMetric{{name_suffix}}(DistanceMetric):
{{INPUT_DTYPE_t}}[:, ::1] D,
) except -1 nogil

cdef float64_t _rdist_to_dist(self, float64_t rdist) except -1 nogil
cdef {{INPUT_DTYPE_t}} _rdist_to_dist(self, {{INPUT_DTYPE_t}} rdist) except -1 nogil

cdef float64_t _dist_to_rdist(self, float64_t dist) except -1 nogil
cdef {{INPUT_DTYPE_t}} _dist_to_rdist(self, {{INPUT_DTYPE_t}} dist) except -1 nogil

{{endfor}}
Loading