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

Author: Beat Buesser

.github/workflows/ci-lingvo.yml

@@ -61,7 +61,6 @@ jobs:
           pip install lingvo==${{ matrix.lingvo }}
           pip install tensorflow-addons==0.9.1
           pip install model-pruning-google-research==0.0.3
-          pip install jax[cpu]==0.2.17
           pip install h5py==2.10.0
           pip install pytest~=7.0.1
           pip install pytest-flake8~=1.1.0

art/utils.py

@@ -1324,7 +1324,6 @@ def load_nursery(
         path=config.ART_DATA_PATH,
         extract=False,
         url=[
-            "https://archive.ics.uci.edu/ml/machine-learning-databases/nursery/nursery.data",
             "https://www.dropbox.com/s/l24hwvkuueor6lp/nursery.data?dl=1",
         ],
     )
@@ -1509,7 +1508,6 @@ def get_file(
 
     if download:
         logger.info("Downloading data from %s", url)
-        error_msg = "URL fetch failure on {}: {} -- {}"
         try:
             for url_i in url_list:
                 try:
@@ -1545,13 +1543,9 @@ def progress_bar(blocks: int = 1, block_size: int = 1, total_size: Optional[int]
                         urlretrieve(url_i, full_path)
 
                 except HTTPError as exception:  # pragma: no cover
-                    raise Exception(
-                        error_msg.format(url_i, exception.code, exception.msg)  # type: ignore
-                    ) from HTTPError  # type: ignore
+                    logger.error(url_i, exception)
                 except URLError as exception:  # pragma: no cover
-                    raise Exception(
-                        error_msg.format(url_i, exception.errno, exception.reason)  # type: ignore
-                    ) from HTTPError  # type: ignore
+                    logger.error(url_i, exception)
         except (Exception, KeyboardInterrupt):  # pragma: no cover
             if os.path.exists(full_path):
                 os.remove(full_path)

notebooks/model-stealing-demo.ipynb

@@ -35,10 +35,9 @@
     "from keras.models import Sequential\n",
     "from keras.layers import Dense, Flatten, Conv2D, MaxPooling2D, Flatten, InputLayer, Reshape\n",
     "\n",
-    "from art.classifiers import KerasClassifier\n",
+    "from art.estimators.classification import KerasClassifier\n",
     "\n",
-    "if tf.executing_eagerly():\n",
-    "    tf.python.framework.ops.disable_eager_execution()"
+    "tf.compat.v1.disable_eager_execution()"
    ]
   },
   {

notebooks/model_inversion_attacks_mnist.ipynb

@@ -38,7 +38,10 @@
     "from art.utils import load_dataset\n",
     "\n",
     "%matplotlib inline\n",
-    "import matplotlib.pyplot as plt"
+    "import matplotlib.pyplot as plt\n",
+    "\n",
+    "import tensorflow as tf\n",
+    "tf.compat.v1.disable_eager_execution()"
    ]
   },
   {

requirements_test.txt

@@ -37,7 +37,7 @@ torchvision==0.14.1+cpu
 catboost==1.1.1
 GPy==1.10.0
 lightgbm==3.3.5
-xgboost==1.7.4
+xgboost==1.7.5
 
 kornia~=0.6.10
 tensorboardX==2.6
@@ -56,7 +56,7 @@ pytest-flake8~=1.1.1
 flake8~=4.0.1
 pytest-mock~=3.10.0
 pytest-cov~=4.0.0
-requests~=2.28.2
+requests~=2.31.0
 
 # ART
 -e .