[Auto] Update timm (#1735)

* update timm * timm version * trigger build Co-authored-by: Weisu Yin <[email protected]>
dmlc · Mar 7, 2022 · 1653452 · 1653452
1 parent 161344e
commit 1653452
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 16 deletions.
diff --git a/.github/workflows/gpu_test.sh b/.github/workflows/gpu_test.sh
@@ -17,7 +17,7 @@ export KMP_DUPLICATE_LIB_OK=TRUE
 if [[ $TESTS_PATH == *"auto"* ]]; then
   echo "Installing autogluon.core and timm for auto module"
   pip3 install autogluon.core==0.2.0
-  pip3 install timm==0.4.12
+  pip3 install timm==0.5.4
 fi
 
 nosetests --process-restartworker --with-timer --timer-ok 5 --timer-warning 20 -x --with-coverage --cover-package $COVER_PACKAGE -v $TESTS_PATH
diff --git a/gluoncv/auto/__init__.py b/gluoncv/auto/__init__.py
@@ -1,11 +1,2 @@
 """GluonCV auto"""
-import logging
 from .estimators import *
-
-logger = logging.getLogger(__name__)
-msg = (
-    "We plan to deprecate auto from gluoncv on release 0.12.0."
-    "Please consider using autogluon.vision instead, which provides the same functionality."
-    "https://auto.gluon.ai/stable/tutorials/image_prediction/index.html"
-)
-logger.warning(msg)
diff --git a/gluoncv/auto/estimators/torch_image_classification/torch_image_classification.py b/gluoncv/auto/estimators/torch_image_classification/torch_image_classification.py
@@ -562,7 +562,7 @@ def _init_trainer(self):
                 optim_kwargs = optimizer_kwargs(cfg=self._cfg)
                 optim_kwargs['feature_lr_mult'] = self._cfg.train.transfer_lr_mult
                 optim_kwargs['fc_lr_mult'] = self._cfg.train.output_lr_mult
-                self._optimizer = create_optimizer_v2a(self.net, **optim_kwargs)
+                self._optimizer = create_optimizer_v2(self.net, **optimizer_kwargs(cfg=self._cfg))
             else:
                 self._optimizer = create_optimizer_v2(self.net, **optimizer_kwargs(cfg=self._cfg))
         self._init_loss_scaler()

diff --git a/gluoncv/auto/estimators/torch_image_classification/utils/optimizer.py b/gluoncv/auto/estimators/torch_image_classification/utils/optimizer.py
@@ -5,8 +5,8 @@
 
 def optimizer_kwargs(cfg):
     kwargs = dict(
-        optimizer_name=cfg.optimizer.opt,
-        learning_rate=cfg.train.lr,
+        opt=cfg.optimizer.opt,
+        lr=cfg.train.lr,
         weight_decay=cfg.optimizer.weight_decay,
         momentum=cfg.optimizer.momentum)
     if cfg.optimizer.opt_eps is not None:

diff --git a/gluoncv/auto/estimators/torch_image_classification/utils/utils.py b/gluoncv/auto/estimators/torch_image_classification/utils/utils.py
@@ -31,7 +31,7 @@ def resolve_data_config(cfg, default_cfg={}, model=None, use_test_size=False):
 
     # resolve interpolation method
     interpolation = 'bicubic'
-    if cfg.data.interpolation is not None:
+    if cfg.data.interpolation is not None and cfg.data.interpolation != '':
         interpolation = cfg.data.interpolation
     elif 'interpolation' in default_cfg:
         interpolation = default_cfg['interpolation']

diff --git a/gluoncv/auto/tasks/__init__.py b/gluoncv/auto/tasks/__init__.py
@@ -1,4 +1,14 @@
 """AutoML Tasks"""
+import logging
+
 from .image_classification import *
 from .object_detection import *
 # from .utils import *
+
+logger = logging.getLogger(__name__)
+msg = (
+    "We plan to deprecate auto from gluoncv on release 0.12.0."
+    "Please consider using autogluon.vision instead, which provides the same functionality."
+    "https://auto.gluon.ai/stable/tutorials/image_prediction/index.html"
+)
+logger.warning(msg)
diff --git a/tests/py3_auto.yml b/tests/py3_auto.yml
@@ -29,4 +29,4 @@ dependencies:
     - portalocker
     - autocfg>=0.0.6
     - autogluon.core==0.2.0
-    - timm==0.4.12
+    - timm==0.5.4
diff --git a/tools/batch/docker/gluon_cv_job.sh b/tools/batch/docker/gluon_cv_job.sh
@@ -29,7 +29,7 @@ else
 fi;
 
 python3 -m pip install --quiet -e .
-python3 -m pip install --quiet timm==0.4.12
+python3 -m pip install --quiet timm==0.5.4
 
 cd $WORK_DIR
 /bin/bash -o pipefail -c "$COMMAND"