remove Adadelta from legacy optimizers

autonomio · Apr 21, 2024 · fcb9e31 · fcb9e31
1 parent f190198
commit fcb9e31
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 13 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -9,7 +9,6 @@ the below items:
 - [ ] Code is [PEP8](https://www.python.org/dev/peps/pep-0008/)
 - [ ] I'm making the PR to `master`
 - [ ] I've updated the versions based on [Semantic Versioning](https://semver.org/)
-  - [ ] `setup.py`
   - [ ] `talos/__init__.py`
   - [ ] `docs/index.html`
   - [ ] `docs/_coverpage.md`

diff --git a/docs/Examples_Generator.md b/docs/Examples_Generator.md
@@ -83,7 +83,7 @@ return out, model
 ### Parameter Dictionary
 ```python
 p = {'activation':['relu', 'elu'],
-     'optimizer': ['AdaDelta'],
+     'optimizer': ['Adam'],
      'losses': ['logcosh'],
      'shapes': ['brick'],
      'first_neuron': [32],

diff --git a/docs/Examples_Generator_Code.md b/docs/Examples_Generator_Code.md
@@ -36,7 +36,7 @@ def mnist_model(x_train, y_train, x_val, y_val, params):
     return out, model
 
 p = {'activation':['relu', 'elu'],
-     'optimizer': ['AdaDelta'],
+     'optimizer': ['Adam'],
      'losses': ['logcosh'],
      'shapes': ['brick'],
      'first_neuron': [32],

diff --git a/docs/_coverpage.md b/docs/_coverpage.md
@@ -1,6 +1,6 @@
 ![logo](_media/talos_logo_bg.png)
 
-## v1.3.3
+## v1.4
 
 > Hyperparameter Experiments with Tensorflow, PyTorch and Keras
 

diff --git a/docs/index.html b/docs/index.html
@@ -16,7 +16,7 @@
   <div id="app"></div>
   <script>
     window.$docsify = {
-      name: 'Talos 1.3.3',
+      name: 'Talos 1.4',
       repo: 'https://github.com/autonomio/talos',
       coverpage: true,
       loadSidebar: true,

diff --git a/talos/__init__.py b/talos/__init__.py
@@ -35,4 +35,4 @@
 del commands, scan, model, metrics, key
 del sub, keep_from_templates, template_sub, warnings
 
-__version__ = "1.3.3"
+__version__ = "1.4"
diff --git a/talos/autom8/autoparams.py b/talos/autom8/autoparams.py
@@ -1,5 +1,5 @@
 import numpy as np
-from tensorflow.keras.optimizers.legacy import Adam, Adagrad, Adadelta, SGD
+from tensorflow.keras.optimizers.legacy import Adam, Adagrad, SGD
 
 
 loss = {'binary': ['binary_crossentropy', 'logcosh'],
@@ -122,7 +122,7 @@ def optimizers(self, optimizers='auto'):
         '''
 
         if optimizers == 'auto':
-            self._append_params('optimizer', [Adam, Adagrad, Adadelta, SGD])
+            self._append_params('optimizer', [Adam, Adagrad, SGD])
         else:
             self._append_params('optimizer', optimizers)
 

diff --git a/talos/model/normalizers.py b/talos/model/normalizers.py
@@ -11,13 +11,11 @@ def lr_normalizer(lr, optimizer):
         The optimizer. For example, Adagrad, Adam, RMSprop.
     """
 
-    from tensorflow.keras.optimizers.legacy import SGD, Adam, Adadelta, Adagrad, Adamax, RMSprop
+    from tensorflow.keras.optimizers.legacy import SGD, Adam, Adagrad, Adamax, RMSprop
     from tensorflow.keras.optimizers.legacy import Adagrad
     from talos.utils.exceptions import TalosModelError
 
-    if optimizer == Adadelta:
-        pass
-    elif optimizer == SGD or optimizer == Adagrad:
+    if optimizer == SGD or optimizer == Adagrad:
         lr /= 100.0
     elif optimizer == Adam or optimizer == RMSprop:
         lr /= 1000.0

diff --git a/tests/performance/memory_pressure.py b/tests/performance/memory_pressure.py
@@ -6,7 +6,7 @@
 from tensorflow.keras.layers import Conv2D
 
 p = {'activation': ['relu'],
-     'optimizer': ['AdaDelta'],
+     'optimizer': ['Adam'],
      'losses': ['categorical_crossentropy'],
      'dropout': [.2],
      'batch_size': [256],