Skip to content
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.

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

FL support #552

Draft
wants to merge 128 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
128 commits
Select commit Hold shift + click to select a range
a11e264
fl support code
hasan7n Feb 28, 2024
8f52c49
adapt mock_tokens folder
hasan7n Feb 28, 2024
23301fd
fix passing port and collaborator env variable
hasan7n Feb 29, 2024
b04ee0c
fixes related to cube.download refactoring
hasan7n Feb 29, 2024
a147df8
remove TODOs from version control
hasan7n Feb 29, 2024
b9a91d9
update code according storage related changes
hasan7n Feb 29, 2024
ebd46d4
minor server fixes
hasan7n Mar 2, 2024
218315a
fix config storage
hasan7n Mar 2, 2024
eb74c04
fix typo
hasan7n Mar 5, 2024
7a5ae3a
Merge remote-tracking branch 'upstream/main' into fl-poc
hasan7n Mar 5, 2024
dfe4084
tmp fix mlcube issue
hasan7n Mar 5, 2024
417424a
add FL integration test
hasan7n Mar 6, 2024
ca72d8e
debug
hasan7n Mar 6, 2024
c5ce774
debug
hasan7n Mar 6, 2024
77d099a
debug
hasan7n Mar 6, 2024
e1427de
debug
hasan7n Mar 6, 2024
b5edaff
add prep cube for FL tests
hasan7n Mar 12, 2024
a8f2f94
update and restructure fl example
hasan7n Mar 12, 2024
2ff534d
update cli training tests
hasan7n Mar 12, 2024
ee8d195
fix bugs
hasan7n Mar 12, 2024
9f2935a
TMP TO BE REVERTED
hasan7n Mar 21, 2024
294fd84
multiple datasets per collaborator cert
hasan7n Mar 25, 2024
710652a
fix training tests
hasan7n Mar 26, 2024
b3e4e52
empty
hasan7n Mar 26, 2024
fb860e1
Merge remote-tracking branch 'upstream/main' into fl-poc
hasan7n Mar 26, 2024
0181e47
post-merging-main fixes
hasan7n Mar 26, 2024
ff3c4ad
debug
hasan7n Mar 26, 2024
4131f78
Merge remote-tracking branch 'upstream/main' into fl-poc
hasan7n Apr 1, 2024
4d4c53e
fix testing util
hasan7n Apr 2, 2024
03ebfbb
fix training tests
hasan7n Apr 2, 2024
20ec858
use ip address for aggregtor
hasan7n Apr 2, 2024
f3910b8
aggregator changes
hasan7n Apr 18, 2024
36c4ddc
add ca server entity
hasan7n Apr 18, 2024
687f8e7
associations refactoring
hasan7n Apr 18, 2024
c7883b5
remove signing code
hasan7n Apr 18, 2024
1b356cb
add training event object
hasan7n Apr 22, 2024
9205d98
modify training event
hasan7n Apr 22, 2024
7b9b3a1
modify training event
hasan7n Apr 22, 2024
dc6cadd
changes to training entity
hasan7n Apr 22, 2024
acc67c1
traindataset association updates
hasan7n Apr 22, 2024
c122539
add aggregator_association
hasan7n Apr 23, 2024
09d49c1
add ca_association
hasan7n Apr 23, 2024
7cb1660
update state logic in benchmarks for consistency
hasan7n Apr 23, 2024
0febf6b
create migrations and admin views
hasan7n Apr 23, 2024
c479c3e
update fl mlcube interface
hasan7n Apr 26, 2024
7e45c55
Merge remote-tracking branch 'upstream/main' into fl-tmp
hasan7n Apr 27, 2024
48ccd60
refactor entities
hasan7n Apr 27, 2024
89f256b
client updates
hasan7n Apr 29, 2024
33ad968
update FL example
hasan7n Apr 29, 2024
45bedcc
update/create missing APIs
hasan7n Apr 29, 2024
2343ba1
update new migration files
hasan7n Apr 29, 2024
19c80d8
add mock crt mlcube
hasan7n Apr 29, 2024
ed2d33e
update test env
hasan7n Apr 29, 2024
bf69385
bug fixes
hasan7n Apr 30, 2024
c4b3fa7
use event's report within a subfolder
hasan7n Apr 30, 2024
0ee1b7f
use IP address instead of hostname in integration tests
hasan7n Apr 30, 2024
be5a0ba
fix tests
hasan7n Apr 30, 2024
ad93f1f
remove comment
hasan7n Apr 30, 2024
9f52cd3
add --overwrite flag for an easier life
hasan7n May 1, 2024
3c7e9ea
use abs path for training config
hasan7n May 1, 2024
ce20325
add missing call
hasan7n May 1, 2024
5b7da41
REVERT ME
hasan7n May 1, 2024
b21ef08
remove trailing equals
hasan7n May 1, 2024
fd80541
fix mock certs issue
hasan7n May 1, 2024
192767c
add download run files
hasan7n May 1, 2024
a3e3a54
Revert "REVERT ME"
hasan7n May 1, 2024
d0ac9ec
use ip address in integration tests
hasan7n May 1, 2024
cab620d
add option to choose interface for publishing port
hasan7n May 6, 2024
0b5e4c0
remove some TODOs from the code
hasan7n May 17, 2024
4f73035
add ca server and client code
hasan7n May 17, 2024
220afee
Merge remote-tracking branch 'upstream/main' into fl-tmp
hasan7n May 20, 2024
5a1256a
temporary measures for minimum UI friction
hasan7n May 21, 2024
3dd45ff
empty
hasan7n May 21, 2024
961e2bd
Merge remote-tracking branch 'upstream/main' into fl-tmp
hasan7n May 21, 2024
712bcf6
post-merge main
hasan7n May 21, 2024
e76bea6
skip approval in tests
hasan7n May 21, 2024
97b1bac
bug fix for association ls
hasan7n May 21, 2024
af650e5
better UI for data owners
hasan7n May 21, 2024
4777e60
config storage migration
hasan7n May 22, 2024
538ea4e
update medperf version
hasan7n May 22, 2024
6b42235
use check update again
hasan7n May 22, 2024
6d2e16e
Draft example of NNUNet Integration with OpenFL and MedPerf
msheller Jun 11, 2024
c10100d
Merge branch 'main' into fl-poc
hasan7n Jun 12, 2024
2615ee7
Merge remote-tracking branch 'origin/fl-poc' into fl-poc-nnunet-draft
hasan7n Jun 12, 2024
5c83c5b
use same setup files as fl/fl
hasan7n Jun 12, 2024
b44ab75
Added missing utils file and changed import path to read from the src…
msheller Jun 13, 2024
aa781fb
Merge branch 'fl-poc-nnunet-draft' of https://github.com/hasan7n/medp…
msheller Jun 13, 2024
76e11b4
remove buggy unused imports
hasan7n Jun 13, 2024
21bbd1d
modify build script
hasan7n Jun 14, 2024
107c1f1
Merge remote-tracking branch 'origin/fl-dev' into fl-poc-nnunet-draft
hasan7n Jun 14, 2024
046ad75
sync fl examples
hasan7n Jul 2, 2024
685c64b
draft update for the shape mismatch fix
hasan7n Jul 10, 2024
e902989
rename imports
hasan7n Jul 10, 2024
41b4fd9
bugfixes, add init_model task
hasan7n Jul 18, 2024
73f145f
change tests config scripts
hasan7n Jul 18, 2024
30d394f
modify test setup script
hasan7n Jul 18, 2024
8405bd2
WIP. About to merge openfl PR 996
msheller Jul 28, 2024
2fe0635
add fl-admin mlcube
hasan7n Jul 29, 2024
7cc3dd2
allow passing col list when starting an event
hasan7n Jul 29, 2024
3f62a0b
add fl admin mlcube to training exp object
hasan7n Jul 29, 2024
0c6a89f
some setup/tests changes
hasan7n Jul 29, 2024
65270f4
bugfix in tests
hasan7n Jul 29, 2024
251cdd1
tests bugfixes
hasan7n Jul 29, 2024
7525b35
Added admin config to test plan
msheller Jul 29, 2024
d7b7df9
Merge branch 'fl-poc-nnunet-draft' of https://github.com/hasan7n/medp…
msheller Jul 29, 2024
89664e2
Added admin endpoints to list of functions that can use the network. …
msheller Jul 29, 2024
e23bfae
add cutofftime task in cube.py
hasan7n Jul 29, 2024
2c4eb43
Successfully tested with admin endpoint to set straggler handler timeout
msheller Jul 29, 2024
b06cc3d
Merge branch 'fl-poc-nnunet-draft' of https://github.com/hasan7n/medp…
msheller Jul 29, 2024
e749925
update numpy version in requirements
hasan7n Jul 30, 2024
fe4bd92
update testing scripts
hasan7n Jul 30, 2024
0268960
support gpu drivers v470
hasan7n Aug 1, 2024
16bf408
aggregator copy files bugfix
hasan7n Aug 1, 2024
8dcbfba
singularity option for fl tests
hasan7n Aug 1, 2024
70e4e56
add test option for admin fl
hasan7n Aug 1, 2024
27f85e5
admin commands in medperf
hasan7n Aug 18, 2024
31f39ca
typo
hasan7n Aug 22, 2024
44ed99b
refactor steps in fl mlcube
hasan7n Aug 22, 2024
f82717f
modify tests scripts
hasan7n Aug 22, 2024
3d7b6b1
add error checking in step-ca client
hasan7n Aug 27, 2024
a27ef7b
update commit hash for fl admin mlcube
hasan7n Sep 2, 2024
bc431ff
update step-ca client dockerfile
hasan7n Sep 2, 2024
0f7d43c
bugfix argument name in training.submit
hasan7n Sep 3, 2024
fb4aa4f
store status in a temporary file to avoid read-only problem
hasan7n Sep 3, 2024
d6cd39d
update cli integration tests
hasan7n Sep 3, 2024
e2a4ddc
update mock tokens
hasan7n Sep 3, 2024
dee5152
update fl testing scripts
hasan7n Sep 3, 2024
26b4337
update fl integration test mlcube example
hasan7n Sep 3, 2024
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
41 changes: 41 additions & 0 deletions .github/workflows/train-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
name: FL Integration workflow

