8000 MAINT Replaces cnp.ndarray with memory views in _cd_fast by OmarManzoor · Pull Request #25775 · scikit-learn/scikit-learn · GitHub
[go: up one dir, main page]
Skip to content

MAINT Replaces cnp.ndarray with memory views in _cd_fast #25775

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 4 commits into from
Mar 9, 2023
Merged

MAINT Replaces cnp.ndarray with memory views in _cd_fast #25775

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8bd647c
MAINT Replaces cnp.ndarray with memory views in _cd_fast and remove -…
OmarManzoor Mar 7, 2023
a4753a2
Address PR suggestions
OmarManzoor Mar 8, 2023
975c3f2
Remove cnp.import_array
OmarManzoor Mar 9, 2023
759bb7f
Revert
OmarManzoor Mar 9, 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
1 change: 1 addition & 0 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@
"sklearn.ensemble._hist_gradient_boosting.common",
"sklearn.ensemble._hist_gradient_boosting.utils",
"sklearn.feature_extraction._hashing_fast",
"sklearn.linear_model._cd_fast",
"sklearn.linear_model._sag_fast",
"sklearn.linear_model._sgd_fast",
"sklearn.manifold._barnes_hut_tsne",
Expand Down
45 changes: 20 additions & 25 deletions sklearn/linear_model/_cd_fast.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,13 +90,12 @@ cdef floating diff_abs_max(int n, floating* a, floating* b) noexcept nogil:
m = d
return m

# TODO: use const fused typed memoryview where possible when Cython 0.29.33 is used.
def enet_coordinate_descent(
cnp.ndarray[floating, ndim=1, mode='c'] w,
floating[::1] w,
floating alpha,
floating beta,
cnp.ndarray[floating, ndim=2, mode='fortran'] X,
cnp.ndarray[floating, ndim=1, mode='c'] y,
const floating[::1, :] X,
const floating[::1] y,
unsigned int max_iter,
floating tol,
object rng,
Expand Down Expand Up @@ -273,17 +272,16 @@ def enet_coordinate_descent(
return np.asarray(w), gap, tol, n_iter + 1


# TODO: use const fused typed memoryview where possible when Cython 0.29.33 is used.
def sparse_enet_coordinate_descent(
cnp.ndarray[floating, ndim=1, mode='c'] w,
floating[::1] w,
floating alpha,
floating beta,
cnp.ndarray[floating, ndim=1, mode='c'] X_data,
const floating[::1] X_data,
const int[::1] X_indices,
const int[::1] X_indptr,
cnp.ndarray[floating, ndim=1, mode='c'] y,
cnp.ndarray[floating, ndim=1, mode='c'] sample_weight,
cnp.ndarray[floating, ndim=1, mode='c'] X_mean,
const floating[::1] y,
const floating[::1] sample_weight,
const floating[::1] X_mean,
unsigned int max_iter,
floating tol,
object rng,
Expand Down Expand Up @@ -340,7 +338,7 @@ def sparse_enet_coordinate_descent(
# R = y - Zw, weighted version R = sample_weight * (y - Zw)
cdef floating[::1] R
cdef floating[::1] XtA
cdef floating[::1] yw
cdef const floating[::1] yw

if floating is float:
dtype = np.float32
Expand Down Expand Up @@ -565,14 +563,13 @@ def sparse_enet_coordinate_descent(
return np.asarray(w), gap, tol, n_iter + 1


# TODO: use const fused typed memoryview where possible when Cython 0.29.33 is used.
def enet_coordinate_descent_gram(
cnp.ndarray[floating, ndim=1, mode='c'] w,
floating[::1] w,
floating alpha,
floating beta,
cnp.ndarray[floating, ndim=2, mode='c'] Q,
cnp.ndarray[floating, ndim=1, mode='c'] q,
cnp.ndarray[floating, ndim=1] y,
const floating[:, ::1] Q,
const floating[::1] q,
const floating[:] y,
unsigned int max_iter,
floating tol,
object rng,
Expand Down Expand Up @@ -633,8 +630,8 @@ def enet_coordinate_descent_gram(

cdef floating y_norm2 = np.dot(y, y)
cdef floating* w_ptr = &w[0]
cdef floating* Q_ptr = &Q[0, 0]
cdef floating* q_ptr = &q[0]
cdef const floating* Q_ptr = &Q[0, 0]
cdef const floating* q_ptr = &q[0]
cdef floating* H_ptr = &H[0]
cdef floating* XtA_ptr = &XtA[0]
tol = tol * y_norm2
Expand Down Expand Up @@ -736,14 +733,12 @@ def enet_coordinate_descent_gram(

return np.asarray(w), gap, tol, n_iter + 1

# TODO: use const fused typed memoryview where possible when Cython 0.29.33 is used.
def enet_coordinate_descent_multi_task(
cnp.ndarray[floating, ndim=2, mode='fortran'] W,
const floating[::1, :] W,
floating l1_reg,
floating l2_reg,
# TODO: use const qualified fused-typed memoryview when Cython 3.0 is used.
cnp.ndarray[floating, ndim=2, mode='fortran'] X,
cnp.ndarray[floating, ndim=2, mode='fortran'] Y,
const floating[::1, :] X,
const floating[::1, :] Y,
unsigned int max 6CBE _iter,
floating tol,
object rng,
Expand Down Expand Up @@ -807,8 +802,8 @@ def enet_coordinate_descent_multi_task(
cdef UINT32_t rand_r_state_seed = rng.randint(0, RAND_R_MAX)
cdef UINT32_t* rand_r_state = &rand_r_state_seed

cdef floating* X_ptr = &X[0, 0]
cdef floating* Y_ptr = &Y[0, 0]
cdef const floating* X_ptr = &X[0, 0]
cdef const floating* Y_ptr = &Y[0, 0]

if l1_reg == 0:
warnings.warn("Coordinate descent with l1_reg=0 may lead to unexpected"
Expand Down
0