Skip to content

Commit 9c19cc3

Browse files
MasterSkepticistaMasterSkepticista
authored
Merge branch 'develop' into karansh1/batched_fetch
2 parents 19c29e2 + e1cd967 commit 9c19cc3

30 files changed

+710
-150
lines changed

‎openfl-workspace/torch/histology/src/dataloader.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ def load_histology_shard(shard_num, collaborator_count, feature_shape=None, num_
187187
numpy.ndarray: The validation data
188188
numpy.ndarray: The validation labels
189189
"""
190-
img_rows, img_cols = feature_shape[0], feature_shape[1]
190+
img_rows, img_cols = feature_shape[1], feature_shape[2]
191191

192192
(X_train, y_train), (X_valid, y_valid) = _load_raw_datashards(
193193
shard_num, collaborator_count)

‎openfl-workspace/torch/histology_fedcurv/src/dataloader.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ def load_histology_shard(shard_num, collaborator_count, feature_shape=None, num_
174174
numpy.ndarray: The validation data
175175
numpy.ndarray: The validation labels
176176
"""
177-
img_rows, img_cols = feature_shape[0], feature_shape[1]
177+
img_rows, img_cols = feature_shape[1], feature_shape[2]
178178

179179
(X_train, y_train), (X_valid, y_valid) = _load_raw_datashards(
180180
shard_num, collaborator_count)

‎openfl-workspace/torch/mnist_fed_eval/.workspace‎ renamed to ‎openfl-workspace/torch/histology_s3/.workspace‎

File renamed without changes.

‎openfl-workspace/torch/histology_s3/data/collaborator1/datasources.json‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
{
2+
"s3_ds1": {
3+
"params": {
4+
"access_key_env_name": "MINIO_ROOT_USER_2",
5+
"endpoint": "http://localhost:9000",
6+
"secret_key_env_name": "MINIO_ROOT_PASSWORD",
7+
"secret_name": "vault_secret_name2",
8+
"uri": "s3://my-bucket-2/"
9+
},
10+
"type": "s3"
11+
},
12+
"s3_ds2": {
13+
"params": {
14+
"access_key_env_name": "MINIO_ROOT_USER",
15+
"endpoint": "http://localhost:9000",
16+
"secret_key_env_name": "MINIO_ROOT_PASSWORD",
17+
"secret_name": "vault_secret_name1",
18+
"uri": "s3://my-bucket/"
19+
},
20+
"type": "s3"
21+
}
22+
}

‎openfl-workspace/torch/histology_s3/data/collaborator2/datasources.json‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"s3_ds3": {
3+
"params": {
4+
"access_key_env_name": "MINIO_ROOT_USER",
5+
"endpoint": "http://localhost:9000",
6+
"secret_key_env_name": "MINIO_ROOT_PASSWORD",
7+
"secret_name": "vault_secret_name1",
8+
"uri": "s3://my-bucket/"
9+
},
10+
"type": "s3"
11+
}
12+
}

‎openfl-workspace/torch/mnist_fed_eval/plan/cols.yaml‎ renamed to ‎openfl-workspace/torch/histology_s3/plan/cols.yaml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
# Copyright (C) 2020-2021 Intel Corporation
1+
# Copyright (C) 2025 Intel Corporation
22
# Licensed subject to the terms of the separately executed evaluation license agreement between Intel Corporation and you.
33

4-
collaborators:
5-
4+
collaborators:

‎openfl-workspace/torch/histology_s3/plan/data.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Copyright (C) 2025 Intel Corporation
2+
# Licensed subject to the terms of the separately executed evaluation license agreement between Intel Corporation and you.

‎openfl-workspace/torch/histology_s3/plan/plan.yaml‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
# Copyright (C) 2025 Intel Corporation
2+
# Licensed subject to the terms of the separately executed evaluation license agreement between Intel Corporation and you.
3+
4+
aggregator :
5+
defaults : plan/defaults/aggregator.yaml
6+
template : openfl.component.Aggregator
7+
settings :
8+
init_state_path : save/torch_cnn_histology_init.pbuf
9+
best_state_path : save/torch_cnn_histology_best.pbuf
10+
last_state_path : save/torch_cnn_histology_last.pbuf
11+
rounds_to_train : 2
12+
13+
collaborator :
14+
defaults : plan/defaults/collaborator.yaml
15+
template : openfl.component.Collaborator
16+
settings :
17+
use_delta_updates : false
18+
opt_treatment : RESET
19+
20+
data_loader :
21+
template : src.dataloader.PyTorchHistologyVerifiableDataLoader
22+
settings :
23+
collaborator_count : 2
24+
data_group_name : histology
25+
batch_size : 32
26+
27+
task_runner:
28+
defaults : plan/defaults/task_runner.yaml
29+
template: src.taskrunner.PyTorchCNN
30+
31+
network:
32+
defaults: plan/defaults/network.yaml
33+
34+
tasks:
35+
defaults: plan/defaults/tasks_torch.yaml
36+
37+
assigner:
38+
defaults: plan/defaults/assigner.yaml
39+
40+
compression_pipeline :
41+
defaults : plan/defaults/compression_pipeline.yaml

‎openfl-workspace/torch/histology_s3/requirements.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
setuptools>=65.5.1
2+
torch==2.7.0
3+
torchvision==0.22.0
4+
boto3>=1.37.19

‎openfl-workspace/torch/mnist_fed_eval/src/__init__.py‎ renamed to ‎openfl-workspace/torch/histology_s3/src/__init__.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
# Copyright (C) 2020-2021 Intel Corporation
1+
# Copyright (C) 2025 Intel Corporation
22
# SPDX-License-Identifier: Apache-2.0
3-
"""You may copy this file as the starting point of your own model."""
3+
"""You may copy this file as the starting point of your own model."""

0 commit comments

Comments
 (0)