Merge pull request #775 from Trusted-AI/dev_1.5.0

Update to ART 1.5.0

Author: beat-buesser

.github/dependabot.yml

@@ -11,3 +11,9 @@ updates:
       interval: "daily"
     assignees:
       - "beat-buesser"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    assignees:
+      - "beat-buesser"

.github/workflows/ci.yml

@@ -25,32 +25,108 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - python: 3.6
-            tensorflow: 1.15.3
+          - name: TensorFlow 1.15.4 (Keras 2.2.5 Python 3.7)
+            framework: tensorflow
+            python: 3.7
+            tensorflow: 1.15.4
+            tf_version: v1
             keras: 2.2.5
-          - python: 3.7
+          - name: TensorFlow 2.2.0 (Keras 2.3.1 Python 3.7)
+            framework: tensorflow
+            python: 3.7
             tensorflow: 2.2.0
+            tf_version: v2
             keras: 2.3.1
-    name: Run Tests (Python ${{ matrix.python }})
+          - name: TensorFlow 2.2.0v1 (Keras 2.3.1 Python 3.7)
+            framework: tensorflow2v1
+            python: 3.7
+            tensorflow: 2.2.0
+            tf_version: v2
+            keras: 2.3.1
+          - name: TensorFlow 2.3.1 (Keras 2.4.3 Python 3.7)
+            framework: tensorflow
+            python: 3.7
+            tensorflow: 2.3.1
+            tf_version: v2
+            keras: 2.4.3
+          - name: TensorFlow 2.4.0rc3 (Keras 2.4.3 Python 3.8)
+            framework: tensorflow
+            python: 3.8
+            tensorflow: 2.4.0rc3
+            tf_version: v2
+            keras: 2.4.3
+          - name: Keras 2.3.1 (TensorFlow 2.2.1 Python 3.7)
+            framework: keras
+            python: 3.7
+            tensorflow: 2.2.1
+            keras: 2.3.1
+          - name: TensorFlow-Keras 2.3.1 (Keras 2.4.3 Python 3.7)
+            framework: kerastf
+            python: 3.7
+            tensorflow: 2.3.1
+            keras: 2.4.3
+          - name: PyTorch (Python 3.7)
+            framework: pytorch
+            python: 3.7
+          - name: scikit-learn 0.22.2 (Python 3.7)
+            framework: scikitlearn
+            scikit-learn: 0.22.2
+            python: 3.7
+          - name: scikit-learn 0.23.2 (Python 3.8)
+            framework: scikitlearn
+            scikit-learn: 0.23.2
+            python: 3.8
+          - name: mxnet (Python 3.7)
+            framework: mxnet
+            python: 3.7
+          - name: legacy (TensorFlow 2.2.1 Keras 2.3.1 scikit-learn 0.22.2 Python 3.7)
+            framework: legacy
+            python: 3.7
+            tensorflow: 2.2.1
+            keras: 2.3.1
+            scikit-learn: 0.22.2
+          - name: legacy (TensorFlow 2.3.1 Keras 2.4.3 scikit-learn 0.23.2 Python 3.8)
+            framework: legacy
+            python: 3.8
+            tensorflow: 2.3.1
+            keras: 2.4.3
+            scikit-learn: 0.23.2
+
+    name: Run ${{ matrix.name }} Tests
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v2
       - name: Setup Python
         uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.python }}
-      - name: Pre-install
-        run: |
-          sudo apt-get -y -q install ffmpeg libavcodec-extra
-          sed -i "s/^tensorflow$/tensorflow==${{ matrix.tensorflow }}/" requirements.txt
-          sed -i "s/^keras$/keras==${{ matrix.keras }}/" requirements.txt
       - name: Install Dependencies
         run: |
+          sudo apt-get update
+          sudo apt-get -y -q install ffmpeg libavcodec-extra
           python -m pip install --upgrade pip setuptools wheel
           pip3 install -q -r requirements.txt
           pip list
