fix some glitches

apache · Sep 14, 2018 · 82dfeb8 · 82dfeb8
1 parent 48b8160
commit 82dfeb8
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/scala-package/core/src/main/scala/org/apache/mxnet/optimizer/DCASGD.scala b/scala-package/core/src/main/scala/org/apache/mxnet/optimizer/DCASGD.scala
@@ -71,7 +71,7 @@ class DCASGD(val learningRate: Float = 0.01f, momentum: Float = 0.0f,
       mon *= this.momentum
       mon += monUpdated
     } else {
-      require(this.momentum == 0f, s"momentum should be 0, not ${this.momentum}")
+      require(this.momentum == 0, "momentum should be zero when state is provided")
       mon = monUpdated
     }
     previousWeight.set(weight)

diff --git a/scala-package/core/src/main/scala/org/apache/mxnet/optimizer/NAG.scala b/scala-package/core/src/main/scala/org/apache/mxnet/optimizer/NAG.scala
@@ -76,7 +76,7 @@ class NAG(val learningRate: Float = 0.01f, momentum: Float = 0.0f,
       resdGrad += momentum * mom
       weight += -lr * resdGrad
     } else {
-      require(momentum == 0f, s"momentum should be 0, not ${this.momentum}")
+      require(momentum == 0f, "momentum should be zero when state is provided")
       // adder = -lr * (resdGrad + this.wd * weight)
       // we write in this way to get rid of memory leak
       val adder = this.wd * weight

diff --git a/scala-package/core/src/main/scala/org/apache/mxnet/optimizer/SGD.scala b/scala-package/core/src/main/scala/org/apache/mxnet/optimizer/SGD.scala
@@ -73,7 +73,7 @@ class SGD(val learningRate: Float = 0.01f, momentum: Float = 0.0f,
       weight += mom
       adder.dispose()
     } else {
-      require(momentum == 0f, s"momentum should be 0, not ${this.momentum}")
+      require(momentum == 0f, "momentum should be zero when state is provided")
       // adder = -lr * (resdGrad + this.wd * weight)
       // we write in this way to get rid of memory leak
       val adder = this.wd * weight

diff --git a/scala-package/infer/src/main/scala/org/apache/mxnet/infer/MXNetHandler.scala b/scala-package/infer/src/main/scala/org/apache/mxnet/infer/MXNetHandler.scala
@@ -39,7 +39,7 @@ private[infer] object MXNetHandlerType extends Enumeration {
 private[infer] class MXNetThreadPoolHandler(numThreads: Int = 1)
   extends MXNetHandler {
 
-  require(numThreads > 0, s"numThreads should be a positive number, you passed $numThreads")
+  require(numThreads > 0, s"Invalid numThreads $numThreads")
 
   private val logger = LoggerFactory.getLogger(classOf[MXNetThreadPoolHandler])
   private var threadCount: Int = 0

diff --git a/scala-package/spark/src/main/scala/org/apache/mxnet/spark/MXNDArray.scala b/scala-package/spark/src/main/scala/org/apache/mxnet/spark/MXNDArray.scala
@@ -24,7 +24,7 @@ import org.apache.mxnet.NDArray
  * @author Yizhi Liu
  */
 class MXNDArray(@transient private var ndArray: NDArray) extends Serializable {
-  require(ndArray != null, "ndArray must be non-null")
+  require(ndArray != null, "Undefined ndArray")
   private val arrayBytes: Array[Byte] = ndArray.serialize()
 
   def get: NDArray = {