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.

Sign up for GitHub

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

Jump to bottom

Simplify E2E tests with matrix #2109

Merged
merged 5 commits into from
Jul 13, 2023
Merged

Simplify E2E tests with matrix #2109

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
567a332
Simplify E2E tests with matrix
charlesbvll Jul 13, 2023
2933cc0
Update Python version
charlesbvll Jul 13, 2023
20ff0c5
Use single quotes
charlesbvll Jul 13, 2023
377730b
Use better naming for workflows
charlesbvll Jul 13, 2023
869d51b
Reformat workflow file
charlesbvll Jul 13, 2023
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
302 changes: 58 additions & 244 deletions .github/workflows/e2e.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,259 +12,73 @@ env:
FLWR_TELEMETRY_ENABLED: 0

jobs:
pytorch:
e2e:
runs-on: ubuntu-22.04
timeout-minutes: 10
steps:
- uses: actions/checkout@v3
- name: Bootstrap
uses: ./.github/actions/bootstrap
- name: Install dependencies
run: |
cd e2e/pytorch
python -m poetry install
- name: Cache Datasets
uses: actions/cache@v2
with:
path: "./e2e/pytorch/data"
key: pytorch-datasets
- name: Download Datasets
run: |
cd e2e/pytorch
python -c "from torchvision.datasets import CIFAR10; CIFAR10('./data', download=True)"
- name: Run edge client test
run: |
cd e2e/pytorch
./test.sh
- name: Run virtual client test
run: |
cd e2e/pytorch
python simulation.py

tensorflow:
runs-on: ubuntu-22.04
timeout-minutes: 10
steps:
- uses: actions/checkout@v3
- name: Bootstrap
uses: ./.github/actions/bootstrap
- name: Install dependencies
run: |
cd e2e/tensorflow
python -m poetry install
- name: Cache Datasets
uses: actions/cache@v2
with:
path: "~/.keras"
key: keras-datasets
- name: Download Datasets
run: |
python -c "import tensorflow as tf; tf.keras.datasets.cifar10.load_data()"
- name: Run edge client test
run: |
cd e2e/tensorflow
./test.sh
- name: Run virtual client test
run: |
cd e2e/tensorflow
python simulation.py



bare:
runs-on: ubuntu-22.04
timeout-minutes: 10
steps:
- uses: actions/checkout@v3
- name: Bootstrap
uses: ./.github/actions/bootstrap
- name: Install dependencies
run: |
cd e2e/bare
python -m poetry install
- name: Run edge client test
run: |
cd e2e/bare
./test.sh
- name: Run virtual client test
run: |
cd e2e/bare
python simulation.py



pandas:
runs-on: ubuntu-22.04
timeout-minutes: 10
steps:
- uses: actions/checkout@v3
- name: Bootstrap
uses: ./.github/actions/bootstrap
with:
python-version: 3.8
- name: Install dependencies
run: |
cd e2e/pandas
python -m poetry install
- name: Cache Datasets
uses: actions/cache@v2
with:
path: "./e2e/pandas/data"
key: pandas-datasets
- name: Download Datasets
run: |
cd e2e/pandas
mkdir -p data
python -c "from sklearn.datasets import load_iris; load_iris(as_frame=True)['data'].to_csv('./data/client.csv')"
- name: Run edge client test
run: |
cd e2e/pandas
./test.sh
- name: Run virtual client test
run: |
cd e2e/pandas
python simulation.py



jax:
runs-on: ubuntu-22.04
timeout-minutes: 10
steps:
- uses: actions/checkout@v3
- name: Bootstrap
uses: ./.github/actions/bootstrap
with:
python-version: 3.8
- name: Install dependencies
run: |
cd e2e/jax
python -m poetry install
- name: Run edge client test
run: |
cd e2e/jax
./test.sh
- name: Run virtual client test
run: |
cd e2e/jax
python simulation.py



