Skip to content

Bugfix: Add elastic_net model alias and handling #64

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

Closed
faildeny wants to merge 1 commit into from
Closed

Bugfix: Add elastic_net model alias and handling #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 flcore/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
import flcore.models.gbs as gbs

linear_models_list = ["logistic_regression", "linear_regression", "lsvc", "svr", "svm",
"lasso_regression", "ridge_regression","logistic_regression_elasticnet"]
"lasso_regression", "ridge_regression","logistic_regression_elasticnet", "linear_regression_elasticnet"]
linear_regression_models_list = ["linear_regression","lasso_regression", "svr", "svm",
"ridge_regression","linear_regression_elasticnet"]
survival_models_list = ["cox","rsf","gbs"]
Expand Down Expand Up @@ -91,7 +91,19 @@ def write(self, message):
def flush(self):
pass

def ResolveElasticNetAlias(config):
# "elastic_net" is the name used by the frontend; pick the model from the task
if config["model"] == "elastic_net":
if config["task"] == "classification":
config["model"] = "logistic_regression_elasticnet"
elif config["task"] == "regression":
config["model"] = "linear_regression_elasticnet"
else:
raise ValueError("elastic_net requires task to be classification or regression")
return config

def CheckClientConfig(config):
config = ResolveElasticNetAlias(config)
# Compaibilidad de logistic regression y elastic net con sus parámetros
assert config["task"] in ["classification","regression","none","survival"], "Task not valid"

Expand Down Expand Up @@ -309,6 +321,7 @@ def CheckClientConfig(config):


def CheckServerConfig(config):
config = ResolveElasticNetAlias(config)
assert isinstance(config['num_clients'], int), 'num_clients should be an int'
assert isinstance(config['num_rounds'], int), 'num_rounds should be an int'
if(config['smooth_method'] != 'None'):
Expand Down
14 changes: 7 additions & 7 deletions tests/test_federated_training.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,13 +65,13 @@ def case(model, scenario, client_extra=(), id_suffix="", bug=None):
# Linear regressors
for model in ["linear_regression", "lasso_regression", "ridge_regression"]:
CASES.append(case(model, "regression"))
CASES.append(
case(
"linear_regression_elasticnet",
"regression",
bug="server GetModelServerStrategy rejects it as 'Unknown model'",
)
)
CASES.append(case("linear_regression_elasticnet", "regression"))

# Frontend alias: the model is chosen from the task
CASES += [
case("elastic_net", "binary"),
case("elastic_net", "regression"),
]
for kernel in ["linear", "rbf", "poly", "sigmoid"]:
CASES.append(
case(
Expand Down
Loading