-      - name: Run Tests
-        run: ./run_tests.sh
+      - name: Pre-install legacy
+        if: ${{ matrix.framework == 'legacy' }}
+        run: |
+          pip install tensorflow==${{ matrix.tensorflow }}
+          pip install keras==${{ matrix.keras }}
+          pip install scikit-learn==${{ matrix.scikit-learn }}
+          pip list
+      - name: Pre-install tensorflow
+        if: ${{ matrix.framework == 'tensorflow' || matrix.framework == 'keras' || matrix.framework == 'kerastf' }}
+        run: |
+          pip install tensorflow==${{ matrix.tensorflow }}
+          pip install keras==${{ matrix.keras }}
+          pip list
+      - name: Pre-install scikit-learn
+        if: ${{ matrix.framework == 'scikitlearn' }}
+        run: |
+          pip install scikit-learn==${{ matrix.scikit-learn }}
+          pip list
+      - name: Run ${{ matrix.name }} Tests
+        run: ./run_tests.sh ${{ matrix.framework }}
   style:
     name: Style Check
     runs-on: ubuntu-latest
@@ -63,9 +139,10 @@ jobs:
           python-version: 3.7
       - name: Pre-install
         run: |
+          sudo apt-get update
           sudo apt-get -y -q install ffmpeg libavcodec-extra
-          sed -i "s/^tensorflow$/tensorflow==2.2.0/" requirements.txt
-          sed -i "s/^keras$/keras==2.3.1/" requirements.txt
+          pip install tensorflow==2.2.0
+          pip install keras==2.3.1
       - name: Install Dependencies
         run: |
           python -m pip install --upgrade pip setuptools wheel

.gitignore

