Merge remote-tracking branch 'origin' into lizaitang-main_great_score

Author: beat-buesser

.github/actions/deepspeech-v3/Dockerfile

@@ -1,5 +1,5 @@
 # Get base image
-FROM python:3.10.13-slim-bullseye
+FROM python:3.10.13-slim-bookworm
 
 # Set to install things in non-interactive mode
 ENV DEBIAN_FRONTEND noninteractive

.github/actions/espresso/Dockerfile

@@ -1,5 +1,5 @@
 # Get base image
-FROM python:3.7.17-slim-bullseye
+FROM python:3.7.17-slim-bookworm
 
 # Set to install things in non-interactive mode
 ENV DEBIAN_FRONTEND noninteractive

.github/actions/goturn/Dockerfile

@@ -1,5 +1,7 @@
 # Get base image
-FROM python:3.8.19-slim-bullseye
+FROM python:3.8.19-slim-bookworm
+
+ENV MONO_TLS_PROVIDER=legacy
 
 # Install system wide software
 RUN apt-get update \

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

@@ -1,5 +1,5 @@
 # Get base from a tensorflow image
-FROM tensorflow/tensorflow:2.10.1
+FROM tensorflow/tensorflow:2.13.0
 
 # Set to install things in non-interactive mode
 ENV DEBIAN_FRONTEND noninteractive
@@ -38,10 +38,9 @@ RUN cd TensorFlow && wget https://github.com/protocolbuffers/protobuf/releases/d
 RUN cd TensorFlow && unzip protoc-3.17.3-linux-x86_64.zip -d protobuf
 RUN cd TensorFlow/models/research && /TensorFlow/protobuf/bin/protoc object_detection/protos/*.proto --python_out=.
 RUN cd TensorFlow/models/research && cp object_detection/packages/tf2/setup.py .
-RUN cd TensorFlow/models/research && python -m pip install --use-feature=2020-resolver .
+RUN cd TensorFlow/models/research && python -m pip install .
 
 RUN pip install tqdm
 RUN pip install requests
-RUN pip install sklearn
 RUN pip install numba==0.50.0
 RUN pip install pytest-cov

.github/actions/yolo/run.sh

@@ -8,4 +8,11 @@ if [[ $? -ne 0 ]]; then exit_code=1; echo "Failed estimators/object_detection/te
 pytest --cov-report=xml --cov=art --cov-append -q -vv tests/estimators/object_detection/test_object_seeker_yolo.py --framework=pytorch --durations=0
 if [[ $? -ne 0 ]]; then exit_code=1; echo "Failed estimators/object_detection/test_object_seeker_yolo tests"; fi
 
+pytest --cov-report=xml --cov=art --cov-append -q -vv tests/attacks/test_overload_attack.py --framework=pytorch --durations=0
+if [[ $? -ne 0 ]]; then exit_code=1; echo "Failed attacks/test_overload_attack tests"; fi
+
+pytest --cov-report=xml --cov=art --cov-append -q -vv tests/attacks/test_steal_now_attack_later.py --framework=pytorch --durations=0
+if [[ $? -ne 0 ]]; then exit_code=1; echo "Failed attacks/teest_steal_now_attack_later tests"; fi
+
+
 exit ${exit_code}

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

@@ -25,7 +25,7 @@ jobs:
   test_deepspeech_v3_torch_2_1_1:
     name: PyTorchDeepSpeech v3 / PyTorch 2.1.1
     runs-on: ubuntu-latest
-    container: adversarialrobustnesstoolbox/art_testing_envs:deepspeech_v3_torch_2_1_1
+    container: bbuesser/art_testing_env_deepspeech_v3_torch_2_1_1:latest
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v4

.github/workflows/ci-espresso.yml

@@ -25,7 +25,7 @@ jobs:
   test_espresso:
     name: PyTorchEspresso
     runs-on: ubuntu-latest
-    container: adversarialrobustnesstoolbox/art_testing_envs:espresso
+    container: bbuesser/art_testing_env_espresso:latest
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v4

.github/workflows/ci-goturn.yml

@@ -25,7 +25,7 @@ jobs:
   test_pytorch_goturn:
     name: PyTorchGoturn
     runs-on: ubuntu-latest
-    container: adversarialrobustnesstoolbox/art_testing_envs:goturn
+    container: bbuesser/art_testing_env_goturn:latest
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v4

.github/workflows/ci-huggingface.yml

@@ -52,9 +52,9 @@ jobs:
           pip3 install -r requirements_test.txt
           pip install tensorflow==2.14.0
           pip install keras==2.14.0
-          pip install torch==${{ matrix.torch }} -f https://download.pytorch.org/whl/cpu/torch_stable.html
-          pip install torchvision==${{ matrix.torchvision }} -f https://download.pytorch.org/whl/cpu/torch_stable.html
-          pip install torchaudio==${{ matrix.torchaudio }} -f https://download.pytorch.org/whl/cpu/torch_stable.html
+          pip install torch==${{ matrix.torch }} --index-url https://download.pytorch.org/whl/cpu
+          pip install torchvision==${{ matrix.torchvision }} --index-url https://download.pytorch.org/whl/cpu
+          pip install torchaudio==${{ matrix.torchaudio }} --index-url https://download.pytorch.org/whl/cpu
           pip install transformers==${{ matrix.transformers }}
           pip list
       - name: Run Tests

.github/workflows/ci-legacy.yml

@@ -29,15 +29,15 @@ jobs:
       matrix:
         module: [attacks_1, attacks_2, estimators, defences, metrics, art]
         include:
-          - name: legacy (TensorFlow 2.14.0 Keras 2.14.0 PyTorch 1.13.1 scikit-learn 1.1.3 Python 3.9)
+          - name: legacy (TensorFlow 2.14.0 Keras 2.14.0 PyTorch 1.13.1 scikit-learn 1.6.1 Python 3.9)
             framework: legacy
             python: '3.10'
             tensorflow: 2.14.0
             keras: 2.14.0
             torch: 1.13.1+cpu
             torchvision: 0.14.1+cpu
             torchaudio: 0.13.1+cpu
-            scikit-learn: 1.1.3
+            scikit-learn: 1.6.1
 
     name: Run ${{ matrix.module }} ${{ matrix.name }} Tests
     steps:
@@ -56,9 +56,9 @@ jobs:
           pip install tensorflow==${{ matrix.tensorflow }}
           pip install keras==${{ matrix.keras }}
           pip install scikit-learn==${{ matrix.scikit-learn }}
-          pip install torch==${{ matrix.torch }} -f https://download.pytorch.org/whl/cpu/torch_stable.html
-          pip install torchvision==${{ matrix.torchvision }} -f https://download.pytorch.org/whl/cpu/torch_stable.html
-          pip install torchaudio==${{ matrix.torchaudio }} -f https://download.pytorch.org/whl/cpu/torch_stable.html
+          pip install torch==${{ matrix.torch }} --index-url https://download.pytorch.org/whl/cpu
+          pip install torchvision==${{ matrix.torchvision }} --index-url https://download.pytorch.org/whl/cpu
+          pip install torchaudio==${{ matrix.torchaudio }} --index-url https://download.pytorch.org/whl/cpu
           pip list
       - name: Run ${{ matrix.name }} ${{ matrix.module }} Tests
         run: ./run_tests.sh ${{ matrix.framework }} ${{ matrix.module }}