Mentions légales du service

Skip to content
Snippets Groups Projects
Verified Commit b39b2326 authored by ANDREY Paul's avatar ANDREY Paul
Browse files

Change fairness algorithms registration names to match submodule names.

parent 5847d211
No related branches found
No related tags found
1 merge request!69Enable Fairness-Aware Federated Learning
...@@ -72,6 +72,9 @@ Algorithms submodules ...@@ -72,6 +72,9 @@ Algorithms submodules
* [monitor][declearn.fairness.monitor]: * [monitor][declearn.fairness.monitor]:
Fairness-monitoring controllers, that leave training unaltered. Fairness-monitoring controllers, that leave training unaltered.
Note that the controllers implemented under these submodules
are type-registered under the submodule's name.
References References
---------- ----------
......
...@@ -46,7 +46,7 @@ __all__ = [ ...@@ -46,7 +46,7 @@ __all__ = [
class FairbatchControllerClient(FairnessControllerClient): class FairbatchControllerClient(FairnessControllerClient):
"""Client-side controller to implement Fed-FairBatch or FedFB.""" """Client-side controller to implement Fed-FairBatch or FedFB."""
algorithm = "fedfairbatch" algorithm = "fairbatch"
def __init__( def __init__(
self, self,
......
...@@ -73,7 +73,7 @@ class FairbatchControllerServer(FairnessControllerServer): ...@@ -73,7 +73,7 @@ class FairbatchControllerServer(FairnessControllerServer):
https://arxiv.org/abs/2110.15545 https://arxiv.org/abs/2110.15545
""" """
algorithm = "fedfairbatch" algorithm = "fairbatch"
def __init__( def __init__(
self, self,
......
...@@ -40,7 +40,7 @@ __all__ = [ ...@@ -40,7 +40,7 @@ __all__ = [
class FairgradControllerClient(FairnessControllerClient): class FairgradControllerClient(FairnessControllerClient):
"""Client-side controller to implement Fed-FairGrad.""" """Client-side controller to implement Fed-FairGrad."""
algorithm = "fedfairgrad" algorithm = "fairgrad"
async def finalize_fairness_setup( async def finalize_fairness_setup(
self, self,
......
...@@ -176,7 +176,7 @@ class FairgradControllerServer(FairnessControllerServer): ...@@ -176,7 +176,7 @@ class FairgradControllerServer(FairnessControllerServer):
https://openreview.net/forum?id=0f8tU3QwWD https://openreview.net/forum?id=0f8tU3QwWD
""" """
algorithm = "fedfairgrad" algorithm = "fairgrad"
def __init__( def __init__(
self, self,
......
...@@ -190,7 +190,7 @@ class TestFLOptimConfig: ...@@ -190,7 +190,7 @@ class TestFLOptimConfig:
"""Test parsing 'fairness' from a dict.""" """Test parsing 'fairness' from a dict."""
field = FIELDS["fairness"] field = FIELDS["fairness"]
config = { config = {
"algorithm": "fedfairgrad", "algorithm": "fairgrad",
"f_type": "demographic_parity", "f_type": "demographic_parity",
"eta": 0.1, "eta": 0.1,
"eps": 0.0, "eps": 0.0,
...@@ -204,7 +204,7 @@ class TestFLOptimConfig: ...@@ -204,7 +204,7 @@ class TestFLOptimConfig:
def test_parse_fairness_dict_error(self) -> None: def test_parse_fairness_dict_error(self) -> None:
"""Test parsing 'fairness' from an invalid dict.""" """Test parsing 'fairness' from an invalid dict."""
field = FIELDS["fairness"] field = FIELDS["fairness"]
config = {"algorithm": "fedfairgrad"} # missing f_type choice config = {"algorithm": "fairgrad"} # missing f_type choice
with pytest.raises(TypeError): with pytest.raises(TypeError):
FLOptimConfig.parse_fairness(field, config) FLOptimConfig.parse_fairness(field, config)
...@@ -230,7 +230,7 @@ class TestFLOptimConfig: ...@@ -230,7 +230,7 @@ class TestFLOptimConfig:
lrate = 1.0 lrate = 1.0
modules = [["adam", {beta_1=0.8, beta_2=0.9}]] modules = [["adam", {beta_1=0.8, beta_2=0.9}]]
[optim.fairness] [optim.fairness]
algorithm = "fedfairgrad" algorithm = "fairgrad"
f_type = "equalized_odds" f_type = "equalized_odds"
eta = 0.1 eta = 0.1
eps = 0.0 eps = 0.0
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment