Skip to content

Commit b71810a

Browse files
beat-buesserbeat-buesser
authored
Merge branch 'dev_1.17.0' into simple_pb_inclusion
2 parents 043752d + ab389e7 commit b71810a

File tree

81 files changed

+332
-250
lines changed

Some content is hidden

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

81 files changed

+332
-250
lines changed

‎.github/workflows/ci-huggingface.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ jobs:
5050
sudo apt-get -y -q install ffmpeg libavcodec-extra
5151
python -m pip install --upgrade pip setuptools wheel
5252
pip3 install -r requirements_test.txt
53-
pip install tensorflow==2.10.1
54-
pip install keras==2.10.0
53+
pip install tensorflow==2.14.0
54+
pip install keras==2.14.0
5555
pip install torch==${{ matrix.torch }} -f https://download.pytorch.org/whl/cpu/torch_stable.html
5656
pip install torchvision==${{ matrix.torchvision }} -f https://download.pytorch.org/whl/cpu/torch_stable.html
5757
pip install torchaudio==${{ matrix.torchaudio }} -f https://download.pytorch.org/whl/cpu/torch_stable.html

‎.github/workflows/ci-keras.yml‎

Lines changed: 16 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -28,30 +28,24 @@ jobs:
2828
fail-fast: false
2929
matrix:
3030
include:
31-
- name: Keras 2.9.0 (TensorFlow 2.9.2 Python 3.9)
31+
- name: Keras 2.13.1 (TensorFlow 2.13.1 Python 3.10)
3232
framework: keras
33-
python: 3.9
34-
tensorflow: 2.9.2
35-
keras: 2.9.0
36-
tf_addons: 0.17.0
37-
- name: TensorFlow-Keras 2.9.2 (Keras 2.9.0 Python 3.9)
38-
framework: kerastf
39-
python: 3.9
40-
tensorflow: 2.9.2
41-
keras: 2.9.0
42-
tf_addons: 0.17.0
43-
- name: Keras 2.10.0 (TensorFlow 2.10.1 Python 3.9)
33+
python: '3.10'
34+
tensorflow: 2.13.1
35+
keras: 2.13.1
36+
tf_addons: 0.19.0
37+
- name: Keras 2.14.0 (TensorFlow 2.14.0 Python 3.10)
4438
framework: keras
45-
python: 3.9
46-
tensorflow: 2.10.1
47-
keras: 2.10.0
48-
tf_addons: 0.18.0
49-
- name: TensorFlow-Keras 2.10.1 (Keras 2.10.0 Python 3.9)
39+
python: '3.10'
40+
tensorflow: 2.14.0
41+
keras: 2.14.0
42+
tf_addons: 0.20.0
43+
- name: TensorFlow-Keras 2.14.0 (Keras 2.14.0 Python 3.10)
5044
framework: kerastf
51-
python: 3.9
52-
tensorflow: 2.10.1
53-
keras: 2.10.0
54-
tf_addons: 0.18.0
45+
python: '3.10'
46+
tensorflow: 2.14.0
47+
keras: 2.14.0
48+
tf_addons: 0.20.0
5549

5650
name: ${{ matrix.name }}
5751
steps:
@@ -66,7 +60,7 @@ jobs:
6660
sudo apt-get update
6761
sudo apt-get -y -q install ffmpeg libavcodec-extra
6862
python -m pip install --upgrade pip setuptools wheel
69-
pip install -r requirements_test.txt
63+
pip install -q -r <(sed '/^tensorflow/d;/^keras/d;/^tensorflow-addons/d' requirements_test.txt)
7064
pip install tensorflow==${{ matrix.tensorflow }}
7165
pip install keras==${{ matrix.keras }}
7266
pip install tensorflow-addons==${{ matrix.tf_addons }}

‎.github/workflows/ci-legacy.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ jobs:
2929
matrix:
3030
module: [attacks_1, attacks_2, estimators, defences, metrics, art]
3131
include:
32-
- name: legacy (TensorFlow 2.10.1 Keras 2.10.0 PyTorch 1.13.1 scikit-learn 1.1.3 Python 3.9)
32+
- name: legacy (TensorFlow 2.14.0 Keras 2.14.0 PyTorch 1.13.1 scikit-learn 1.1.3 Python 3.9)
3333
framework: legacy
34-
python: 3.9
35-
tensorflow: 2.10.1
36-
keras: 2.10.0
34+
python: '3.10'
35+
tensorflow: 2.14.0
36+
keras: 2.14.0
3737
torch: 1.13.1+cpu
3838
torchvision: 0.14.1+cpu
3939
torchaudio: 0.13.1+cpu

