You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mxnet.apache.org by ns...@apache.org on 2018/11/04 17:57:52 UTC

[incubator-mxnet] branch master updated: Fix example for mxnet.nd.contrib.cond and fix typo in src/engine (#12954)

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

nswamy 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 974a04c  Fix example for mxnet.nd.contrib.cond and fix typo in src/engine (#12954)
974a04c is described below

commit 974a04cdb97fbabe079f79f1d9ebc2d14a793034
Author: JackieWu <wk...@live.cn>
AuthorDate: Mon Nov 5 01:57:32 2018 +0800

    Fix example for mxnet.nd.contrib.cond and fix typo in src/engine (#12954)
    
    * fix typo in src/engine
    
    * fix example for mx.nd.contrib.cond
---
 python/mxnet/ndarray/contrib.py | 4 ++--
 src/engine/engine.cc            | 2 +-
 src/engine/threaded_engine.h    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/python/mxnet/ndarray/contrib.py b/python/mxnet/ndarray/contrib.py
index 5dcc54a..b663e58 100644
--- a/python/mxnet/ndarray/contrib.py
+++ b/python/mxnet/ndarray/contrib.py
@@ -437,8 +437,8 @@ def cond(pred, then_func, else_func):
     --------
     >>> a, b = mx.nd.array([1]), mx.nd.array([2])
     >>> pred = a * b < 5
-    >>> then_func = lambda a, b: (a + 5) * (b + 5)
-    >>> else_func = lambda a, b: (a - 5) * (b - 5)
+    >>> then_func = lambda: (a + 5) * (b + 5)
+    >>> else_func = lambda: (a - 5) * (b - 5)
     >>> outputs = mx.nd.contrib.cond(pred, then_func, else_func)
     >>> outputs[0]
     [42.]
diff --git a/src/engine/engine.cc b/src/engine/engine.cc
index 1c72f33..a33f0b2 100644
--- a/src/engine/engine.cc
+++ b/src/engine/engine.cc
@@ -48,7 +48,7 @@ inline Engine* CreateEngine() {
   ret = CreateNaiveEngine();
   #endif
 
-  if (ret ==nullptr) {
+  if (ret == nullptr) {
     LOG(FATAL) << "Cannot find Engine " << type;
   }
   if (!default_engine) {
diff --git a/src/engine/threaded_engine.h b/src/engine/threaded_engine.h
index a2c1a2b..ccfd09d 100644
--- a/src/engine/threaded_engine.h
+++ b/src/engine/threaded_engine.h
@@ -182,7 +182,7 @@ class ThreadedVar final
  private:
   // TODO(hotpxl) change this to spinlock for faster runtime
   // TODO(hotpxl) consider rename head
-  /*! \brief inetrnal mutex of the ThreadedVar */
+  /*! \brief internal mutex of the ThreadedVar */
   std::mutex mutex_;
   /*!
    * \brief number of pending reads operation in the variable.