Skip to content

Commit cbc158b

Browse files
committed
Merge remote-tracking branch 'origin/main' into dev_1.21.0
2 parents 76c207b + 6bb9a51 commit cbc158b

File tree

7 files changed

+24
-23
lines changed

7 files changed

+24
-23
lines changed

.github/workflows/ci-huggingface.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,14 @@ jobs:
5151
sudo apt-get update
5252
sudo apt-get -y -q install ffmpeg libavcodec-extra
5353
python -m pip install --upgrade pip setuptools wheel
54-
pip install -q -r <(sed '/^tensorflow/d;/^keras/d;/^torch/d;/^torchvision/d;/^torchaudio/d;/^transformers/d' requirements_test.txt)
54+
pip install -q -r <(sed '/^tensorflow/d;/^keras/d;/^torch/d;/^torchvision/d;/^torchaudio/d;/^transformers/d;/^safetensors/d' requirements_test.txt)
5555
pip install tensorflow==2.18.1
5656
pip install keras==3.10.0
5757
pip install torch==${{ matrix.torch }} --index-url https://download.pytorch.org/whl/cpu
5858
pip install torchvision==${{ matrix.torchvision }} --index-url https://download.pytorch.org/whl/cpu
5959
pip install torchaudio==${{ matrix.torchaudio }} --index-url https://download.pytorch.org/whl/cpu
6060
pip install transformers==${{ matrix.transformers }}
61+
pip install safetensors==0.5.3
6162
pip list
6263
6364
- name: Cache CIFAR-10 dataset

.github/workflows/ci-legacy.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ jobs:
3434
python: '3.10'
3535
tensorflow: 2.18.1
3636
keras: 3.10.0
37-
torch: 2.7.0
38-
torchvision: 0.22.0
39-
torchaudio: 2.7.0
37+
torch: 2.8.0
38+
torchvision: 0.23.0
39+
torchaudio: 2.8.0
4040
scikit-learn: 1.6.1
4141

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

.github/workflows/ci-pytorch.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,18 @@ jobs:
2828
fail-fast: false
2929
matrix:
3030
include:
31-
- name: PyTorch 2.6.0 (Python 3.10)
32-
framework: pytorch
33-
python: '3.10'
34-
torch: 2.6.0
35-
torchvision: 0.21.0
36-
torchaudio: 2.6.0
3731
- name: PyTorch 2.7.1 (Python 3.10)
3832
framework: pytorch
3933
python: '3.10'
4034
torch: 2.7.1
4135
torchvision: 0.22.1
4236
torchaudio: 2.7.1
37+
- name: PyTorch 2.8.0 (Python 3.10)
38+
framework: pytorch
39+
python: '3.10'
40+
torch: 2.8.0
41+
torchvision: 0.23.0
42+
torchaudio: 2.8.0
4343

4444
name: ${{ matrix.name }}
4545
steps:

.github/workflows/dockerhub.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ jobs:
2323
uses: actions/checkout@v4
2424

2525
- name: Log in to Docker Hub
26-
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772
26+
uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1
2727
with:
2828
username: ${{ secrets.DOCKER_HUB_USERNAME }}
2929
password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
3030

3131
- name: Extract metadata (tags, labels) for Docker
3232
id: meta
33-
uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804
33+
uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f
3434
with:
3535
images: adversarialrobustnesstoolbox/releases
3636
tags: |

art/estimators/certification/deep_z/pytorch.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ def concrete_forward(self, in_x: np.ndarray | "torch.Tensor") -> "torch.Tensor":
169169
# as reshapes are not modules we infer when the reshape from convolutional to dense occurs
170170
if self.reshape_op_num == op_num:
171171
x = x.reshape((x.shape[0], -1))
172-
x = op.concrete_forward(x)
172+
x = op.concrete_forward(x) # type: ignore
173173
return x
174174

175175
def set_forward_mode(self, mode: str) -> None:

art/estimators/certification/interval/pytorch.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ def concrete_forward(self, in_x: np.ndarray | "torch.Tensor") -> "torch.Tensor":
179179
if isinstance(op, PyTorchIntervalConv2D) and self.forward_mode == "attack":
180180
x = op.conv_forward(x)
181181
else:
182-
x = op.concrete_forward(x)
182+
x = op.concrete_forward(x) # type: ignore
183183
return x
184184

185185
def set_forward_mode(self, mode: str) -> None:

requirements_test.txt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ statsmodels==0.14.5
1313
pydub==0.25.1
1414
resampy==0.4.3
1515
ffmpeg-python==0.2.0
16-
cma==4.2.0
16+
cma==4.3.0
1717
pandas==2.3.1
1818
librosa==0.11.0
1919
numba~=0.59.1
@@ -29,15 +29,15 @@ tensorflow==2.18.1
2929
keras==3.10.0
3030

3131
# PyTorch
32-
torch==2.7.1
33-
torchaudio==2.7.1
34-
torchvision==0.22.1
32+
torch==2.8.0
33+
torchaudio==2.8.0
34+
torchvision==0.23.0
3535

3636
# PyTorch image transformers
37-
timm==1.0.16
37+
timm==1.0.19
3838

3939
# YOLO dependencies
40-
ultralytics==8.3.162
40+
ultralytics==8.3.176
4141

4242
catboost==1.2.8
4343
GPy==1.13.2
@@ -54,13 +54,13 @@ pytest~=8.4.1
5454
pytest-mock~=3.14.1
5555
pytest-cov~=6.2.1
5656
pylint==3.3.7
57-
mypy==1.16.1
57+
mypy==1.17.1
5858
pycodestyle==2.14.0
5959
black==25.1.0
60-
ruff==0.12.2
60+
ruff==0.12.7
6161
types-six==1.17.0.20250515
6262
types-PyYAML==6.0.12.20250516
63-
types-setuptools==80.9.0.20250529
63+
types-setuptools==80.9.0.20250801
6464

6565
# other
6666
requests~=2.32.4

0 commit comments

Comments
 (0)