Skip to content

Commit fc65d96

Browse files
committed
Merge remote-tracking branch 'origin/main' into dependabot/pip/numba-approx-eq-0.59.1
2 parents b0bb12b + f67ac5a commit fc65d96

File tree

116 files changed

+469
-314
lines changed

Some content is hidden

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

116 files changed

+469
-314
lines changed

.github/actions/deepspeech-v3/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Get base image
2-
FROM python:3.10.13-slim-bullseye
2+
FROM python:3.10.13-slim-bookworm
33

44
# Set to install things in non-interactive mode
55
ENV DEBIAN_FRONTEND noninteractive

.github/actions/espresso/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Get base image
2-
FROM python:3.7.17-slim-bullseye
2+
FROM python:3.7.17-slim-bookworm
33

44
# Set to install things in non-interactive mode
55
ENV DEBIAN_FRONTEND noninteractive

.github/actions/goturn/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# Get base image
2-
FROM python:3.8.19-slim-bullseye
2+
FROM python:3.8.19-slim-bookworm
3+
4+
ENV MONO_TLS_PROVIDER=legacy
35

46
# Install system wide software
57
RUN apt-get update \

.github/actions/tfv2-faster-rcnn/Dockerfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Get base from a tensorflow image
2-
FROM tensorflow/tensorflow:2.10.1
2+
FROM tensorflow/tensorflow:2.13.0
33

44
# Set to install things in non-interactive mode
55
ENV DEBIAN_FRONTEND noninteractive
@@ -38,10 +38,9 @@ RUN cd TensorFlow && wget https://github.com/protocolbuffers/protobuf/releases/d
3838
RUN cd TensorFlow && unzip protoc-3.17.3-linux-x86_64.zip -d protobuf
3939
RUN cd TensorFlow/models/research && /TensorFlow/protobuf/bin/protoc object_detection/protos/*.proto --python_out=.
4040
RUN cd TensorFlow/models/research && cp object_detection/packages/tf2/setup.py .
41-
RUN cd TensorFlow/models/research && python -m pip install --use-feature=2020-resolver .
41+
RUN cd TensorFlow/models/research && python -m pip install .
4242

4343
RUN pip install tqdm
4444
RUN pip install requests
45-
RUN pip install sklearn
4645
RUN pip install numba==0.50.0
4746
RUN pip install pytest-cov

.github/actions/yolo/run.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,11 @@ if [[ $? -ne 0 ]]; then exit_code=1; echo "Failed estimators/object_detection/te
88
pytest --cov-report=xml --cov=art --cov-append -q -vv tests/estimators/object_detection/test_object_seeker_yolo.py --framework=pytorch --durations=0
99
if [[ $? -ne 0 ]]; then exit_code=1; echo "Failed estimators/object_detection/test_object_seeker_yolo tests"; fi
1010

11+
pytest --cov-report=xml --cov=art --cov-append -q -vv tests/attacks/test_overload_attack.py --framework=pytorch --durations=0
12+
if [[ $? -ne 0 ]]; then exit_code=1; echo "Failed attacks/test_overload_attack tests"; fi
13+
14+
pytest --cov-report=xml --cov=art --cov-append -q -vv tests/attacks/test_steal_now_attack_later.py --framework=pytorch --durations=0
15+
if [[ $? -ne 0 ]]; then exit_code=1; echo "Failed attacks/teest_steal_now_attack_later tests"; fi
16+
17+
1118
exit ${exit_code}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@ jobs:
2525
test_deepspeech_v3_torch_2_1_1:
2626
name: PyTorchDeepSpeech v3 / PyTorch 2.1.1
2727
runs-on: ubuntu-latest
28-
container: adversarialrobustnesstoolbox/art_testing_envs:deepspeech_v3_torch_2_1_1
28+
container: bbuesser/art_testing_env_deepspeech_v3_torch_2_1_1:latest
2929
steps:
3030
- name: Checkout Repo
3131
uses: actions/checkout@v4
3232
- name: Run Test Action
3333
uses: ./.github/actions/deepspeech-v3
3434
- name: Upload coverage to Codecov
35-
uses: codecov/codecov-action@v4
35+
uses: codecov/codecov-action@v5
3636
with:
3737
token: ${{ secrets.CODECOV_TOKEN }}
3838
fail_ci_if_error: true

.github/workflows/ci-espresso.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@ jobs:
2525
test_espresso:
2626
name: PyTorchEspresso
2727
runs-on: ubuntu-latest
28-
container: adversarialrobustnesstoolbox/art_testing_envs:espresso
28+
container: bbuesser/art_testing_env_espresso:latest
2929
steps:
3030
- name: Checkout Repo
3131
uses: actions/checkout@v4
3232
- name: Run Test Action
3333
uses: ./.github/actions/espresso
3434
- name: Upload coverage to Codecov
35-
uses: codecov/codecov-action@v4
35+
uses: codecov/codecov-action@v5
3636
with:
3737
token: ${{ secrets.CODECOV_TOKEN }}
3838
fail_ci_if_error: true

.github/workflows/ci-goturn.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@ jobs:
2525
test_pytorch_goturn:
2626
name: PyTorchGoturn
2727
runs-on: ubuntu-latest
28-
container: adversarialrobustnesstoolbox/art_testing_envs:goturn
28+
container: bbuesser/art_testing_env_goturn:latest
2929
steps:
3030
- name: Checkout Repo
3131
uses: actions/checkout@v4
3232
- name: Run Test Action
3333
uses: ./.github/actions/goturn
3434
- name: Upload coverage to Codecov
35-
uses: codecov/codecov-action@v4
35+
uses: codecov/codecov-action@v5
3636
env:
3737
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
3838
with:

.github/workflows/ci-huggingface.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,15 +52,15 @@ jobs:
5252
pip3 install -r requirements_test.txt
5353
pip install tensorflow==2.14.0
5454
pip install keras==2.14.0
55-
pip install torch==${{ matrix.torch }} -f https://download.pytorch.org/whl/cpu/torch_stable.html
56-
pip install torchvision==${{ matrix.torchvision }} -f https://download.pytorch.org/whl/cpu/torch_stable.html
57-
pip install torchaudio==${{ matrix.torchaudio }} -f https://download.pytorch.org/whl/cpu/torch_stable.html
55+
pip install torch==${{ matrix.torch }} --index-url https://download.pytorch.org/whl/cpu
56+
pip install torchvision==${{ matrix.torchvision }} --index-url https://download.pytorch.org/whl/cpu
57+
pip install torchaudio==${{ matrix.torchaudio }} --index-url https://download.pytorch.org/whl/cpu
5858
pip install transformers==${{ matrix.transformers }}
5959
pip list
6060
- name: Run Tests
6161
run: ./run_tests.sh ${{ matrix.framework }}
6262
- name: Upload coverage to Codecov
63-
uses: codecov/codecov-action@v4
63+
uses: codecov/codecov-action@v5
6464
with:
6565
token: ${{ secrets.CODECOV_TOKEN }}
6666
fail_ci_if_error: true

.github/workflows/ci-keras.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
- name: Run Tests
6969
run: ./run_tests.sh ${{ matrix.framework }}
7070
- name: Upload coverage to Codecov
71-
uses: codecov/codecov-action@v4
71+
uses: codecov/codecov-action@v5
7272
with:
7373
token: ${{ secrets.CODECOV_TOKEN }}
7474
fail_ci_if_error: true

0 commit comments

Comments
 (0)