Merge branch 'main' into sa_add_deep_mmd_loss

.gitignore

@@ -154,6 +154,7 @@ settings.json
 **/datasets/nnunet/**
 **/datasets/nnunet_raw/**
 **/datasets/nnunet_preprocessed/**
+**/datasets/cifar_partitioned_data/**
 
 # logs
 

examples/ae_examples/cvae_dim_example/server.py

@@ -10,7 +10,7 @@
 from examples.models.mnist_model import MnistNet
 from fl4health.checkpointing.checkpointer import BestLossTorchCheckpointer
 from fl4health.parameter_exchange.full_exchanger import FullParameterExchanger
-from fl4health.server.base_server import FlServerWithCheckpointing
+from fl4health.servers.base_server import FlServerWithCheckpointing
 from fl4health.utils.config import load_config
 from fl4health.utils.metric_aggregation import evaluate_metrics_aggregation_fn, fit_metrics_aggregation_fn
 from fl4health.utils.parameter_extraction import get_all_model_parameters

examples/ae_examples/cvae_examples/conv_cvae_example/server.py

@@ -11,7 +11,7 @@
 from fl4health.checkpointing.checkpointer import BestLossTorchCheckpointer
 from fl4health.model_bases.autoencoders_base import ConditionalVae
 from fl4health.parameter_exchange.full_exchanger import FullParameterExchanger
-from fl4health.server.base_server import FlServerWithCheckpointing
+from fl4health.servers.base_server import FlServerWithCheckpointing
 from fl4health.utils.config import load_config
 from fl4health.utils.metric_aggregation import evaluate_metrics_aggregation_fn, fit_metrics_aggregation_fn
 from fl4health.utils.parameter_extraction import get_all_model_parameters

examples/ae_examples/cvae_examples/mlp_cvae_example/server.py

@@ -11,7 +11,7 @@
 from fl4health.checkpointing.checkpointer import BestLossTorchCheckpointer
 from fl4health.model_bases.autoencoders_base import ConditionalVae
 from fl4health.parameter_exchange.full_exchanger import FullParameterExchanger
-from fl4health.server.base_server import FlServerWithCheckpointing
+from fl4health.servers.base_server import FlServerWithCheckpointing
 from fl4health.utils.config import load_config
 from fl4health.utils.metric_aggregation import evaluate_metrics_aggregation_fn, fit_metrics_aggregation_fn
 from fl4health.utils.parameter_extraction import get_all_model_parameters

examples/ae_examples/fedprox_vae_example/server.py

@@ -10,7 +10,7 @@
 from fl4health.checkpointing.checkpointer import BestLossTorchCheckpointer
 from fl4health.model_bases.autoencoders_base import VariationalAe
 from fl4health.parameter_exchange.full_exchanger import FullParameterExchanger
-from fl4health.server.base_server import FlServerWithCheckpointing
+from fl4health.servers.base_server import FlServerWithCheckpointing
 from fl4health.strategies.fedavg_with_adaptive_constraint import FedAvgWithAdaptiveConstraint
 from fl4health.utils.config import load_config
 from fl4health.utils.metric_aggregation import evaluate_metrics_aggregation_fn, fit_metrics_aggregation_fn

examples/apfl_example/server.py

@@ -11,7 +11,7 @@
 from examples.utils.functions import make_dict_with_epochs_or_steps
 from fl4health.model_bases.apfl_base import ApflModule
 from fl4health.reporting import JsonReporter
-from fl4health.server.base_server import FlServer
+from fl4health.servers.base_server import FlServer
 from fl4health.utils.config import load_config
 from fl4health.utils.metric_aggregation import evaluate_metrics_aggregation_fn, fit_metrics_aggregation_fn
 from fl4health.utils.parameter_extraction import get_all_model_parameters

examples/basic_example/server.py

@@ -11,7 +11,7 @@
 from examples.utils.functions import make_dict_with_epochs_or_steps
 from fl4health.checkpointing.checkpointer import BestLossTorchCheckpointer, LatestTorchCheckpointer
 from fl4health.parameter_exchange.full_exchanger import FullParameterExchanger
-from fl4health.server.base_server import FlServerWithCheckpointing
+from fl4health.servers.base_server import FlServerWithCheckpointing
 from fl4health.utils.config import load_config
 from fl4health.utils.metric_aggregation import evaluate_metrics_aggregation_fn, fit_metrics_aggregation_fn
 from fl4health.utils.parameter_extraction import get_all_model_parameters

examples/ditto_example/server.py

@@ -8,7 +8,7 @@
 
 from examples.models.cnn_model import MnistNet
 from examples.utils.functions import make_dict_with_epochs_or_steps
-from fl4health.server.adaptive_constraint_servers.ditto_server import DittoServer
+from fl4health.servers.adaptive_constraint_servers.ditto_server import DittoServer
 from fl4health.strategies.fedavg_with_adaptive_constraint import FedAvgWithAdaptiveConstraint
 from fl4health.utils.config import load_config
 from fl4health.utils.metric_aggregation import evaluate_metrics_aggregation_fn, fit_metrics_aggregation_fn

examples/dp_fed_examples/client_level_dp/server.py

@@ -8,7 +8,7 @@
 from examples.models.cnn_model import Net
 from examples.utils.functions import make_dict_with_epochs_or_steps
 from fl4health.client_managers.poisson_sampling_manager import PoissonSamplingClientManager
-from fl4health.server.client_level_dp_fed_avg_server import ClientLevelDPFedAvgServer
+from fl4health.servers.client_level_dp_fed_avg_server import ClientLevelDPFedAvgServer
 from fl4health.strategies.client_dp_fedavgm import ClientLevelDPFedAvgM
 from fl4health.utils.config import load_config
 from fl4health.utils.metric_aggregation import evaluate_metrics_aggregation_fn, fit_metrics_aggregation_fn

examples/dp_fed_examples/client_level_dp_weighted/server.py

@@ -10,7 +10,7 @@
 from examples.models.logistic_regression import LogisticRegression
 from examples.utils.functions import make_dict_with_epochs_or_steps
 from fl4health.client_managers.poisson_sampling_manager import PoissonSamplingClientManager
-from fl4health.server.client_level_dp_fed_avg_server import ClientLevelDPFedAvgServer
+from fl4health.servers.client_level_dp_fed_avg_server import ClientLevelDPFedAvgServer
 from fl4health.strategies.client_dp_fedavgm import ClientLevelDPFedAvgM
 from fl4health.utils.config import load_config
 from fl4health.utils.metric_aggregation import evaluate_metrics_aggregation_fn, fit_metrics_aggregation_fn

examples/dp_fed_examples/instance_level_dp/server.py

@@ -17,7 +17,7 @@
 from fl4health.client_managers.poisson_sampling_manager import PoissonSamplingClientManager
 from fl4health.parameter_exchange.full_exchanger import FullParameterExchanger
 from fl4health.reporting.base_reporter import BaseReporter
-from fl4health.server.instance_level_dp_server import InstanceLevelDpServer
+from fl4health.servers.instance_level_dp_server import InstanceLevelDpServer
 from fl4health.strategies.basic_fedavg import OpacusBasicFedAvg
 from fl4health.utils.config import load_config
 from fl4health.utils.metric_aggregation import evaluate_metrics_aggregation_fn, fit_metrics_aggregation_fn

examples/dp_scaffold_example/server.py

@@ -7,7 +7,7 @@
 
 from examples.models.cnn_model import MnistNet
 from fl4health.client_managers.poisson_sampling_manager import PoissonSamplingClientManager
-from fl4health.server.scaffold_server import DPScaffoldServer
+from fl4health.servers.scaffold_server import DPScaffoldServer
 from fl4health.strategies.scaffold import OpacusScaffold
 from fl4health.utils.config import load_config
 from fl4health.utils.metric_aggregation import evaluate_metrics_aggregation_fn, fit_metrics_aggregation_fn

examples/dynamic_layer_exchange_example/server.py

@@ -8,7 +8,7 @@
 
 from examples.models.cnn_model import Net
 from examples.utils.functions import make_dict_with_epochs_or_steps
-from fl4health.server.base_server import FlServer
+from fl4health.servers.base_server import FlServer
 from fl4health.strategies.fedavg_dynamic_layer import FedAvgDynamicLayer
 from fl4health.utils.config import load_config
 from fl4health.utils.metric_aggregation import evaluate_metrics_aggregation_fn, fit_metrics_aggregation_fn

examples/feature_alignment_example/server.py

@@ -10,7 +10,7 @@
 from examples.models.mlp_classifier import MLP
 from fl4health.client_managers.poisson_sampling_manager import PoissonSamplingClientManager
 from fl4health.feature_alignment.tab_features_info_encoder import TabularFeaturesInfoEncoder
-from fl4health.server.tabular_feature_alignment_server import TabularFeatureAlignmentServer
+from fl4health.servers.tabular_feature_alignment_server import TabularFeatureAlignmentServer
 from fl4health.strategies.basic_fedavg import BasicFedAvg
 from fl4health.utils.config import load_config
 from fl4health.utils.metric_aggregation import evaluate_metrics_aggregation_fn, fit_metrics_aggregation_fn

examples/fedbn_example/server.py

@@ -11,7 +11,7 @@
 
 from examples.models.cnn_model import MnistNetWithBnAndFrozen, SkinCancerNet
 from examples.utils.functions import make_dict_with_epochs_or_steps
-from fl4health.server.base_server import FlServer
+from fl4health.servers.base_server import FlServer
 from fl4health.strategies.basic_fedavg import BasicFedAvg
 from fl4health.utils.config import load_config
 from fl4health.utils.metric_aggregation import evaluate_metrics_aggregation_fn, fit_metrics_aggregation_fn

examples/feddg_ga_example/server.py

@@ -10,7 +10,7 @@
 from fl4health.client_managers.fixed_sampling_client_manager import FixedSamplingClientManager
 from fl4health.model_bases.apfl_base import ApflModule
 from fl4health.reporting import JsonReporter
-from fl4health.server.base_server import FlServer
+from fl4health.servers.base_server import FlServer
 from fl4health.strategies.feddg_ga import FedDgGa
 from fl4health.utils.config import load_config
 from fl4health.utils.metric_aggregation import evaluate_metrics_aggregation_fn, fit_metrics_aggregation_fn

examples/federated_eval_example/server.py

@@ -5,7 +5,7 @@
 import flwr as fl
 
 from fl4health.client_managers.fixed_without_replacement_manager import FixedSamplingByFractionClientManager
-from fl4health.server.evaluate_server import EvaluateServer
+from fl4health.servers.evaluate_server import EvaluateServer
 from fl4health.utils.config import load_config
 from fl4health.utils.metric_aggregation import uniform_evaluate_metrics_aggregation_fn
 

examples/fedopt_example/client_data.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import json
 from pathlib import Path
 from typing import Dict, List, Optional, Tuple
@@ -20,7 +22,7 @@ def __init__(self, classes: List[str], label_to_class: Dict[int, str], class_to_
         self.class_to_label = class_to_label
 
     @staticmethod
-    def encoder_from_dataframe(df: pd.DataFrame, class_column: str) -> "LabelEncoder":
+    def encoder_from_dataframe(df: pd.DataFrame, class_column: str) -> LabelEncoder:
         categories = df[class_column].astype("category")
         categories_str = [str(category) for category in categories.to_list()]
         label_to_class = dict(set(zip(categories.cat.codes, categories_str)))
@@ -29,7 +31,7 @@ def encoder_from_dataframe(df: pd.DataFrame, class_column: str) -> "LabelEncoder
         return LabelEncoder(classes, label_to_class, class_to_label)
 
     @staticmethod
-    def from_json(json_str: str) -> "LabelEncoder":
+    def from_json(json_str: str) -> LabelEncoder:
         attributes = json.loads(json_str)
         # need to cast string keys to int
         label_to_class = {int(label): category for label, category in json.loads(attributes["label_to_class"]).items()}
@@ -59,7 +61,7 @@ def __init__(self, vocabulary_dict: Optional[Dict[str, int]], train_set: Optiona
         elif train_set is not None:
             self._create_vocabulary(train_set)
         else:
-            raise ValueError("Must provide either precumputed dictionary or training set to create vocabulary")
+            raise ValueError("Must provide either precomputed dictionary or training set to create vocabulary")
         self.vocabulary_size = len(self.word2index)
 
     def _create_vocabulary(self, train_set: List[List[str]]) -> None:
@@ -95,7 +97,7 @@ def to_json(self) -> str:
         return json.dumps(self.word2index)
 
     @staticmethod
-    def from_json(json_str: str) -> "Vocabulary":
+    def from_json(json_str: str) -> Vocabulary:
         return Vocabulary(json.loads(json_str), None)
 
 

examples/fedopt_example/metrics.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import json
 from logging import INFO
 from typing import Dict, List, Optional
@@ -43,7 +45,7 @@ def summarize(self) -> Dict[str, float]:
         }
 
     @staticmethod
-    def from_results_dict(class_name: str, stats_string: str) -> "Outcome":
+    def from_results_dict(class_name: str, stats_string: str) -> Outcome:
         outcome = Outcome(class_name)
         stats = json.loads(stats_string)
         outcome.true_positive = stats[0]
@@ -52,7 +54,7 @@ def from_results_dict(class_name: str, stats_string: str) -> "Outcome":
         return outcome
 
     @staticmethod
-    def merge_outcomes(outcome_1: "Outcome", outcome_2: "Outcome") -> "Outcome":
+    def merge_outcomes(outcome_1: "Outcome", outcome_2: "Outcome") -> Outcome:
         assert outcome_1.class_name == outcome_2.class_name
         outcome_1.true_positive += outcome_2.true_positive
         outcome_1.false_negative += outcome_2.false_negative

examples/fedopt_example/server.py

@@ -15,7 +15,7 @@
 from examples.fedopt_example.client_data import LabelEncoder, Vocabulary, get_local_data, word_tokenize
 from examples.fedopt_example.metrics import Outcome, ServerMetrics
 from examples.models.lstm_model import LSTM
-from fl4health.server.base_server import FlServer
+from fl4health.servers.base_server import FlServer
 from fl4health.utils.config import load_config
 from fl4health.utils.parameter_extraction import get_all_model_parameters
 

examples/fedpca_examples/dim_reduction/server.py

@@ -10,7 +10,7 @@
 from examples.models.mnist_model import MnistNet
 from fl4health.checkpointing.checkpointer import BestLossTorchCheckpointer
 from fl4health.parameter_exchange.full_exchanger import FullParameterExchanger
-from fl4health.server.base_server import FlServerWithCheckpointing
+from fl4health.servers.base_server import FlServerWithCheckpointing
 from fl4health.utils.config import load_config
 from fl4health.utils.metric_aggregation import evaluate_metrics_aggregation_fn, fit_metrics_aggregation_fn
 from fl4health.utils.parameter_extraction import get_all_model_parameters

examples/fedper_example/server.py

@@ -13,7 +13,7 @@
 )
 from examples.utils.functions import make_dict_with_epochs_or_steps
 from fl4health.model_bases.sequential_split_models import SequentiallySplitExchangeBaseModel
-from fl4health.server.base_server import FlServer
+from fl4health.servers.base_server import FlServer
 from fl4health.utils.config import load_config
 from fl4health.utils.metric_aggregation import evaluate_metrics_aggregation_fn, fit_metrics_aggregation_fn
 from fl4health.utils.parameter_extraction import get_all_model_parameters

examples/fedpm_example/server.py

@@ -8,7 +8,7 @@
 
 from examples.models.masked_model import Masked4Cnn
 from examples.utils.functions import make_dict_with_epochs_or_steps
-from fl4health.server.fedpm_server import FedPmServer
+from fl4health.servers.fedpm_server import FedPmServer
 from fl4health.strategies.fedpm import FedPm
 from fl4health.utils.config import load_config
 from fl4health.utils.metric_aggregation import evaluate_metrics_aggregation_fn, fit_metrics_aggregation_fn

examples/fedprox_example/server.py

@@ -11,7 +11,7 @@
 from examples.models.cnn_model import MnistNet
 from examples.utils.functions import make_dict_with_epochs_or_steps
 from fl4health.reporting import JsonReporter, WandBReporter
-from fl4health.server.adaptive_constraint_servers.fedprox_server import FedProxServer
+from fl4health.servers.adaptive_constraint_servers.fedprox_server import FedProxServer
 from fl4health.strategies.fedavg_with_adaptive_constraint import FedAvgWithAdaptiveConstraint
 from fl4health.utils.config import load_config
 from fl4health.utils.metric_aggregation import evaluate_metrics_aggregation_fn, fit_metrics_aggregation_fn

examples/fedrep_example/server.py

@@ -12,7 +12,7 @@
     SequentialLocalPredictionHeadCifar,
 )
 from fl4health.model_bases.fedrep_base import FedRepModel
-from fl4health.server.base_server import FlServer
+from fl4health.servers.base_server import FlServer
 from fl4health.utils.config import load_config
 from fl4health.utils.metric_aggregation import evaluate_metrics_aggregation_fn, fit_metrics_aggregation_fn
 from fl4health.utils.parameter_extraction import get_all_model_parameters

examples/fedsimclr_example/fedsimclr_finetuning_example/server.py

@@ -13,7 +13,7 @@
 from fl4health.checkpointing.checkpointer import BestLossTorchCheckpointer
 from fl4health.model_bases.fedsimclr_base import FedSimClrModel
 from fl4health.parameter_exchange.full_exchanger import FullParameterExchanger
-from fl4health.server.base_server import FlServerWithCheckpointing
+from fl4health.servers.base_server import FlServerWithCheckpointing
 from fl4health.utils.config import load_config
 from fl4health.utils.metric_aggregation import evaluate_metrics_aggregation_fn, fit_metrics_aggregation_fn
 from fl4health.utils.parameter_extraction import get_all_model_parameters

examples/fedsimclr_example/fedsimclr_pretraining_example/server.py

@@ -13,7 +13,7 @@
 from fl4health.checkpointing.checkpointer import BestLossTorchCheckpointer
 from fl4health.model_bases.fedsimclr_base import FedSimClrModel
 from fl4health.parameter_exchange.full_exchanger import FullParameterExchanger
-from fl4health.server.base_server import FlServerWithCheckpointing
+from fl4health.servers.base_server import FlServerWithCheckpointing
 from fl4health.utils.config import load_config
 from fl4health.utils.metric_aggregation import evaluate_metrics_aggregation_fn, fit_metrics_aggregation_fn
 from fl4health.utils.parameter_extraction import get_all_model_parameters

examples/fenda_ditto_example/server.py

@@ -12,7 +12,7 @@
 )
 from examples.utils.functions import make_dict_with_epochs_or_steps
 from fl4health.model_bases.sequential_split_models import SequentiallySplitExchangeBaseModel
-from fl4health.server.base_server import FlServer
+from fl4health.servers.base_server import FlServer
 from fl4health.strategies.fedavg_with_adaptive_constraint import FedAvgWithAdaptiveConstraint
 from fl4health.utils.config import load_config
 from fl4health.utils.metric_aggregation import evaluate_metrics_aggregation_fn, fit_metrics_aggregation_fn

examples/fenda_example/server.py

@@ -11,7 +11,7 @@
 from examples.utils.functions import make_dict_with_epochs_or_steps
 from fl4health.model_bases.fenda_base import FendaModel
 from fl4health.model_bases.parallel_split_models import ParallelFeatureJoinMode
-from fl4health.server.base_server import FlServer
+from fl4health.servers.base_server import FlServer
 from fl4health.utils.config import load_config
 from fl4health.utils.metric_aggregation import evaluate_metrics_aggregation_fn, fit_metrics_aggregation_fn
 from fl4health.utils.parameter_extraction import get_all_model_parameters

examples/fl_plus_local_ft_example/server.py

@@ -9,7 +9,7 @@
 
 from examples.models.cnn_model import Net
 from examples.utils.functions import make_dict_with_epochs_or_steps
-from fl4health.server.base_server import FlServer
+from fl4health.servers.base_server import FlServer
 from fl4health.utils.config import load_config
 from fl4health.utils.metric_aggregation import evaluate_metrics_aggregation_fn, fit_metrics_aggregation_fn
 from fl4health.utils.parameter_extraction import get_all_model_parameters

examples/flash_example/server.py

@@ -8,7 +8,7 @@
 
 from examples.models.cnn_model import Net
 from examples.utils.functions import make_dict_with_epochs_or_steps
-from fl4health.server.base_server import FlServer
+from fl4health.servers.base_server import FlServer
 from fl4health.strategies.flash import Flash
 from fl4health.utils.config import load_config
 from fl4health.utils.metric_aggregation import evaluate_metrics_aggregation_fn, fit_metrics_aggregation_fn

examples/model_merge_example/server.py

@@ -14,7 +14,7 @@
 from examples.models.cnn_model import MnistNet
 from fl4health.checkpointing.checkpointer import LatestTorchCheckpointer
 from fl4health.parameter_exchange.full_exchanger import FullParameterExchanger
-from fl4health.server.model_merge_server import ModelMergeServer
+from fl4health.servers.model_merge_server import ModelMergeServer
 from fl4health.strategies.model_merge_strategy import ModelMergeStrategy
 from fl4health.utils.config import load_config
 from fl4health.utils.load_data import load_mnist_data

examples/moon_example/server.py

@@ -10,7 +10,7 @@
 from examples.models.moon_cnn import BaseCnn, HeadCnn, ProjectionCnn
 from examples.utils.functions import make_dict_with_epochs_or_steps
 from fl4health.model_bases.moon_base import MoonModel
-from fl4health.server.base_server import FlServer
+from fl4health.servers.base_server import FlServer
 from fl4health.utils.config import load_config
 from fl4health.utils.metric_aggregation import evaluate_metrics_aggregation_fn, fit_metrics_aggregation_fn
 from fl4health.utils.parameter_extraction import get_all_model_parameters

examples/mr_mtl_example/server.py

@@ -8,7 +8,7 @@
 
 from examples.models.cnn_model import MnistNet
 from examples.utils.functions import make_dict_with_epochs_or_steps
-from fl4health.server.adaptive_constraint_servers.mrmtl_server import MrMtlServer
+from fl4health.servers.adaptive_constraint_servers.mrmtl_server import MrMtlServer
 from fl4health.strategies.fedavg_with_adaptive_constraint import FedAvgWithAdaptiveConstraint
 from fl4health.utils.config import load_config
 from fl4health.utils.metric_aggregation import evaluate_metrics_aggregation_fn, fit_metrics_aggregation_fn