Skip to content

Commit e2a7b4a

Browse files
authored
Merge pull request #1591 from Trusted-AI/dev_1.10.0
Update to ART 1.10.0
2 parents a0c9336 + 5b97f61 commit e2a7b4a

File tree

236 files changed

+15403
-1630
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

236 files changed

+15403
-1630
lines changed

.github/workflows/ci-deepspeech-v3.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,16 @@ jobs:
3232
uses: codecov/[email protected]
3333
with:
3434
fail_ci_if_error: true
35+
test_deepspeech_v3_torch_1_10:
36+
name: PyTorchDeepSpeech v3 / PyTorch 1.10
37+
runs-on: ubuntu-latest
38+
container: adversarialrobustnesstoolbox/art_testing_envs:deepspeech_v3_torch_1_10
39+
steps:
40+
- name: Checkout Repo
41+
uses: actions/[email protected]
42+
- name: Run Test Action
43+
uses: ./.github/actions/deepspeech-v3
44+
- name: Upload coverage to Codecov
45+
uses: codecov/[email protected]
46+
with:
47+
fail_ci_if_error: true

.github/workflows/ci-keras.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,27 +25,27 @@ jobs:
2525
fail-fast: false
2626
matrix:
2727
include:
28-
- name: Keras 2.3.1 (TensorFlow 2.2.1 Python 3.7)
28+
- name: Keras 2.3.1 (TensorFlow 2.2.1 Python 3.8)
2929
framework: keras
30-
python: 3.7
30+
python: 3.8
3131
tensorflow: 2.2.1
3232
keras: 2.3.1
3333
tf_addons: 0.13.0
34-
- name: TensorFlow-Keras 2.3.4 (Keras 2.4.3 Python 3.7)
34+
- name: TensorFlow-Keras 2.3.4 (Keras 2.4.3 Python 3.8)
3535
framework: kerastf
36-
python: 3.7
36+
python: 3.8
3737
tensorflow: 2.3.4
3838
keras: 2.4.3
3939
tf_addons: 0.13.0
40-
- name: Keras 2.6.0 (TensorFlow 2.6.0 Python 3.8)
40+
- name: Keras 2.6.0 (TensorFlow 2.6.0 Python 3.9)
4141
framework: keras
42-
python: 3.8
42+
python: 3.9
4343
tensorflow: 2.6.0
4444
keras: 2.6.0
4545
tf_addons: 0.14.0
46-
- name: TensorFlow-Keras 2.6.0 (Keras 2.6.0 Python 3.8)
46+
- name: TensorFlow-Keras 2.6.0 (Keras 2.6.0 Python 3.9)
4747
framework: kerastf
48-
python: 3.8
48+
python: 3.9
4949
tensorflow: 2.6.0
5050
keras: 2.6.0
5151
tf_addons: 0.14.0

.github/workflows/ci-legacy.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@ jobs:
2626
matrix:
2727
module: [attacks_1, attacks_2, estimators, defences, metrics, art]
2828
include:
29-
- name: legacy (TensorFlow 2.6.0 Keras 2.6.0 PyTorch 1.10.2 scikit-learn 0.24.2 Python 3.8)
29+
- name: legacy (TensorFlow 2.6.0 Keras 2.6.0 PyTorch 1.10.2 scikit-learn 1.0.2 Python 3.9)
3030
framework: legacy
31-
python: 3.8
31+
python: 3.9
3232
tensorflow: 2.6.0
3333
keras: 2.6.0
3434
torch: 1.10.2+cpu
3535
torchvision: 0.11.3+cpu
3636
torchaudio: 0.10.2+cpu
37-
scikit-learn: 0.24.2
37+
scikit-learn: 1.0.2
3838

3939
name: Run ${{ matrix.module }} ${{ matrix.name }} Tests
4040
steps:

.github/workflows/ci-lingvo.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
sudo apt-get update
4848
sudo apt-get -y -q install ffmpeg libavcodec-extra
4949
python -m pip install --upgrade pip setuptools wheel
50-
pip install -q -r <(sed '/^scipy/d;/^matplotlib/d;/^pandas/d;/^statsmodels/d;/^numba/d;/^jax/d;/^Pillow/d;/^pytest-mock/d' requirements_test.txt)
50+
pip install -q -r <(sed '/^scipy/d;/^matplotlib/d;/^pandas/d;/^statsmodels/d;/^numba/d;/^jax/d;/^h5py/d;/^Pillow/d;/^pytest-mock/d' requirements_test.txt)
5151
pip install scipy==1.5.4
5252
pip install matplotlib==3.3.4
5353
pip install pandas==1.1.5
@@ -59,6 +59,7 @@ jobs:
5959
pip install tensorflow-addons==0.9.1
6060
pip install model-pruning-google-research==0.0.3
6161
pip install jax[cpu]==0.2.17
62+
pip install h5py==2.10.0
6263
pip install pytest-mock
6364
pip list
6465
- name: Run ${{ matrix.name }} Tests

.github/workflows/ci-mxnet.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ jobs:
2525
fail-fast: false
2626
matrix:
2727
include:
28-
- name: mxnet (Python 3.7)
28+
- name: mxnet (Python 3.8)
2929
framework: mxnet
30-
python: 3.7
30+
python: 3.8
3131

3232
name: Run ${{ matrix.name }} Tests
3333
steps:

.github/workflows/ci-pytorch-object-detectors.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- name: Setup Python
3131
uses: actions/setup-python@v3
3232
with:
33-
python-version: 3.7
33+
python-version: 3.8
3434
- name: Install Dependencies
3535
run: |
3636
sudo apt-get update

