MEDfl 2.0.4__py3-none-any.whl → 2.0.4.dev1__py3-none-any.whl

MEDfl/rw/model.py

@@ -1,75 +1,19 @@
-# client.py
-import argparse
-import pandas as pd
-import flwr as fl
-import torch
 import torch.nn as nn
-import torch.optim as optim
-from MEDfl.rw.model import Net  # your model definition in model.py
-
-class FlowerClient(fl.client.NumPyClient):
-    def __init__(self, server_address: str, data_path: str = "data/data.csv"):
-        self.server_address = server_address
-
-        # 1. Load model
-        self.model = Net()
-        self.loss_fn = nn.MSELoss()
-        self.optimizer = optim.SGD(self.model.parameters(), lr=0.01)
-
-        # 2. Load data from CSV
-        df = pd.read_csv(data_path)
-        # Assume last column is label
-        X = df.iloc[:, :-1].values
-        y = df.iloc[:, -1].values
-
-        self.X_train = torch.tensor(X, dtype=torch.float32)
-        # If it's regression with single output; remove unsqueeze for multi-class
-        self.y_train = torch.tensor(y, dtype=torch.float32).unsqueeze(1)
-
-    def get_parameters(self, config):
-        return [val.cpu().numpy() for val in self.model.state_dict().values()]
-
-    def set_parameters(self, parameters):
-        params_dict = zip(self.model.state_dict().keys(), parameters)
-        state_dict = {k: torch.tensor(v) for k, v in params_dict}
-        self.model.load_state_dict(state_dict, strict=True)
-
-    def fit(self, parameters, config):
-        self.set_parameters(parameters)
-        self.model.train()
-        for _ in range(5):
-            self.optimizer.zero_grad()
-            preds = self.model(self.X_train)
-            loss = self.loss_fn(preds, self.y_train)
-            loss.backward()
-            self.optimizer.step()
-        # Return updated params, number of examples, and an empty metrics dict
-        return self.get_parameters(config), len(self.X_train), {}
-
-    def evaluate(self, parameters, config):
-        self.set_parameters(parameters)
-        self.model.eval()
-        with torch.no_grad():
-            preds = self.model(self.X_train)
-            loss = self.loss_fn(preds, self.y_train).item()
-        return float(loss), len(self.X_train), {}
-
-if __name__ == "__main__":
-    parser = argparse.ArgumentParser(description="Flower client")
-    parser.add_argument(
-        "--server_address",
-        type=str,
-        required=True,
-        help="Address of the Flower server (e.g., 127.0.0.1:8080)",
-    )
-    parser.add_argument(
-        "--data_path",
-        type=str,
-        default="data/data.csv",
-        help="Path to your CSV training data",
-    )
-    args = parser.parse_args()
-
-    # Instantiate and start the client
-    client = FlowerClient(server_address=args.server_address, data_path=args.data_path)
-    fl.client.start_numpy_client(server_address=client.server_address, client=client)
+import torch.nn.functional as F
+
+class Net(nn.Module):
+    def __init__(self, input_dim):
+        super().__init__()
+        self.fc1 = nn.Linear(input_dim, 64)
+        self.fc2 = nn.Linear(64, 32)
+        self.fc3 = nn.Linear(32, 1)
+        self.dropout = nn.Dropout(0.3)
+        self.batchnorm1 = nn.BatchNorm1d(64)
+        self.batchnorm2 = nn.BatchNorm1d(32)
+
+    def forward(self, x):
+        x = F.relu(self.batchnorm1(self.fc1(x)))
+        x = self.dropout(x)
+        x = F.relu(self.batchnorm2(self.fc2(x)))
+        x = self.dropout(x)
+        return self.fc3(x)  # raw logits for BCEWithLogitsLoss

MEDfl/rw/strategy.py

@@ -108,7 +108,7 @@ class Strategy:
             # Print individual client fit metrics
             print(f"\n[Server] 🔄 Round {rnd} - Client Training Metrics:")
             for i, (client_id, fit_res) in enumerate(results):
-                print(f"  Client {client_id.cid}: {fit_res.metrics}")
+                print(f" CTM Round {rnd} Client:{client_id.cid}: {fit_res.metrics}")
 
             # Call original aggregation function
             aggregated_params, metrics = original_agg_fit(rnd, results, failures)
@@ -125,7 +125,7 @@ class Strategy:
             # Print individual client evaluation metrics
             print(f"\n[Server] 📊 Round {rnd} - Client Evaluation Metrics:")
             for i, (client_id, eval_res) in enumerate(results):
-                print(f"  Client {client_id.cid}: {eval_res.metrics}")
+                print(f" CEM Round {rnd} Client:{client_id.cid}: {eval_res.metrics}")
 
             # Call original aggregation function
             loss, metrics = original_agg_eval(rnd, results, failures)

