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

Small SameDiff execution fix (#168) 

* SameDiff exec: Fix for switch op when predicate is constant, and op is inside loop

Signed-off-by: AlexDBlack <blacka101@gmail.com>

* Update ignores for failing zoo models

Signed-off-by: AlexDBlack <blacka101@gmail.com>
master
Alex Black 2020-01-08 23:57:23 +11:00 committed by GitHub
parent 2404be5fe0
commit c84307a6fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/internal/InferenceSession.java
View File

@ -364,6 +364,11 @@ public class InferenceSession extends AbstractSession<INDArray, SameDiffOp> {
String[] argNames = s.argNames(); //Order: input, boolean array String[] argNames = s.argNames(); //Order: input, boolean array
VarId vidPredicate = outputFrameIter.toVarId(argNames[1]); VarId vidPredicate = outputFrameIter.toVarId(argNames[1]);
INDArray predicate = this.nodeOutputs.get(vidPredicate); INDArray predicate = this.nodeOutputs.get(vidPredicate);
if(predicate == null && !constAndPhInputs.isEmpty() && constAndPhInputs.contains(argNames[1])){
//Constant predicate...
predicate = this.nodeOutputs.get(new VarId(argNames[1], OUTER_FRAME, 0, null));
}
Preconditions.checkNotNull(predicate, "Error during graph execution: Predicate array was null. VarId=%s", vidPredicate);
Preconditions.checkState(predicate.isScalar() && predicate.dataType() == DataType.BOOL, "Expected boolean predicate: got %ndSInfo", predicate); Preconditions.checkState(predicate.isScalar() && predicate.dataType() == DataType.BOOL, "Expected boolean predicate: got %ndSInfo", predicate);
VarId vid = outputFrameIter.toVarId(argNames[0]); VarId vid = outputFrameIter.toVarId(argNames[0]);
if (predicate.getDouble(0) == 0.0) { if (predicate.getDouble(0) == 0.0) {

6
nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/imports/TFGraphs/TFGraphTestZooModels.java
View File

@ -69,13 +69,9 @@ public class TFGraphTestZooModels { //Note: Can't extend BaseNd4jTest here as we
// Missing Multinormal op, see https://github.com/eclipse/deeplearning4j/issues/7913 // Missing Multinormal op, see https://github.com/eclipse/deeplearning4j/issues/7913
"gpt-2_117M", "gpt-2_117M",
//2019/12/24 - https://github.com/eclipse/deeplearning4j/issues/8572 //AB 2020/01/08, all 3 - https://github.com/eclipse/deeplearning4j/issues/8603
"ssd_mobilenet_v1_0.75_depth_300x300_coco14_sync_2018_07_03", "ssd_mobilenet_v1_0.75_depth_300x300_coco14_sync_2018_07_03",
//2019/12/24 - https://github.com/eclipse/deeplearning4j/issues/8572
"ssd_mobilenet_v1_coco_2018_01_28", "ssd_mobilenet_v1_coco_2018_01_28",
//2019/12/24 - https://github.com/eclipse/deeplearning4j/issues/8572
"faster_rcnn_resnet101_coco_2018_01_28", "faster_rcnn_resnet101_coco_2018_01_28",
//2019/06/24 - JVM crash on linux-x86_64-cpu-avx2 and -avx512 CI machines only - runs fine elsewhere //2019/06/24 - JVM crash on linux-x86_64-cpu-avx2 and -avx512 CI machines only - runs fine elsewhere