Merge remote-tracking branch 'origin/main' into dev_1.11.1

Author: Beat Buesser

.github/workflows/dockerhub.yml

@@ -0,0 +1,47 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+# GitHub recommends pinning actions to a commit SHA.
+# To get a newer version, you will need to update the SHA.
+# You can also reference a tag or branch, but the action may change without warning.
+name: Publish Docker image
+
+on:
+  # Run on manual trigger
+  workflow_dispatch:
+
+  release:
+    types: [published]
+
+jobs:
+  push_to_registry:
+    name: Push Docker image to Docker Hub
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v3
+
+      - name: Log in to Docker Hub
+        uses: docker/login-action@49ed152c8eca782a232dede0303416e8f356c37b
+        with:
+          username: ${{ secrets.DOCKER_HUB_USERNAME }}
+          password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@69f6fc9d46f2f8bf0d5491e4aabe0bb8c6a4678a
+        with:
+          images: adversarialrobustnesstoolbox/releases
+          tags: |
+            type=raw,value={{branch}}-1.11.0-{{sha}}
+            type=semver,pattern={{version}}
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@c84f38281176d4c9cdb1626ffafcd6b3911b5d94
+        with:
+          context: .
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}

Dockerfile

@@ -1,59 +1,25 @@
-FROM  tensorflow/tensorflow:2.2.0
-RUN pip3 install keras==2.3.1
-#### NOTE: comment these two lines if you wish to use the tensorflow 1 version of ART instead ####
-#FROM tensorflow/tensorflow:1.15.2
-#RUN pip3 install keras==2.2.5
+FROM nvidia/cuda:11.3.1-cudnn8-runtime-ubuntu20.04
 
-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
+RUN apt-get update -y
+RUN DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get -y install tzdata
+RUN apt-get install -y python3 python3-distutils python3-pip
 
-#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
+RUN pip3 install tensorflow==2.9.1 keras==2.9.0 numpy==1.22.4 scipy==1.8.1 matplotlib==3.5.2 scikit-learn==1.1.2 \
+                 six==1.15.0 Pillow==9.2.0 pytest-cov==3.0.0 tqdm==4.64.0 statsmodels==0.13.2 pydub==0.25.1 \
+                 resampy==0.3.1 ffmpeg-python==0.2.0 cma==3.2.2 pandas==1.4.3 h5py==3.7.0 tensorflow-addons==0.17.1 \
+                 mxnet==1.6.0 torch==1.12.0 torchaudio==0.12.0 torchvision==0.13.0 catboost==1.0.6 GPy==1.10.0 \
+                 lightgbm==3.3.2 xgboost==1.6.1 kornia==0.6.6 lief==0.12.1 pytest==7.1.2 pytest-pep8==1.0.6 \
+                 pytest-mock==3.8.2 codecov==2.1.12 requests==2.28.1
 
-# 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 apt-get -y install ffmpeg libavcodec-extra vim git
 
-RUN pip3 install h5py==2.10.0
-RUN pip3 install tensorflow-addons==0.11.1
-RUN pip3 install mxnet==1.6.0
-RUN pip3 install torch==1.5.0 torchvision==0.7.0 -f https://download.pytorch.org/whl/torch_stable.html
-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 lief==0.11.4
-
-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
-
-RUN mkdir /project; mkdir /project/TMP
-VOLUME /project/TMP
+RUN mkdir /project
 WORKDIR /project
-
-# IMPORTANT: please double check that the dependencies above are up to date with the following requirements file. We currently still run pip install on dependencies within requirements_test.txt in order to keep dependencies in agreement (in the rare cases were someone updated the requirements_test.txt file and forgot to update the dockefile)
-ADD . /project/
-RUN pip3 install --upgrade -r /project/requirements_test.txt
-
-RUN apt-get update
-RUN apt-get -y -q install ffmpeg libavcodec-extra
+ADD . /project
+RUN pip3 install .
 
 RUN echo "You should think about possibly upgrading these outdated packages"
 RUN pip3 list --outdated
 
-EXPOSE 8888
-
-CMD bash run_tests.sh
-
-#Check the Dockerfile here https://www.fromlatest.io/#/
-
-#NOTE to contributors: When changing/adding packages, please make sure that the packages are consistent with those
-# present within the requirements_test.txt files
+# NOTE to contributors: When changing/adding packages, please make sure that the packages are consistent with those
+# present within the requirements_test.txt files

README-cn.md

@@ -19,8 +19,12 @@
 [![Downloads](https://pepy.tech/badge/adversarial-robustness-toolbox/month)](https://pepy.tech/project/adversarial-robustness-toolbox)
 [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/5090/badge)](https://bestpractices.coreinfrastructure.org/projects/5090)
 
+<p align="center">
+  <img src="https://raw.githubusercontent.com/lfai/artwork/master/lfaidata-assets/lfaidata-project-badge/graduate/color/lfaidata-project-badge-graduate-color.png" alt="LF AI & Data" width="300"/>
+</p>
 
-对抗性鲁棒性工具集（ART）是用于机器学习安全性的Python库。ART提供的工具可
+对抗性鲁棒性工具集（ART）是用于机器学习安全性的Python库。ART 由
+[Linux Foundation AI & Data Foundation](https://lfaidata.foundation) (LF AI & Data)。 ART提供的工具可
 帮助开发人员和研究人员针对以下方面捍卫和评估机器学习模型和应用程序：
 逃逸，数据污染，模型提取和推断的对抗性威胁。ART支持所有流行的机器学习框架
 （TensorFlow，Keras，PyTorch，MXNet，scikit-learn，XGBoost，LightGBM，CatBoost，GPy等），所有数据类型

README.md

@@ -21,7 +21,12 @@
 
 [中文README请按此处](README-cn.md)
 
-Adversarial Robustness Toolbox (ART) is a Python library for Machine Learning Security. ART provides tools that enable
+<p align="center">
+  <img src="https://raw.githubusercontent.com/lfai/artwork/master/lfaidata-assets/lfaidata-project-badge/graduate/color/lfaidata-project-badge-graduate-color.png" alt="LF AI & Data" width="300"/>
+</p>
+
+Adversarial Robustness Toolbox (ART) is a Python library for Machine Learning Security. ART is hosted by the 
+[Linux Foundation AI & Data Foundation](https://lfaidata.foundation) (LF AI & Data). ART provides tools that enable
 developers and researchers to defend and evaluate Machine Learning models and applications against the
 adversarial threats of Evasion, Poisoning, Extraction, and Inference. ART supports all popular machine learning frameworks
 (TensorFlow, Keras, PyTorch, MXNet, scikit-learn, XGBoost, LightGBM, CatBoost, GPy, etc.), all data types

examples/get_started_tensorflow_v2.py

@@ -1,5 +1,5 @@
 """
-The script demonstrates a simple example of using ART with TensorFlow v1.x. The example train a small model on the MNIST
+The script demonstrates a simple example of using ART with TensorFlow v2.x. The example train a small model on the MNIST
 dataset and creates adversarial examples using the Fast Gradient Sign Method. Here we use the ART classifier to train
 the model, it would also be possible to provide a pretrained model to the ART classifier.
 The parameters are chosen for reduced computational requirements of the script and not optimised for accuracy.

requirements_test.txt

@@ -1,6 +1,6 @@
 # base
 
-numpy>=1.18.5
+numpy>=1.18.5,<=1.22
 scipy==1.8.1
 matplotlib==3.5.2
 scikit-learn>=0.22.2,<1.2.0