Skip to content

Commit 8e60a6a

Browse files
authored
Merge branch 'main' into dev_1.13.1
2 parents 0ac4cd0 + 66a2d09 commit 8e60a6a

File tree

6 files changed

+31
-29
lines changed

6 files changed

+31
-29
lines changed

.github/workflows/ci-legacy.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@ jobs:
2626
matrix:
2727
module: [attacks_1, attacks_2, estimators, defences, metrics, art]
2828
include:
29-
- name: legacy (TensorFlow 2.10.1 Keras 2.10.0 PyTorch 1.13.0 scikit-learn 1.1.3 Python 3.9)
29+
- name: legacy (TensorFlow 2.10.1 Keras 2.10.0 PyTorch 1.13.1 scikit-learn 1.1.3 Python 3.9)
3030
framework: legacy
3131
python: 3.9
3232
tensorflow: 2.10.1
3333
keras: 2.10.0
34-
torch: 1.13.0+cpu
35-
torchvision: 0.14.0+cpu
36-
torchaudio: 0.13.0+cpu
34+
torch: 1.13.1+cpu
35+
torchvision: 0.14.1+cpu
36+
torchaudio: 0.13.1+cpu
3737
scikit-learn: 1.1.3
3838

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

.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;/^h5py/d;/^Pillow/d;/^pytest/d;/^pytest-mock/d;/^torch/d;/^torchaudio/d;/^torchvision/d;/^xgboost/d;/^requests/d;/^tensorflow/d;/^keras/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/d;/^pytest-mock/d;/^torch/d;/^torchaudio/d;/^torchvision/d;/^xgboost/d;/^requests/d;/^tensorflow/d;/^keras/d;/^kornia/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
@@ -69,6 +69,7 @@ jobs:
6969
pip install torchvision==0.11.3+cpu --find-links https://download.pytorch.org/whl/cpu/torch_stable.html
7070
pip install xgboost==1.5.2
7171
pip install requests==2.27.1
72+
pip install kornia==0.6.8
7273
pip list
7374
- name: Run ${{ matrix.name }} Tests
7475
run: ./run_tests.sh ${{ matrix.framework }}

.github/workflows/ci-pytorch.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ jobs:
3737
torch: 1.12.1+cpu
3838
torchvision: 0.13.1+cpu
3939
torchaudio: 0.12.1
40-
- name: PyTorch 1.13.0 (Python 3.9)
40+
- name: PyTorch 1.13.1 (Python 3.9)
4141
framework: pytorch
4242
python: 3.9
43-
torch: 1.13.0+cpu
44-
torchvision: 0.14.0+cpu
45-
torchaudio: 0.13.0
43+
torch: 1.13.1+cpu
44+
torchvision: 0.14.1+cpu
45+
torchaudio: 0.13.1
4646

4747
name: ${{ matrix.name }}
4848
steps:

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,14 @@ 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 -q -r <(sed '/^pandas/d;/^scipy/d;/^matplotlib/d;/^xgboost/d' requirements_test.txt)
48+
pip install -q -r <(sed '/^pandas/d;/^scipy/d;/^matplotlib/d;/^xgboost/d;/^jax/d' requirements_test.txt)
4949
pip install pandas==1.3.5
5050
pip install scipy==1.7.2
5151
pip install matplotlib==3.5.3
5252
pip install xgboost==1.6.2
5353
pip install tensorflow==${{ matrix.tensorflow }}
5454
pip install keras==${{ matrix.keras }}
55+
pip install jax[cpu]==0.3.25
5556
pip list
5657
- name: Run Tests
5758
run: ./run_tests.sh ${{ matrix.framework }}

.github/workflows/dockerhub.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@ jobs:
3131

3232
- name: Extract metadata (tags, labels) for Docker
3333
id: meta
34-
uses: docker/metadata-action@57396166ad8aefe6098280995947635806a0e6ea
34+
uses: docker/metadata-action@507c2f2dc502c992ad446e3d7a5dfbe311567a96
3535
with:
3636
images: adversarialrobustnesstoolbox/releases
3737
tags: |
3838
type=raw,value={{branch}}-1.13.0-{{sha}}
3939
type=semver,pattern={{version}}
4040
4141
- name: Build and push Docker image
42-
uses: docker/build-push-action@c56af957549030174b10d6867f20e78cfd7debc5
42+
uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671
4343
with:
4444
context: .
4545
push: true

requirements_test.txt

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
# base
22

3-
numpy>=1.18.5,<1.24
4-
scipy==1.9.3
5-
matplotlib==3.6.2
3+
numpy>=1.18.5,<1.25
4+
scipy==1.10.0
5+
matplotlib==3.7.0
66
scikit-learn>=0.22.2,<1.2.0
77
six==1.16.0
8-
Pillow==9.3.0
8+
Pillow==9.4.0
99
tqdm==4.64.1
1010
statsmodels==0.13.5
1111
pydub==0.25.1
1212
resampy==0.4.2
1313
ffmpeg-python==0.2.0
14-
cma==3.2.2
15-
pandas==1.5.2
14+
cma==3.3.0
15+
pandas==1.5.3
1616
librosa==0.9.2
1717
numba~=0.56.4
1818
opencv-python
1919
sortedcontainers==2.4.0
20-
h5py==3.7.0
20+
h5py==3.8.0
2121

2222
# frameworks
2323

@@ -30,19 +30,19 @@ mxnet-native==1.8.0.post0
3030

3131
# PyTorch
3232
--find-links https://download.pytorch.org/whl/cpu/torch_stable.html
33-
torch==1.13.0
34-
torchaudio==0.13.0+cpu
35-
torchvision==0.14.0+cpu
33+
torch==1.13.1
34+
torchaudio==0.13.1+cpu
35+
torchvision==0.14.1+cpu
3636

3737
catboost==1.1.1
3838
GPy==1.10.0
39-
lightgbm==3.3.3
40-
xgboost==1.7.2
39+
lightgbm==3.3.5
40+
xgboost==1.7.3
4141

42-
kornia~=0.6.8
43-
tensorboardX==2.5.1
42+
kornia~=0.6.9
43+
tensorboardX==2.6
4444
lief==0.12.3
45-
jax[cpu]==0.3.25
45+
jax[cpu]==0.4.3
4646

4747
# Lingvo ASR dependencies
4848
# supported versions: (lingvo==0.6.4 with tensorflow-gpu==2.1.0)
@@ -51,13 +51,13 @@ jax[cpu]==0.3.25
5151
# lingvo==0.6.4
5252

5353
# other
54-
pytest~=7.2.0
54+
pytest~=7.2.1
5555
pytest-flake8~=1.1.1
5656
flake8~=4.0.1
5757
pytest-mock~=3.10.0
5858
pytest-cov~=4.0.0
5959
codecov~=2.1.12
60-
requests~=2.28.1
60+
requests~=2.28.2
6161

6262
# ART
6363
-e .

0 commit comments

Comments
 (0)