.github/workflows/ci-pytorch.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,21 +25,21 @@ jobs:
2525
fail-fast: false
2626
matrix:
2727
include:
28-
- name: PyTorch 1.8.1 (Python 3.7)
28+
- name: PyTorch 1.8.1 (Python 3.8)
2929
framework: pytorch
30-
python: 3.7
30+
python: 3.8
3131
torch: 1.8.1+cpu
3232
torchvision: 0.9.1+cpu
3333
torchaudio: 0.8.1
34-
- name: PyTorch 1.9.1 (Python 3.7)
34+
- name: PyTorch 1.9.1 (Python 3.8)
3535
framework: pytorch
36-
python: 3.7
36+
python: 3.8
3737
torch: 1.9.1+cpu
3838
torchvision: 0.10.1+cpu
3939
torchaudio: 0.9.1
40-
- name: PyTorch 1.10.2 (Python 3.7)
40+
- name: PyTorch 1.10.2 (Python 3.8)
4141
framework: pytorch
42-
python: 3.7
42+
python: 3.8
4343
torch: 1.10.2+cpu
4444
torchvision: 0.11.3+cpu
4545
torchaudio: 0.10.2+cpu

.github/workflows/ci-scikit-learn.yml

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,22 +25,18 @@ jobs:
2525
fail-fast: false
2626
matrix:
2727
include:
28-
- name: scikit-learn 0.22.2 (Python 3.7)
29-
framework: scikitlearn
30-
scikit-learn: 0.22.2
31-
python: 3.7
32-
- name: scikit-learn 0.23.2 (Python 3.8)
28+
- name: scikit-learn 0.23.2 (Python 3.9)
3329
framework: scikitlearn
3430
scikit-learn: 0.23.2
35-
python: 3.8
36-
- name: scikit-learn 0.24.2 (Python 3.8)
31+
python: 3.9
32+
- name: scikit-learn 0.24.2 (Python 3.9)
3733
framework: scikitlearn
3834
scikit-learn: 0.24.2
39-
python: 3.8
40-
- name: scikit-learn 1.0 (Python 3.8)
35+
python: 3.9
36+
- name: scikit-learn 1.0.2 (Python 3.9)
4137
framework: scikitlearn
42-
scikit-learn: 1.0
43-
python: 3.8
38+
scikit-learn: 1.0.2
39+
python: 3.9
4440

4541
name: ${{ matrix.name }}
4642
steps:
@@ -56,8 +52,8 @@ jobs:
5652
sudo apt-get -y -q install ffmpeg libavcodec-extra
5753
python -m pip install --upgrade pip setuptools wheel
5854
pip install -r requirements_test.txt
59-
pip install tensorflow==2.4.3
60-
pip install keras==2.4.3
55+
pip install tensorflow==2.7.0
56+
pip install keras==2.7.0
6157
pip install scikit-learn==${{ matrix.scikit-learn }}
6258
pip list
6359
- name: Run Tests

.github/workflows/ci-style-checks.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,19 +28,22 @@ jobs:
2828
- name: Setup Python
2929
uses: actions/setup-python@v3
3030
with:
31-
python-version: 3.7
31+
python-version: 3.8
3232
- name: Pre-install
3333
run: |
3434
sudo apt-get update
3535
sudo apt-get -y -q install ffmpeg libavcodec-extra
3636
- name: Install Dependencies
3737
run: |
3838
python -m pip install --upgrade pip setuptools wheel
39-
pip install -q pylint==2.7.4 mypy==0.812 pycodestyle==2.7.0 black==20.8b1
39+
pip install -q pylint==2.12.2 mypy==0.931 pycodestyle==2.8.0 black==21.12b0
4040
pip install -q -r requirements_test.txt
4141
pip install pluggy==0.13.1
42-
pip install tensorflow==2.4.1
43-
pip install keras==2.4.3
42+
pip install tensorflow==2.7.0
43+
pip install keras==2.7.0
44+
python -m pip install types-six
45+
python -m pip install types-PyYAML
46+
python3 -m pip install types-setuptools
4447
pip list
4548
- name: pycodestyle
4649
run: pycodestyle --ignore=C0330,C0415,E203,E231,W503 --max-line-length=120 art

.github/workflows/ci-tensorflow-v2.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,26 +25,26 @@ jobs:
2525
fail-fast: false
2626
matrix:
2727
include:
28-
- name: TensorFlow 2.5.1 (Keras 2.4.3 Python 3.8)
28+
- name: TensorFlow 2.6.2 (Keras 2.6.0 Python 3.8)
2929
framework: tensorflow
30-
python: 3.7
31-
tensorflow: 2.5.1
30+
python: 3.8
31+
tensorflow: 2.6.2
3232
tf_version: v2
33-
keras: 2.4.3
33+
keras: 2.6.0
3434
tf_addons: 0.14.0
35-
- name: TensorFlow 2.5.1v1 (Keras 2.4.3 Python 3.8)
35+
- name: TensorFlow 2.7.0v1 (Keras 2.7.0 Python 3.9)
3636
framework: tensorflow2v1
37-
python: 3.8
38-
tensorflow: 2.5.1
37+
python: 3.9
38+
tensorflow: 2.7.0
3939
tf_version: v2
40-
keras: 2.4.3
40+
keras: 2.7.0
4141
tf_addons: 0.14.0
42-
- name: TensorFlow 2.6.0 (Keras 2.6.0 Python 3.8)
42+
- name: TensorFlow 2.7.0 (Keras 2.7.0 Python 3.9)
4343
framework: tensorflow
44-
python: 3.8
45-
tensorflow: 2.6.0
44+
python: 3.9
45+
tensorflow: 2.7.0
4646
tf_version: v2
47-
keras: 2.6.0
47+
keras: 2.7.0
4848
tf_addons: 0.14.0
4949

5050
name: ${{ matrix.name }}

0 commit comments

Comments
 (0)