mxnet:
runs-on: ubuntu-22.04
timeout-minutes: 10
steps:
- uses: actions/checkout@v3
- name: Bootstrap
uses: ./.github/actions/bootstrap
with:
python-version: 3.8
- name: Install dependencies
run: |
cd e2e/mxnet
python -m poetry install
- name: Download Datasets
run: |
cd e2e/mxnet
python -c "import mxnet as mx; mx.test_utils.get_mnist()"
- name: Run edge client test
run: |
cd e2e/mxnet
./test.sh
- name: Run virtual client test
run: |
cd e2e/mxnet
python simulation.py



scikit:
runs-on: ubuntu-22.04
timeout-minutes: 10
steps:
- uses: actions/checkout@v3
- name: Bootstrap
uses: ./.github/actions/bootstrap
with:
python-version: 3.8
- name: Install dependencies
run: |
cd e2e/scikit-learn
python -m poetry install
- name: Download Datasets
run: |
cd e2e/scikit-learn
python -c "import openml; openml.datasets.get_dataset(554)"
- name: Run edge client test
run: |
cd e2e/scikit-learn
./test.sh
- name: Run virtual client test
run: |
cd e2e/scikit-learn
python simulation.py


opacus:
runs-on: ubuntu-22.04
timeout-minutes: 10
steps:
- uses: actions/checkout@v3
- name: Bootstrap
uses: ./.github/actions/bootstrap
with:
python-version: 3.8
- name: Install dependencies
run: |
cd e2e/opacus
python -m poetry install
- name: Cache Datasets
uses: actions/cache@v2
with:
path: "./e2e/opacus/data"
key: pytorch-datasets
- name: Download Datasets
run: |
cd e2e/opacus
python -c "from torchvision.datasets import CIFAR10; CIFAR10('./data', download=True)"
- name: Run edge client test
run: |
cd e2e/opacus
./test.sh
- name: Run virtual client test
run: |
cd e2e/opacus
python simulation.py

# Using approach described here:
# https://docs.github.com/en/actions/using-jobs/using-a-matrix-for-your-jobs
strategy:
matrix:
include:
- directory: bare

- directory: jax

- directory: pytorch
dataset: |
from torchvision.datasets import CIFAR10
CIFAR10('./data', download=True)

- directory: tensorflow
dataset: |
import tensorflow as tf
tf.keras.datasets.cifar10.load_data()

- directory: opacus
dataset: |
from torchvision.datasets import CIFAR10
CIFAR10('./data', download=True)

- directory: mxnet
dataset: |
import mxnet as mx
mx.test_utils.get_mnist()

- directory: scikit-learn
dataset: |
import openml
openml.datasets.get_dataset(554)

- directory: fastai
dataset: |
from fastai.vision.all import untar_data, URLs
untar_data(URLs.MNIST)

- directory: pandas
dataset: |
from pathlib import Path
from sklearn.datasets import load_iris
Path('data').mkdir(exist_ok=True)
load_iris(as_frame=True)['data'].to_csv('./data/client.csv')

name: ${{matrix.directory}}

defaults:
run:
working-directory: e2e/${{ matrix.directory }}

fastai:
runs-on: ubuntu-22.04
timeout-minutes: 10
steps:
- uses: actions/checkout@v3
- name: Bootstrap
uses: ./.github/actions/bootstrap
with:
python-version: 3.8
- name: Install dependencies
run: |
cd e2e/fastai
python -m poetry install
- name: Cache Datasets
uses: actions/cache@v2
with:
path: "~/.fastai"
key: fastai-datasets
- name: Download Datasets
run: |
cd e2e/fastai
python -c "from fastai.vision.all import *; untar_data(URLs.MNIST)"
run: python -m poetry install
- name: Download dataset
if: ${{matrix.dataset}}
run: python -c "${{ matrix.dataset }}"
- name: Run edge client test
run: |
cd e2e/fastai
./test.sh
run: ./test.sh
- name: Run virtual client test
run: |
cd e2e/fastai
python simulation.py
run: python simulation.py