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
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ on:
branches:
- main
schedule:
# Run every day at 7:42am UTC.
- cron: '42 7 * * *'
# Run every 3rd of the month at 7:42am UTC.
- cron: '42 7 3 * *'

jobs:
benchopt_dev:
Expand Down
2 changes: 1 addition & 1 deletion datasets/finance.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class Dataset(BaseDataset):
is_sparse = True

install_cmd = 'conda'
requirements = ['pip:libsvmdata']
requirements = ['pip::libsvmdata']

def __init__(self):
self.X, self.y = None, None
Expand Down
2 changes: 1 addition & 1 deletion datasets/libsvm.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class Dataset(BaseDataset):
}

install_cmd = 'conda'
requirements = ['pip:git+https://github.com/mathurinm/libsvmdata@main']
requirements = ['pip::git+https://github.com/mathurinm/libsvmdata@main']
references = [
"C. Chang and CJ. Lin, "
"'ACM transactions on intelligent systems and technology (TIST)', "
Expand Down
2 changes: 1 addition & 1 deletion objective.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ class Objective(BaseObjective):
"""L1 regularized linear regression.
"""
name = "Lasso Regression"
min_benchopt_version = "1.5"
min_benchopt_version = "1.7"

parameters = {
'fit_intercept': [True, False],
Expand Down
2 changes: 1 addition & 1 deletion solvers/blitz.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class Solver(BaseSolver):

install_cmd = 'conda'
requirements = [
'pip:git+https://github.com/tbjohns/blitzl1.git@master'
'pip::git+https://github.com/tbjohns/blitzl1.git@master'
]

def set_objective(self, X, y, lmbd, fit_intercept):
Expand Down
2 changes: 1 addition & 1 deletion solvers/celer.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class Solver(BaseSolver):
sampling_strategy = 'iteration'

install_cmd = 'conda'
requirements = ['pip:celer']
requirements = ['pip::celer']

def set_objective(self, X, y, lmbd, fit_intercept):
self.X, self.y, self.lmbd = X, y, lmbd
Expand Down
6 changes: 3 additions & 3 deletions solvers/cuml.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ class Solver(BaseSolver):

install_cmd = "conda"
requirements = [
"rapidsai:rapids",
f"nvidia:cudatoolkit={cuda_version}",
"rapidsai::rapids",
"nvidia::'cuda-version>=11.4,<=12.8'",
"dask-sql", "cupy"
] if cuda_version is not None else []
]

parameters = {
"solver": [
Expand Down
2 changes: 1 addition & 1 deletion solvers/cyanure.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class Solver(BaseSolver):
name = 'Cyanure'

install_cmd = 'conda'
requirements = ['mkl', 'pip:cyanure-mkl']
requirements = ['mkl', 'pip::cyanure-mkl']
references = [
'J. Mairal, "Cyanure: An Open-Source Toolbox for Empirical Risk'
' Minimization for Python, C++, and soon more," '
Expand Down
3 changes: 1 addition & 2 deletions solvers/lars.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@ def set_objective(self, X, y, lmbd, fit_intercept):
n_samples = self.X.shape[0]

self.clf = LassoLars(
alpha=self.lmbd / n_samples, fit_intercept=fit_intercept,
normalize=False,
alpha=self.lmbd / n_samples, fit_intercept=fit_intercept
)

warnings.filterwarnings("ignore", category=ConvergenceWarning)
Expand Down
50 changes: 0 additions & 50 deletions solvers/lightning.py

This file was deleted.

4 changes: 1 addition & 3 deletions solvers/modopt_fista.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,7 @@ class Solver(BaseSolver):
name = 'ModOpt-FISTA'
sampling_strategy = 'callback'
install_cmd = 'conda'
requirements = [
'pip:modopt',
]
requirements = ['pip::modopt']
parameters = {
'restart_strategy': ['greedy', 'adaptive-1'],
}
Expand Down
4 changes: 1 addition & 3 deletions solvers/modopt_pogm.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,7 @@ class Solver(BaseSolver):
sampling_strategy = 'callback'

install_cmd = 'conda'
requirements = [
'pip:modopt',
]
requirements = ['pip::modopt']
references = [
'S. Farrens, A. Grigis, L. El Gueddari, Z. Ramzi, G. R. Chaithya, '
'S. Starck, B. Sarthou, H. Cherkaoui, P. Ciuciu and J.-L. Starck, '
Expand Down
2 changes: 1 addition & 1 deletion solvers/skglm.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class Solver(BaseSolver):

install_cmd = 'conda'
requirements = [
'pip:skglm'
'pip::git+https://github.com/scikit-learn-contrib/skglm.git'
]

def set_objective(self, X, y, lmbd, fit_intercept):
Expand Down
2 changes: 1 addition & 1 deletion solvers/snapml.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class Solver(BaseSolver):
name = "snapml"

install_cmd = "conda"
requirements = ["pip:snapml"]
requirements = ["pip::snapml"]

stopping_criterion = SufficientDescentCriterion(eps=1e-10, patience=7)

Expand Down
4 changes: 4 additions & 0 deletions test_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ def check_test_solver_install(solver_class):
if "spams" in solver_class.name.lower():
pytest.skip("python-spams is not released for python 3.9 yet")

if "snapml" in solver_class.name.lower():
if sys.platform == "darwin":
pytest.xfail("SnapML is not supported on MacOS.")

if "cuml" in solver_class.name.lower():
if sys.platform == "darwin":
pytest.xfail("Cuml is not supported on MacOS.")
Expand Down
Loading