‎.github/workflows/ci-lingvo.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ jobs:
7676
pip install tqdm==4.64.1
7777
pip list
7878
- name: Run ${{ matrix.name }} Tests
79-
run: ./run_tests.sh ${{ matrix.framework }}
79+
run: pytest --cov-report=xml --cov=art --cov-append -q -vv tests/estimators/speech_recognition/test_tensorflow_lingvo.py --framework=${{ matrix.framework }} --durations=0
8080
- name: Upload coverage to Codecov
8181
uses: codecov/codecov-action@v3
8282
with:

‎.github/workflows/ci-mxnet.yml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ jobs:
2828
fail-fast: false
2929
matrix:
3030
include:
31-
- name: mxnet (Python 3.8)
31+
- name: mxnet (Python 3.9)
3232
framework: mxnet
33-
python: 3.8
33+
python: 3.9
3434

3535
name: Run ${{ matrix.name }} Tests
3636
steps:
@@ -45,8 +45,6 @@ jobs:
4545
sudo apt-get update
4646
sudo apt-get -y -q install ffmpeg libavcodec-extra
4747
python -m pip install --upgrade pip setuptools wheel
48-
pip install tensorflow==2.4.1
49-
pip install keras==2.4.3
5048
pip3 install -q -r requirements_test.txt
5149
pip list
5250
- name: Run ${{ matrix.name }} ${{ matrix.module }} Tests

‎.github/workflows/ci-pytorch.yml‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,9 @@ jobs:
2828
fail-fast: false
2929
matrix:
3030
include:
31-
- name: PyTorch 1.11.0 (Python 3.9)
32-
framework: pytorch
33-
python: 3.8
34-
torch: 1.11.0+cpu
35-
torchvision: 0.12.0+cpu
36-
torchaudio: 0.11.0
3731
- name: PyTorch 1.12.1 (Python 3.9)
3832
framework: pytorch
39-
python: 3.8
33+
python: 3.9
4034
torch: 1.12.1+cpu
4135
torchvision: 0.13.1+cpu
4236
torchaudio: 0.12.1
@@ -67,8 +61,6 @@ jobs:
6761
sudo apt-get -y -q install ffmpeg libavcodec-extra
6862
python -m pip install --upgrade pip setuptools wheel
6963
pip3 install -r requirements_test.txt
70-
pip install tensorflow==2.10.1
71-
pip install keras==2.10.0
7264
pip install torch==${{ matrix.torch }} -f https://download.pytorch.org/whl/cpu/torch_stable.html
7365
pip install torchvision==${{ matrix.torchvision }} -f https://download.pytorch.org/whl/cpu/torch_stable.html
7466
pip install torchaudio==${{ matrix.torchaudio }} -f https://download.pytorch.org/whl/cpu/torch_stable.html

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,6 @@ jobs:
5959
sudo apt-get -y -q install ffmpeg libavcodec-extra
6060
python -m pip install --upgrade pip setuptools wheel
6161
pip install -r requirements_test.txt
62-
pip install tensorflow==2.10.1
63-
pip install keras==2.10.0
6462
pip install scikit-learn==${{ matrix.scikit-learn }}
6563
pip list
6664
- name: Run Tests

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,15 @@ jobs:
4040
run: |
4141
python -m pip install --upgrade pip setuptools wheel
4242
pip install -q pylint==2.12.2 mypy==0.931 pycodestyle==2.8.0 black==21.12b0
43-
pip install -q -r requirements_test.txt
43+
pip install -q -r <(sed '/^numpy/d;/^pluggy/d;/^tensorflow/d;/^keras/d' requirements_test.txt)
44+
pip install numpy==1.22.4
4445
pip install pluggy==0.13.1
45-
pip install tensorflow==2.7.0
46-
pip install keras==2.7.0
46+
pip install tensorflow==2.13.1
47+
pip install keras==2.13.1
4748
pip install types-six
4849
pip install types-PyYAML
4950
pip install types-setuptools
5051
pip install click==8.0.2
51-
pip install numpy==1.21.6
5252
pip list
5353
- name: pycodestyle
5454
run: pycodestyle --ignore=C0330,C0415,E203,E231,W503 --max-line-length=120 art

