Merge pull request #2581 from Trusted-AI/dependabot/pip/timm-1.0.15

Bump timm from 0.9.2 to 1.0.15

Author: beat-buesser

.github/workflows/ci-tensorflow-v1.yml

@@ -48,7 +48,7 @@ jobs:
           sudo apt-get update
           sudo apt-get -y -q install ffmpeg libavcodec-extra
           python -m pip install --upgrade pip setuptools wheel
-          pip install -q -r <(sed '/^pandas/d;/^scipy/d;/^matplotlib/d;/^xgboost/d;/^tensorflow/d;/^keras/d;/^jax/d;/^torch/d;/^Pillow/d;/^h5py/d;/^kornia/d;/^scikit-learn/d;/^pytest-mock/d;/^GPy/d;/^lief/d;/^statsmodels/d;/^ultralytics/d;/^ipython/d;/^numba/d;/^pytest/d;/^pylint/d;/^mypy/d;/^pycodestyle/d;/^black/d;/^types-PyYAML/d;/^types-setuptools/d;/^requests/d' requirements_test.txt)
+          pip install -q -r <(sed '/^pandas/d;/^scipy/d;/^matplotlib/d;/^xgboost/d;/^tensorflow/d;/^keras/d;/^jax/d;/^torch/d;/^Pillow/d;/^h5py/d;/^kornia/d;/^scikit-learn/d;/^pytest-mock/d;/^GPy/d;/^lief/d;/^statsmodels/d;/^ultralytics/d;/^ipython/d;/^numba/d;/^pytest/d;/^pylint/d;/^mypy/d;/^pycodestyle/d;/^black/d;/^types-PyYAML/d;/^types-setuptools/d;/^requests/d;/^timm/d' requirements_test.txt)
           pip install pandas==1.3.5
           pip install scipy==1.7.2
           pip install matplotlib==3.5.3
@@ -59,7 +59,7 @@ jobs:
           pip install numpy==1.20
           pip install torch==1.13.1
           pip install torchaudio==0.13.1
-          pip install torchvision==0.14.1+cpu
+          pip install torchvision==0.14.1
           pip install Pillow==9.5.0
           pip install h5py==3.8.0
           pip install kornia==0.6.12
@@ -72,6 +72,7 @@ jobs:
           pip install pytest==7.4.4
           pip install pytest-cov
           pip install requests==2.31.0
+          pip install timm==0.9.12
           pip list
       - name: Run Tests
         run: ./run_tests.sh ${{ matrix.framework }}

art/estimators/certification/derandomized_smoothing/pytorch.py

@@ -162,7 +162,7 @@ def __init__(
                         model, pretrained=load_pretrained, drop_tokens=drop_tokens, device_type=device_type
                     )
                     if replace_last_layer:
-                        model.head = torch.nn.Linear(model.head.in_features, nb_classes)
+                        model.head = torch.nn.Linear(model.head.in_features, nb_classes)  # type: ignore
                     if isinstance(optimizer, type):
                         if optimizer_params is not None:
                             optimizer = optimizer(model.parameters(), **optimizer_params)
@@ -181,9 +181,9 @@ def __init__(
                     model = timm.create_model(
                         pretrained_cfg["architecture"], drop_tokens=drop_tokens, device_type=device_type
                     )
-                    model.load_state_dict(supplied_state_dict)
+                    model.load_state_dict(supplied_state_dict)  # type: ignore
                     if replace_last_layer:
-                        model.head = torch.nn.Linear(model.head.in_features, nb_classes)
+                        model.head = torch.nn.Linear(model.head.in_features, nb_classes)  # type: ignore
 
                     if optimizer is not None:
                         if not isinstance(optimizer, torch.optim.Optimizer):
@@ -193,10 +193,10 @@ def __init__(
                         opt_state_dict = optimizer.state_dict()
                         if isinstance(optimizer, torch.optim.Adam):
                             logging.info("Converting Adam Optimiser")
-                            converted_optimizer = torch.optim.Adam(model.parameters(), lr=1e-4)
+                            converted_optimizer = torch.optim.Adam(model.parameters(), lr=1e-4)  # type: ignore
                         elif isinstance(optimizer, torch.optim.SGD):
                             logging.info("Converting SGD Optimiser")
-                            converted_optimizer = torch.optim.SGD(model.parameters(), lr=1e-4)
+                            converted_optimizer = torch.optim.SGD(model.parameters(), lr=1e-4)  # type: ignore
                         else:
                             raise ValueError("Optimiser not supported for conversion")
                         converted_optimizer.load_state_dict(opt_state_dict)

requirements_test.txt

@@ -36,7 +36,7 @@ torchaudio==2.5.0
 torchvision==0.20.0
 
 # PyTorch image transformers
-timm==0.9.2
+timm==1.0.15
 
 catboost==1.2.7
 GPy==1.13.2