Merge commit '0b1da23915d25d9a26b0658c88a133a99aaf44df' into v9

Atry · Atry · commit 79382e277d01 · 2016-11-29T11:23:07.000+08:00
diff --git a/sbt-nd4j/build.sbt b/sbt-nd4j/build.sbt
@@ -10,7 +10,7 @@ publishArtifact := {
   }
 }
 
-skip := {
+skip in compile := {
   if (scalaBinaryVersion.value == "2.10") {
     false
   } else {
diff --git a/sbt-nd4j/src/main/scala-2.10/com/thoughtworks/deeplearning/SbtNd4J.scala b/sbt-nd4j/src/main/scala-2.10/com/thoughtworks/deeplearning/SbtNd4J.scala
diff --git a/src/test/scala/com/thoughtworks/deeplearning/XorSpec.scala b/src/test/scala/com/thoughtworks/deeplearning/XorSpec.scala
@@ -251,7 +251,7 @@ ${left11.value}^${right11.value}=${result11.value}
   }
 
   "xor" in {
-    for (i <- 0 until 300) {
+    for (i <- 0 until 500) {
 //      predictAndPrint()
       trainNetwork.train(makeTrainingData())
     }

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ publishArtifact := {`
`10`	`10`	`}`
`11`	`11`	`}`
`12`	`12`
`13`		`-skip := {`
	`13`	`+skip in compile := {`
`14`	`14`	`if (scalaBinaryVersion.value == "2.10") {`
`15`	`15`	`false`
`16`	`16`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -251,7 +251,7 @@ ${left11.value}^${right11.value}=${result11.value}`
`251`	`251`	`}`
`252`	`252`
`253`	`253`	`"xor" in {`
`254`		`- for (i <- 0 until 300) {`
	`254`	`+ for (i <- 0 until 500) {`
`255`	`255`	`// predictAndPrint()`
`256`	`256`	`trainNetwork.train(makeTrainingData())`
`257`	`257`	`}`