8000 PWD Engine Refactor by Micky774 · Pull Request #7 · Micky774/scikit-learn · GitHub
[go: up one dir, main page]
Skip to content

PWD Engine Refactor #7

New issue

Have a question about this project? 8000 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

Closed
wants to merge 15 commits into from
Closed

PWD Engine Refactor #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
0b6ab44
API improvements, though still broken
Micky774 Dec 17, 2022
b954160
Shifted middle-term computation/storage to engine entirely
Micky774 Dec 29, 2022
4517470
Got the implementation to build
Micky774 Dec 29, 2022
263b355
Trimmed excess declarations
Micky774 Dec 29, 2022
3d650be
Code is runnable, however is not yet correct
Micky774 Dec 29, 2022
dd438fb
Refactored `_compute_and_reduce_distances_on_chunks`
Micky774 Jan 3, 2023
f994248
Merge branch 'main' into pwd_engine_alt
Micky774 Jan 3, 2023
426d76f
Completed parallel_on_X path
Micky774 Jan 3, 2023
590d876
Removed old print statement
Micky774 Jan 3, 2023
78b94cf
Enabled both paths
Micky774 Jan 3, 2023
18ae78f
Added function pointer for surrogate dist
Micky774 Jan 4, 2023
aebcfa8
Finally replaced ArgKmin implementation
Micky774 Jan 4, 2023
36fdb7f
Merge branch 'main' into pwd_engine_alt
Micky774 Jan 4, 2023
cc99ed0
Minor refactor to create bit-width agnostic interface for BDR
Micky774 Jan 5, 2023
45494f9
Included dataset as attribute and extended engine hierarchy
Micky774 Jan 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
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,3 +97,5 @@ sklearn/metrics/_pairwise_distances_reduction/_middle_term_computer.pxd
sklearn/metrics/_pairwise_distances_reduction/_middle_term_computer.pyx
sklearn/metrics/_pairwise_distances_reduction/_radius_neighbors.pxd
sklearn/metrics/_pairwise_distances_reduction/_radius_neighbors.pyx
sklearn/metrics/_pairwise_distances_reduction/_engines.pxd
sklearn/metrics/_pairwise_distances_reduction/_engines.pyx
6 changes: 6 additions & 0 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,12 @@ def check_package_status(package, min_version):
"include_np": True,
"extra_compile_args": ["-std=c++11"],
},
{
"sources": ["_engines.pyx.tp", "_engines.pxd.tp"],
"language": "c++",
"include_np": True,
"extra_compile_args": ["-std=c++11"],
},
{
"sources": ["_base.pyx.tp", "_base.pxd.tp"],
"language": "c++",
Expand Down
11 changes: 1 addition & 10 deletions sklearn/metrics/_pairwise_distances_reduction/_argkmin.pxd.tp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ cnp.import_array()
{{for name_suffix in ['64', '32']}}

from ._base cimport BaseDistancesReduction{{name_suffix}}
from ._middle_term_computer cimport MiddleTermComputer{{name_suffix}}

cdef class ArgKmin{{name_suffix}}(BaseDistancesReduction{{name_suffix}}):
"""float{{name_suffix}} implementation of the ArgKmin."""
Expand All @@ -21,14 +20,6 @@ cdef class ArgKmin{{name_suffix}}(BaseDistancesReduction{{name_suffix}}):
DTYPE_t ** heaps_r_distances_chunks
ITYPE_t ** heaps_indices_chunks


cdef class EuclideanArgKmin{{name_suffix}}(ArgKmin{{name_suffix}}):
"""EuclideanDistance-specialisation of ArgKmin{{name_suffix}}."""
cdef:
MiddleTermComputer{{name_suffix}} middle_term_computer
const DTYPE_t[::1] X_norm_squared
const DTYPE_t[::1] Y_norm_squared

bint use_squared_distances
readonly dict metric_kwargs

{{endfor}}
Loading
0