{medfl-2.0.4.dist-info → MEDfl-2.0.4.dev1.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.1
 Name: MEDfl
-Version: 2.0.4
+Version: 2.0.4.dev1
 Summary: Python Open-source package for simulating federated learning and differential privacy
 Home-page: https://github.com/MEDomics-UdeS/MEDfl
 Author: MEDomics consortium
@@ -35,18 +35,6 @@ Requires-Dist: plotly==5.19.0
 Requires-Dist: optuna==3.5.0
 Requires-Dist: mysql-connector-python~=9.3.0
 Requires-Dist: seaborn~=0.13.2
-Dynamic: author
-Dynamic: author-email
-Dynamic: classifier
-Dynamic: description
-Dynamic: description-content-type
-Dynamic: home-page
-Dynamic: keywords
-Dynamic: license-file
-Dynamic: project-url
-Dynamic: requires-dist
-Dynamic: requires-python
-Dynamic: summary
 
 # MEDfl: Federated Learning and Differential Privacy Simulation Tool for Tabular Data
 ![Python Versions](https://img.shields.io/badge/python-3.9-blue)

{medfl-2.0.4.dist-info → MEDfl-2.0.4.dev1.dist-info}/RECORD

@@ -21,10 +21,10 @@ MEDfl/NetManager/network.py,sha256=5t705fzWc-BRg-QPAbAcDv5ckDGzsPwj_Q5V0iTgkx0,6
 MEDfl/NetManager/node.py,sha256=t90QuYZ8M1X_AG1bwTta0CnlOuodqkmpVda2K7NOgHc,6542
 MEDfl/rw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 MEDfl/rw/client.py,sha256=k8y8Wxh2KNe2oy5gRD-KXpTEGCYzp7X2oF5-Z6Rk1_E,1329
-MEDfl/rw/model.py,sha256=a3mrACDqg4K1V4Qyhh0PBEmWL5SpUYsiEarWHwsVcGk,2704
+MEDfl/rw/model.py,sha256=TKCfE4nYx75uQdgABwEMkb_ynT-xS_MxNPbGAzJ3EcQ,629
 MEDfl/rw/rwConfig.py,sha256=nK3Inv7v7Dm9gZnUnK5EqA4DmQ7TqiH4UoCZ8MlgFjA,823
 MEDfl/rw/server.py,sha256=PiCrUTlnx7rVcO9DcT-vnJF5WkOCe4eEzWXeRSUBh10,3286
-MEDfl/rw/strategy.py,sha256=DbgitZzW9Hu7rUnkHdRCq8sKkOGLjMMHPsHRIEVZXwM,6203
+MEDfl/rw/strategy.py,sha256=sUwu0aAq6q3sKnfRimCRfps3be8s2iepGoD9NfcyjXI,6233
 MEDfl/rw/verbose_server.py,sha256=B_abnpCy43e3YrjotLFOm7cLiuiB5PSTeXD5sMP0CxA,851
 MEDfl/scripts/__init__.py,sha256=Pq1weevsPaU7MRMHfBYeyT0EOFeWLeVM6Y1DVz6jw1A,48
 MEDfl/scripts/base.py,sha256=QrmG7gkiPYkAy-5tXxJgJmOSLGAKeIVH6i0jq7G9xnA,752
@@ -55,8 +55,8 @@ Medfl/scripts/base.py,sha256=QrmG7gkiPYkAy-5tXxJgJmOSLGAKeIVH6i0jq7G9xnA,752
 Medfl/scripts/create_db.py,sha256=MnFtZkTueRZ-3qXPNX4JsXjOKj-4mlkxoRhSFdRcvJw,3817
 alembic/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 alembic/env.py,sha256=-aSZ6SlJeK1ZeqHgM-54hOi9LhJRFP0SZGjut-JnY-4,1588
-medfl-2.0.4.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-medfl-2.0.4.dist-info/METADATA,sha256=hFoRqPRyKiqNCbBw3RcrYEh9fSRlAZChdEGaoNrLIGQ,4579
-medfl-2.0.4.dist-info/WHEEL,sha256=lTU6B6eIfYoiQJTZNc-fyaR6BpL6ehTzU3xGYxn2n8k,91
-medfl-2.0.4.dist-info/top_level.txt,sha256=dIL9X8HOFuaVSzpg40DVveDPrymWRoShHtspH7kkjdI,14
-medfl-2.0.4.dist-info/RECORD,,
+MEDfl-2.0.4.dev1.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+MEDfl-2.0.4.dev1.dist-info/METADATA,sha256=rvSMS_MZCyEDMkL54d4tRwWtSCa3AIQ3wuj6yZbszOc,4326
+MEDfl-2.0.4.dev1.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+MEDfl-2.0.4.dev1.dist-info/top_level.txt,sha256=dIL9X8HOFuaVSzpg40DVveDPrymWRoShHtspH7kkjdI,14
+MEDfl-2.0.4.dev1.dist-info/RECORD,,

{medfl-2.0.4.dist-info → MEDfl-2.0.4.dev1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (78.1.1)
+Generator: bdist_wheel (0.45.1)
 Root-Is-Purelib: true
 Tag: py3-none-any