Merge branch 'securefederatedai:develop' into fedprox_example

.github/workflows/fets-challenge.yml

@@ -24,27 +24,27 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
+        pip install torch==1.13.1+cpu torchvision==0.14.1+cpu torchaudio==0.13.1 --extra-index-url https://download.pytorch.org/whl/cpu
         pip install .
     - name: Setup FeTS Challenge Prerequisites
       uses: actions/checkout@master
       with:
-          repository: CBICA/GaNDLF
-          ref: 0.0.14
+          repository: MLCommons/GaNDLF
+          ref: master
           fetch-depth: 1
           path: fets_challenge
     - name: FeTS Challenge Task Runner Test
       run: |
         cd fets_challenge
         pwd
-        pip install torch==1.8.2+cpu torchvision==0.9.2+cpu torchaudio===0.8.2 -f https://download.pytorch.org/whl/lts/1.8/torch_lts.html
-        pip install onnx==1.12.0
         pip install -e .
+        pip uninstall onnx -y
         # Download data and Split CSVs into training and validation
         python -c "from testing.test_full import test_generic_download_data, test_generic_constructTrainingCSV; test_generic_download_data(); test_generic_constructTrainingCSV()"
-        head -n 1 testing/data/train_3d_rad_segmentation.csv > /home/runner/work/openfl/openfl/seg_test_val.csv
-        tail -n +9 testing/data/train_3d_rad_segmentation.csv >> /home/runner/work/openfl/openfl/seg_test_val.csv
-        head -n 8 testing/data/train_3d_rad_segmentation.csv > /home/runner/work/openfl/openfl/seg_test_train.csv
+        head -n 1 testing/data/train_3d_rad_segmentation.csv > /home/runner/work/openfl/openfl/valid.csv
+        tail -n +9 testing/data/train_3d_rad_segmentation.csv >> /home/runner/work/openfl/openfl/valid.csv
+        head -n 8 testing/data/train_3d_rad_segmentation.csv > /home/runner/work/openfl/openfl/train.csv
         cd /home/runner/work/openfl/openfl
         ls
-        python -m tests.github.test_fets_challenge --template fets_challenge_seg_test --fed_workspace aggregator --col1 col1 --col2 col2 --rounds-to-train 1
+        python -m tests.github.test_gandlf --template gandlf_seg_test --fed_workspace aggregator --col1 one --col2 two --rounds-to-train 1
         

.github/workflows/interactive-tensorflow.yml

@@ -27,5 +27,5 @@ jobs:
     - name: Interactive API - tensorflow_mnist
       run: |
         python setup.py build_grpc
-        pip install tensorflow==2.8
+        pip install tensorflow==2.13
         python -m tests.github.interactive_api_director.experiments.tensorflow_mnist.run

.github/workflows/taskrunner.yml

@@ -12,19 +12,24 @@ permissions:
 
 jobs:
   build:
-
     strategy:
       matrix:
        os: ['ubuntu-latest', 'windows-latest']
+       python-version: ['3.8','3.9','3.10','3.11']
     runs-on: ${{ matrix.os }}
-
     steps:
     - uses: actions/checkout@v3
-    - name: Set up Python 3.8
-      uses: actions/setup-python@v3
+    - name: Set up Python 
+      uses: actions/setup-python@v4
       with:
-        python-version: "3.8"
-    - name: Install dependencies
+        python-version: ${{ matrix.python-version }}
+    - name: Install dependencies ubuntu
+      if: matrix.os == 'ubuntu-latest'
+      run: |
+        python -m pip install --upgrade pip
+        pip install .
+    - name: Install dependencies windows
+      if: matrix.os == 'windows-latest'
       run: |
         python -m pip install --upgrade pip
         pip install .