Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 14 additions & 1 deletion solvers/newt_alm.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ def njit(f): # noqa: F811
return f


MAX_STANDARD_SAMPLES = 10_000


class Solver(BaseSolver):
name = "Newt-ALM"
sampling_strategy = "callback"
Expand All @@ -34,6 +37,16 @@ def set_objective(self, X, y, alphas, fit_intercept):
self.X, self.y, self.lambdas = X, y, alphas
self.fit_intercept = fit_intercept

def skip(self, X, y, alphas, fit_intercept):
n_samples = X.shape[0]
if self.inner_solver == "standard" and n_samples > MAX_STANDARD_SAMPLES:
return True, (
f"{self.name}'s standard inner solver would form a dense "
f"{n_samples}-by-{n_samples} system"
)

return False, None

def warm_up(self):
self.run_once()

Expand Down Expand Up @@ -215,7 +228,7 @@ def _compute_direction(self, x, sigma, A, b, y, ATy, lambdas):
inner_solver = copy.deepcopy(self.inner_solver)

if inner_solver == "auto":
if m > 10000: # Very large m - avoid forming mxm matrices
if m > MAX_STANDARD_SAMPLES:
inner_solver = "cg"
elif m >= 3 * n and n < 5000:
inner_solver = "woodbury"
Expand Down
32 changes: 32 additions & 0 deletions tests/test_newt_alm.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
from types import SimpleNamespace

import pytest

from solvers.newt_alm import Solver


@pytest.mark.parametrize(
("inner_solver", "n_samples", "expected_skip"),
[
("standard", 10_001, True),
("standard", 10_000, False),
("auto", 20_000, False),
],
)
def test_skip_standard_solver_for_large_dense_systems(
inner_solver,
n_samples,
expected_skip,
):
solver = Solver.get_instance(inner_solver=inner_solver)
X = SimpleNamespace(shape=(n_samples, 100))

skip, reason = solver.skip(
X=X,
y=None,
alphas=None,
fit_intercept=False,
)

assert skip is expected_skip
assert (reason is not None) is expected_skip