‎.github/workflows/ci-tensorflow-v1.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,15 @@ jobs:
4848
sudo apt-get update
4949
sudo apt-get -y -q install ffmpeg libavcodec-extra
5050
python -m pip install --upgrade pip setuptools wheel
51-
pip install -q -r <(sed '/^pandas/d;/^scipy/d;/^matplotlib/d;/^xgboost/d;/^jax/d' requirements_test.txt)
51+
pip install -q -r <(sed '/^pandas/d;/^scipy/d;/^matplotlib/d;/^xgboost/d;/^tensorflow/d;/^keras/d;/^jax/d' requirements_test.txt)
5252
pip install pandas==1.3.5
5353
pip install scipy==1.7.2
5454
pip install matplotlib==3.5.3
5555
pip install xgboost==1.6.2
56+
pip install protobuf==3.20.1
5657
pip install tensorflow==${{ matrix.tensorflow }}
5758
pip install keras==${{ matrix.keras }}
58-
pip install jax[cpu]==0.3.25
59+
pip install numpy==1.20
5960
pip list
6061
- name: Run Tests
6162
run: ./run_tests.sh ${{ matrix.framework }}

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

Lines changed: 15 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -28,34 +28,27 @@ jobs:
2828
fail-fast: false
2929
matrix:
3030
include:
31-
- name: TensorFlow 2.9.2 (Keras 2.9.0 Python 3.9)
31+
- name: TensorFlow 2.13.1 (Keras 2.13.1 Python 3.10)
3232
framework: tensorflow
33-
python: 3.9
34-
tensorflow: 2.9.2
33+
python: '3.10'
34+
tensorflow: 2.13.1
3535
tf_version: v2
36-
keras: 2.9.0
37-
tf_addons: 0.17.1
38-
- name: TensorFlow 2.10.1v1 (Keras 2.10.0 Python 3.9)
36+
keras: 2.13.1
37+
tf_addons: 0.21.0
38+
- name: TensorFlow 2.14.0v1 (Keras 2.14.0 Python 3.10)
3939
framework: tensorflow2v1
40-
python: 3.9
41-
tensorflow: 2.10.1
42-
tf_version: v2
43-
keras: 2.10.0
44-
tf_addons: 0.18.0
45-
- name: TensorFlow 2.10.1 (Keras 2.10.0 Python 3.9)
46-
framework: tensorflow
47-
python: 3.9
48-
tensorflow: 2.10.1
40+
python: '3.10'
41+
tensorflow: 2.14.0
4942
tf_version: v2
50-
keras: 2.10.0
51-
tf_addons: 0.18.0
52-
- name: TensorFlow 2.10.1 (Keras 2.10.0 Python 3.10)
43+
keras: 2.14.0
44+
tf_addons: 0.21.0
45+
- name: TensorFlow 2.14.0 (Keras 2.14.0 Python 3.10)
5346
framework: tensorflow
5447
python: '3.10'
55-
tensorflow: 2.10.1
48+
tensorflow: 2.14.0
5649
tf_version: v2
57-
keras: 2.10.0
58-
tf_addons: 0.18.0
50+
keras: 2.14.0
51+
tf_addons: 0.21.0
5952

6053
name: ${{ matrix.name }}
6154
steps:
@@ -70,7 +63,7 @@ jobs:
7063
sudo apt-get update
7164
sudo apt-get -y -q install ffmpeg libavcodec-extra
7265
python -m pip install --upgrade pip setuptools wheel
73-
pip install -r requirements_test.txt
66+
pip install -q -r <(sed '/^tensorflow/d;/^keras/d;/^tensorflow-addons/d' requirements_test.txt)
7467
pip install tensorflow==${{ matrix.tensorflow }}
7568
pip install keras==${{ matrix.keras }}
7669
pip install tensorflow-addons==${{ matrix.tf_addons }}

0 commit comments

Comments
 (0)