Merge pull request #39 from kozistr/update/deps

[Deps] Update the dependencies

Author: kozistr

.github/workflows/ci.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.7', '3.8']
+        python-version: ['3.7', '3.8', '3.9']
 
     steps:
     - uses: actions/checkout@v2

.github/workflows/publish.yml

@@ -34,7 +34,7 @@ jobs:
           python-version: 3.8
       - name: Install dependencies
         run: |
-          python3 -m pip install -r requirements-dev.txt
+          python3 -m pip install -r requirements.txt
           python3 -m pip install -U wheel twine
       - name: Build package
         run: |

Pipfile

@@ -4,14 +4,13 @@ url = "https://pypi.org/simple"
 verify_ssl = false
 
 [dev-packages]
-isort = "==5.9.3"
-black = "==21.9b0"
-pylint = "==2.11.1"
-twine = "==3.4.2"
+isort = "==5.10.1"
+black = "==21.11b1"
+pylint = "==3.0.0a4"
 
 [packages]
-numpy = "==1.21.2"
-torch = "==1.9.1"
+numpy = "==1.21.4"
+torch = "==1.10.0"
 
 [requires]
 python_version = "3"

Pipfile.lock

@@ -20,4 +20,4 @@
 from pytorch_optimizer.sgdp import SGDP
 from pytorch_optimizer.utils import clip_grad_norm, get_optimizer_parameters, normalize_gradient, unit_norm
 
-__VERSION__ = '0.2.1'
+__VERSION__ = '0.2.2'

pytorch_optimizer/__init__.py

@@ -161,11 +161,9 @@ def step(self, closure: CLOSURE = None) -> LOSS:
                     denom = (exp_avg_var.add_(group['eps']).sqrt() / math.sqrt(bias_correction2)).add_(group['eps'])
 
                 if not self.rectify:
-                    if group['adamd_debias_term']:
-                        step_size = group['lr']
-                    else:
-                        step_size = group['lr'] / bias_correction1
-
+                    step_size = group['lr']
+                    if not group['adamd_debias_term']:
+                        step_size /= bias_correction1
                     p.data.addcdiv_(exp_avg, denom, value=-step_size)
                 else:
                     buffered = group['buffer'][int(state['step'] % 10)]
@@ -189,10 +187,9 @@ def step(self, closure: CLOSURE = None) -> LOSS:
                                 / (n_sma_max - 2)
                             )
 
-                            if group['adamd_debias_term']:
-                                step_size = rt
-                            else:
-                                step_size = rt / bias_correction1
+                            step_size = rt
+                            if not group['adamd_debias_term']:
+                                step_size /= bias_correction1
                         elif self.degenerated_to_sgd:
                             step_size = 1.0 / bias_correction1
                         else:

pytorch_optimizer/adabelief.py

@@ -33,7 +33,7 @@ def __init__(
         weight_decay: float = 0.0,
         n_sma_threshold: int = 5,
         degenerated_to_sgd: bool = True,
-        adamd_debias_term: bool = adamd_debias_term,
+        adamd_debias_term: bool = False,
         eps: float = 1e-8,
     ):
         """Blend RAdam with DiffGrad

pytorch_optimizer/diffrgrad.py

@@ -10,47 +10,21 @@
 
 -i https://pypi.org/simple
 --trusted-host pypi.org
-astroid==2.8.0; python_version ~= '3.6'
-black==21.9b0
-bleach==4.1.0; python_version >= '3.6'
-certifi==2021.5.30
-cffi==1.14.6
-charset-normalizer==2.0.6; python_version >= '3'
-click==8.0.1; python_version >= '3.6'
-colorama==0.4.4; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
-cryptography==3.4.8; python_version >= '3.6'
-docutils==0.17.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
-idna==3.2; python_version >= '3'
-importlib-metadata==4.8.1; python_version >= '3.6'
-isort==5.9.3
-jeepney==0.7.1; sys_platform == 'linux'
-keyring==23.2.1; python_version >= '3.6'
+astroid==2.6.6; python_version ~= '3.6'
+black==21.11b1
+click==8.0.3; python_version >= '3.6'
+isort==5.10.1
 lazy-object-proxy==1.6.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'
 mccabe==0.6.1
 mypy-extensions==0.4.3
-numpy==1.21.2
-packaging==21.0; python_version >= '3.6'
+numpy==1.21.4
 pathspec==0.9.0
-pkginfo==1.7.1
-platformdirs==2.3.0; python_version >= '3.6'
-pycparser==2.20; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
-pygments==2.10.0; python_version >= '3.5'
-pylint==2.11.1
-pyparsing==2.4.7; python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'
-readme-renderer==29.0
-regex==2021.9.24
-requests-toolbelt==0.9.1
-requests==2.26.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'
-rfc3986==1.5.0
-secretstorage==3.3.1; sys_platform == 'linux'
-six==1.16.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
+platformdirs==2.4.0; python_version >= '3.6'
+pylint==3.0.0a4
+regex==2021.11.10
+setuptools==59.4.0; python_version >= '3.6'
 toml==0.10.2; python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'
-tomli==1.2.1; python_version >= '3.6'
-torch==1.9.1
-tqdm==4.62.3; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
-twine==3.4.2
-typing-extensions==3.10.0.2
-urllib3==1.26.7; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4'
-webencodings==0.5.1
-wrapt==1.12.1
-zipp==3.5.0; python_version >= '3.6'
+tomli==1.2.2; python_version >= '3.6'
+torch==1.10.0
+typing-extensions==4.0.0; python_version >= '3.6'
+wrapt==1.12.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'

requirements-dev.txt

@@ -7,6 +7,6 @@
 
 -i https://pypi.org/simple
 --trusted-host pypi.org
-numpy==1.21.2
-torch==1.9.1
-typing-extensions==3.10.0.2
+numpy==1.21.4
+torch==1.10.0
+typing-extensions==4.0.0; python_version >= '3.6'

requirements.txt

@@ -33,6 +33,7 @@ def read_version() -> str:
     'Programming Language :: Python :: 3.6',
     'Programming Language :: Python :: 3.7',
     'Programming Language :: Python :: 3.8',
+    'Programming Language :: Python :: 3.9',
     'Operating System :: OS Independent',
     'Topic :: Scientific/Engineering :: Artificial Intelligence',
 ]
@@ -88,5 +89,5 @@ def read_version() -> str:
     zip_safe=True,
     include_package_data=True,
     project_urls=PROJECT_URLS,
-    python_requires='>=3.7.0',
+    python_requires='>=3.6.0',
 )