Merge pull request #2845 from Hakuyume/fix-shift-extension

Fix resuming issue of *Shift extensions
chainer · Jun 17, 2017 · a44f4ec · a44f4ec
2 parents 8f8c0d4 + fb00320
commit a44f4ec
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 0 deletions.
diff --git a/chainer/training/extensions/exponential_shift.py b/chainer/training/extensions/exponential_shift.py
@@ -1,5 +1,7 @@
 from __future__ import division
 
+import numpy as np
+
 from chainer.training import extension
 
 
@@ -70,6 +72,8 @@ def __call__(self, trainer):
     def serialize(self, serializer):
         self._t = serializer('_t', self._t)
         self._last_value = serializer('_last_value', self._last_value)
+        if isinstance(self._last_value, np.ndarray):
+            self._last_value = np.asscalar(self._last_value)
 
     def _get_optimizer(self, trainer):
         return self._optimizer or trainer.updater.get_optimizer('main')

diff --git a/chainer/training/extensions/linear_shift.py b/chainer/training/extensions/linear_shift.py
@@ -1,5 +1,7 @@
 from __future__ import division
 
+import numpy as np
+
 from chainer.training import extension
 
 
@@ -55,6 +57,8 @@ def __call__(self, trainer):
     def serialize(self, serializer):
         self._t = serializer('_t', self._t)
         self._last_value = serializer('_last_value', self._last_value)
+        if isinstance(self._last_value, np.ndarray):
+            self._last_value = np.asscalar(self._last_value)
 
     def _get_optimizer(self, trainer):
         return self._optimizer or trainer.updater.get_optimizer('main')

diff --git a/tests/chainer_tests/training_tests/extensions_tests/test_exponential_shift.py b/tests/chainer_tests/training_tests/extensions_tests/test_exponential_shift.py
@@ -77,6 +77,7 @@ def test_resume(self):
 
         new_extension.initialize(new_trainer)
         self.assertEqual(new_optimizer.x, self.optimizer.x)
+        self.assertIsInstance(new_optimizer.x, float)
 
 
 class TestExponentialShiftInvalidArgument(unittest.TestCase):

diff --git a/tests/chainer_tests/training_tests/extensions_tests/test_linear_shift.py b/tests/chainer_tests/training_tests/extensions_tests/test_linear_shift.py
@@ -65,6 +65,7 @@ def test_resume(self):
 
         new_extension.initialize(new_trainer)
         self.assertEqual(new_optimizer.x, self.optimizer.x)
+        self.assertIsInstance(new_optimizer.x, float)
 
 
 testing.run_module(__name__, __file__)