on: pull_request

jobs:
setup:
name: fl-integration-test
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v2

- name: Set up Python 3.9
uses: actions/setup-python@v2
with:
python-version: '3.9'

- name: Install dependencies
working-directory: .
run: |
python -m pip install --upgrade pip
pip install -e cli/
pip install -r cli/test-requirements.txt
pip install -r server/requirements.txt
pip install -r server/test-requirements.txt

- name: Set server environment vars
working-directory: ./server
run: cp .env.local.local-auth .env

- name: Run django server in background with generated certs
working-directory: ./server
run: sh setup-dev-server.sh & sleep 6

- name: Run server integration tests
working-directory: ./server
run: python seed.py --cert cert.crt

- name: Run client integration tests
working-directory: .
run: sh cli/cli_tests_training.sh -f
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -147,3 +147,10 @@ cython_debug/
# Dev Environment Specific
.vscode
.venv
server/keys

# exclude fl example
!examples/fl/mock_cert/project/ca/root.key
!examples/fl/mock_cert/project/ca/cert/root.crt
!flca/dev_assets/intermediate_ca.crt
!flca/dev_assets/root_ca.crt
3 changes: 1 addition & 2 deletions cli/cli_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
################### Start Testing ########################
##########################################################


##########################################################
echo "=========================================="
echo "Printing MedPerf version"
Expand Down Expand Up @@ -195,7 +194,7 @@ echo "Running data submission step"
echo "====================================="
print_eval "medperf dataset submit -p $PREP_UID -d $DIRECTORY/dataset_a -l $DIRECTORY/dataset_a --name='dataset_a' --description='mock dataset a' --location='mock location a' -y"
checkFailed "Data submission step failed"
DSET_A_UID=$(medperf dataset ls | grep dataset_a | tr -s ' ' | cut -d ' ' -f 1)
DSET_A_UID=$(medperf dataset ls | grep dataset_a | tr -s ' ' | awk '{$1=$1;print}' | cut -d ' ' -f 1)
echo "DSET_A_UID=$DSET_A_UID"
##########################################################

Expand Down
Loading
Loading