[incubator-mxnet] branch master updated: Change variable/function names: defered -> deferred (#7301)

[jx...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jxie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git


The following commit(s) were added to refs/heads/master by this push:
     new 7578e35  Change variable/function names: defered -> deferred (#7301)
7578e35 is described below

commit 7578e357f084b346282a9c5cda0deb324816b06b
Author: Aston <22...@users.noreply.github.com>
AuthorDate: Wed Aug 2 13:41:32 2017 -0700

    Change variable/function names: defered -> deferred (#7301)
    
    * Fix a typo
    
    * update
    
    * change variable name from defered_init to deferred_init
    
    * change function name: test_defered_init -> test_deferred_init
---
 python/mxnet/gluon/parameter.py  | 30 +++++++++++++++---------------
 tests/python/unittest/test_nn.py |  2 +-
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/python/mxnet/gluon/parameter.py b/python/mxnet/gluon/parameter.py
index ee73774..0ae829a 100644
--- a/python/mxnet/gluon/parameter.py
+++ b/python/mxnet/gluon/parameter.py
@@ -77,7 +77,7 @@ class Parameter(object):
         self._var = None
         self._data = None
         self._grad = None
-        self._defered_init = ()
+        self._deferred_init = ()
 
     def __repr__(self):
         s = 'Parameter {name} (shape={shape}, dtype={dtype})'
@@ -91,7 +91,7 @@ class Parameter(object):
                     "It was only initialized on %s."%(
                         self.name, str(ctx), str(self.list_ctx())))
             return
-        if self._defered_init:
+        if self._deferred_init:
             raise DeferredInitializationError
         raise RuntimeError(
             "Parameter %s has not been initialized. Note that " \
@@ -116,8 +116,8 @@ class Parameter(object):
         if isinstance(ctx, Context):
             ctx = [ctx]
         if self._data is None:
-            if self._defered_init:
-                assert set(ctx) == set(self._defered_init[1]), \
+            if self._deferred_init:
+                assert set(ctx) == set(self._deferred_init[1]), \
                     "Failed to load Parameter %s on %s because it was " \
                     "previous initialized on %s."%(
                         self.name, str(ctx), str(self.list_ctx()))
@@ -128,14 +128,14 @@ class Parameter(object):
                 "previous initialized on %s."%(
                     self.name, str(ctx), str(self.list_ctx()))
             self.set_data(data)
-        self._defered_init = ()
+        self._deferred_init = ()
 
     def _finish_deferred_init(self):
         """Finishes deferred initialization."""
-        if not self._defered_init:
+        if not self._deferred_init:
             return
-        init, ctx, default_init = self._defered_init
-        self._defered_init = ()
+        init, ctx, default_init = self._deferred_init
+        self._deferred_init = ()
         assert self.shape is not None and np.prod(self.shape) > 0, \
             "Cannot initialize Parameter %s because it has " \
             "invalid shape: %s. Please specify in_units, " \
@@ -227,12 +227,12 @@ class Parameter(object):
             init = default_init if self.init is None else self.init
         if not self.shape or np.prod(self.shape) <= 0:
             if self.allow_deferred_init:
-                self._defered_init = (init, ctx, default_init)
+                self._deferred_init = (init, ctx, default_init)
                 return
             raise ValueError("Cannot initialize Parameter %s because it has " \
                              "invalid shape: %s."%(self.name, str(self.shape)))
 
-        self._defered_init = (init, ctx, default_init)
+        self._deferred_init = (init, ctx, default_init)
         self._finish_deferred_init()
 
     def reset_ctx(self, ctx):
@@ -250,9 +250,9 @@ class Parameter(object):
             data = self._reduce()
             with autograd.pause():
                 self._init_impl(data, ctx)
-        elif self._defered_init:
-            init, _, default_init = self._defered_init
-            self._defered_init = (init, ctx, default_init)
+        elif self._deferred_init:
+            init, _, default_init = self._deferred_init
+            self._deferred_init = (init, ctx, default_init)
         else:
             raise ValueError("Cannot reset context for Parameter %s because it "
                              "has not been initialized."%self.name)
@@ -325,8 +325,8 @@ class Parameter(object):
     def list_ctx(self):
         """Returns a list of contexts this parameter is initialized on."""
         if self._data is None:
-            if self._defered_init:
-                return self._defered_init[1]
+            if self._deferred_init:
+                return self._deferred_init[1]
             raise RuntimeError("Parameter %s has not been initialized"%self.name)
         return list(self._data.keys())
 
diff --git a/tests/python/unittest/test_nn.py b/tests/python/unittest/test_nn.py
index d4514e2..e293063 100644
--- a/tests/python/unittest/test_nn.py
+++ b/tests/python/unittest/test_nn.py
@@ -264,7 +264,7 @@ def test_at():
     x.backward()
 
 
-def test_defered_init():
+def test_deferred_init():
     x = mx.nd.ones((5, 4, 10, 10))
     layer = nn.Conv2D(10, 2)
     layer.collect_params().initialize()

-- 
To stop receiving notification emails like this one, please contact
['"commits@mxnet.apache.org" <co...@mxnet.apache.org>'].