Brutex
/
cavis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ND4S test fix (#210) 

Signed-off-by: AlexDBlack <blacka101@gmail.com>
master
Alex Black 2019-08-31 12:27:09 +10:00 committed by GitHub
parent 00fd50cee2
commit 12d14efcf2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
nd4s/pom.xml
View File

@ -294,7 +294,7 @@
<profiles> <profiles>
<profile> <profile>
<id>nd4j-tests-cpu</id> <id>test-nd4j-native</id>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.nd4j</groupId> <groupId>org.nd4j</groupId>
@ -302,11 +302,17 @@
<version>${project.version}</version> <version>${project.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.deeplearning4j</groupId>
<artifactId>dl4j-test-resources</artifactId>
<version>${dl4j-test-resources.version}</version>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
</profile> </profile>
<profile> <profile>
<id>nd4j-tests-cuda</id> <id>test-nd4j-cuda-10.1</id>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.nd4j</groupId> <groupId>org.nd4j</groupId>
@ -314,6 +320,12 @@
<version>${project.version}</version> <version>${project.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.deeplearning4j</groupId>
<artifactId>dl4j-test-resources</artifactId>
<version>${dl4j-test-resources.version}</version>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
</profile> </profile>
</profiles> </profiles>

4
nd4s/src/main/scala/org/nd4s/CollectionLikeNDArray.scala
View File

@ -64,7 +64,7 @@ trait CollectionLikeNDArray[A <: INDArray] {
val lv = ev.linearView(underlying) val lv = ev.linearView(underlying)
breakable { breakable {
for { for {
i <- 0 until lv.length().toInt i <- 0 until lv.length().toInt
} if (!f(ev.get(lv, i))) { } if (!f(ev.get(lv, i))) {
result = true result = true
break() break()
@ -80,7 +80,7 @@ trait CollectionLikeNDArray[A <: INDArray] {
val lv = ev.linearView(underlying) val lv = ev.linearView(underlying)
breakable { breakable {
for { for {
i <- 0 until lv.length().toInt i <- 0 until lv.length().toInt
} if (!f(ev.get(lv, i))) { } if (!f(ev.get(lv, i))) {
result = false result = false
break() break()

2
nd4s/src/test/scala/org/nd4s/samediff/SameDiffTest.scala
View File

@ -4,7 +4,7 @@ import java.lang.reflect.Field
import java.util import java.util
import java.util.{ Arrays, Collections, HashMap, List, Map } import java.util.{ Arrays, Collections, HashMap, List, Map }
import com.google.common.collect.{ Lists, Maps } import org.nd4j.shade.guava.collect.{ Lists, Maps }
import org.junit.Assert._ import org.junit.Assert._
import org.junit.Assume.assumeNotNull import org.junit.Assume.assumeNotNull
import org.nd4j.autodiff.samediff._ import org.nd4j.autodiff.samediff._