@@ -113,3 +113,4 @@ demo/pics/*
 !notebooks/*.ipynb
 !notebooks/adaptive_defence_evaluations/*.ipynb
 !notebooks/adversarial_patch/*.ipynb
+!notebooks/art_evaluations/*.ipynb

.travis.yml

@@ -1,5 +1,5 @@
-The Adversarial Robustness Toolbox is dedicated to providing a harassment-free experience for everyone, regardless of gender, gender identity and expression, sexual orientation, disability, physical appearance, body size, age, race, or religion. We do not tolerate harassment of participants in any form.
+The Adversarial Robustness Toolbox (ART) is dedicated to providing a harassment-free experience for everyone, regardless of gender, gender identity and expression, sexual orientation, disability, physical appearance, body size, age, race, or religion. We do not tolerate harassment of participants in any form.
 
-This code of conduct applies to all Adversarial Robustness Toolbox spaces, both online and off. Anyone who violates this code of conduct may be sanctioned or expelled from these spaces at the discretion of the IBM Research AI team.
+This code of conduct applies to all Adversarial Robustness Toolbox spaces, both online and off. Anyone who violates this code of conduct may be sanctioned or expelled from these spaces at the discretion of the Trusted-AI team.
 
 We may add additional rules over time, which will be made clearly available to participants. Participants are responsible for knowing and abiding by these rules.

CODE_OF_CONDUCT.md

@@ -4,14 +4,23 @@ RUN pip3 install keras==2.3.1
 #FROM tensorflow/tensorflow:1.15.2
 #RUN pip3 install keras==2.2.5
 
-RUN pip3 install numpy==1.19.1 scipy==1.4.1 matplotlib==3.3.1 scikit-learn==0.22.2 six==1.15.0 Pillow==7.2.0
+RUN pip3 install numpy==1.19.1 scipy==1.4.1 matplotlib==3.3.1 scikit-learn==0.22.2 six==1.15.0 Pillow==7.2.0 pytest-cov==2.10.1
 RUN pip3 install tqdm==4.48.2 statsmodels==0.11.1 pydub==0.24.1 resampy==0.2.2 ffmpeg-python==0.2.0 cma==3.0.3 mypy==0.770
+RUN pip3 install ffmpeg-python==0.2.0
 RUN pip3 install pandas==1.1.1
 
 #TODO check if jupyter notebook works
 RUN pip3 install jupyter==1.0.0 && pip3 install jupyterlab==2.1.0
 # https://stackoverflow.com/questions/49024624/how-to-dockerize-jupyter-lab
 
+# Lingvo ASR dependencies
+# supported versions: (lingvo==0.6.4 with tensorflow-gpu==2.1.0)
+# note: due to conflicts with other TF1/2 version supported by ART, the dependencies are not installed by default:
+# Replace line 1 with: FROM tensorflow/tensorflow:2.1.0
+# Comment other TF related lines and uncomment:
+# RUN pip3 install tensorflow-gpu==2.1.0
+# RUN pip3 install lingvo==0.6.4
+
 RUN pip3 install h5py==2.10.0
 RUN pip3 install tensorflow-addons==0.11.1
 RUN pip3 install mxnet==1.6.0
@@ -20,6 +29,7 @@ RUN pip3 install catboost==0.24
 RUN pip3 install GPy==1.9.9
 RUN pip3 install lightgbm==2.3.1
 RUN pip3 install xgboost==1.1.1
+RUN pip3 install kornia==0.3.1
 
 RUN pip3 install pytest==5.4.1 pytest-pep8==1.0.6 pytest-mock==3.2.0 codecov==2.1.8 requests==2.24.0
 
@@ -31,6 +41,9 @@ WORKDIR /project
 ADD . /project/
 RUN pip3 install --upgrade -r /project/requirements.txt
 
+RUN apt-get update
+RUN apt-get -y -q install ffmpeg libavcodec-extra
+
 RUN echo "You should think about possibly upgrading these outdated packages"
 RUN pip3 list --outdated
 

Dockerfile

@@ -1,13 +1,13 @@
 PROJECT_HOME_DIR := ${CURDIR}
 
 build:
-    # Builds a Tensorflow 2 ART docker container
+    # Builds a TensorFlow 2 ART docker container
     # IMPORTANT ! If you have an existing python env folder make sure to first add it to the `.dockerIgnore` \
     to reduce the size of your the art docker image
 	docker build -t project-art-tf2 .
 
 build1:
-	# Builds a Tensorflow 1 ART docker container
+	# Builds a TensorFlow 1 ART docker container
     # IMPORTANT ! If you have an existing python env folder make sure to first add it to the `.dockerIgnore` \
     to reduce the size of your the art docker image
 	docker build -t project-art-tf1 .

Makefile

@@ -4,7 +4,8 @@
 </p>
 <br />
 
-[![Build Status](https://travis-ci.com/Trusted-AI/adversarial-robustness-toolbox.svg?branch=main)](https://travis-ci.com/Trusted-AI/adversarial-robustness-toolbox)
+![Continuous Integration](https://github.com/Trusted-AI/adversarial-robustness-toolbox/workflows/Continuous%20Integration/badge.svg)
+![CodeQL](https://github.com/Trusted-AI/adversarial-robustness-toolbox/workflows/CodeQL/badge.svg)
 [![Documentation Status](https://readthedocs.org/projects/adversarial-robustness-toolbox/badge/?version=latest)](http://adversarial-robustness-toolbox.readthedocs.io/en/latest/?badge=latest)
 [![GitHub version](https://badge.fury.io/gh/Trusted-AI%2Fadversarial-robustness-toolbox.svg)](https://badge.fury.io/gh/Trusted-AI%2Fadversarial-robustness-toolbox)
 [![Language grade: Python](https://img.shields.io/lgtm/grade/python/g/Trusted-AI/adversarial-robustness-toolbox.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/Trusted-AI/adversarial-robustness-toolbox/context:python)

README-cn.md

@@ -4,7 +4,8 @@
 </p>
 <br />
 
-[![Build Status](https://travis-ci.com/Trusted-AI/adversarial-robustness-toolbox.svg?branch=main)](https://travis-ci.com/Trusted-AI/adversarial-robustness-toolbox)
+![Continuous Integration](https://github.com/Trusted-AI/adversarial-robustness-toolbox/workflows/Continuous%20Integration/badge.svg)
+![CodeQL](https://github.com/Trusted-AI/adversarial-robustness-toolbox/workflows/CodeQL/badge.svg)
 [![Documentation Status](https://readthedocs.org/projects/adversarial-robustness-toolbox/badge/?version=latest)](http://adversarial-robustness-toolbox.readthedocs.io/en/latest/?badge=latest)
 [![GitHub version](https://badge.fury.io/gh/Trusted-AI%2Fadversarial-robustness-toolbox.svg)](https://badge.fury.io/gh/Trusted-AI%2Fadversarial-robustness-toolbox)
 [![Language grade: Python](https://img.shields.io/lgtm/grade/python/g/Trusted-AI/adversarial-robustness-toolbox.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/Trusted-AI/adversarial-robustness-toolbox/context:python)

README.md

@@ -3,6 +3,7 @@
 """
 from art.attacks.attack import Attack, EvasionAttack, PoisoningAttack, PoisoningAttackBlackBox, PoisoningAttackWhiteBox
 from art.attacks.attack import PoisoningAttackTransformer, ExtractionAttack, InferenceAttack, AttributeInferenceAttack
+from art.attacks.attack import ReconstructionAttack
 
 from art.attacks import evasion
 from art.attacks import extraction