diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/validation/OpValidation.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/validation/OpValidation.java index 194ce484c..71d7dfba3 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/validation/OpValidation.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/validation/OpValidation.java @@ -521,6 +521,12 @@ public class OpValidation { currCount++; opsWithTFMappingTFImportCounts.put(d.getClass(), currCount); + currCount = fwdPassCoverageCountPerClass.get(d.getClass()); + if(currCount == null) + currCount = 0; + currCount++; + fwdPassCoverageCountPerClass.put(d.getClass(), currCount); + for(String s : tfNames){ currCount = tfMappedOpsImportTestCounts.get(s); if(currCount == null) diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/opvalidation/ReductionOpValidation.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/opvalidation/ReductionOpValidation.java index c34cde408..b36fba903 100644 --- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/opvalidation/ReductionOpValidation.java +++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/opvalidation/ReductionOpValidation.java @@ -827,7 +827,7 @@ public class ReductionOpValidation extends BaseOpValidation { int[] d = dims.get(t); for (int i = 0; i < 7; i++) { - int[] dim = d.length == 0 ? null : d; + int[] dim = d.length == 0 ? new int[0] : d; SameDiff sd = SameDiff.create(); SDVariable s = sd.var("in", in); diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/imports/TFGraphs/TFGraphTestAllSameDiff.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/imports/TFGraphs/TFGraphTestAllSameDiff.java index b5f3ec4ae..4f3520d31 100644 --- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/imports/TFGraphs/TFGraphTestAllSameDiff.java +++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/imports/TFGraphs/TFGraphTestAllSameDiff.java @@ -109,9 +109,9 @@ public class TFGraphTestAllSameDiff { //Note: Can't extend BaseNd4jTest here a //2019/06/22 - Known issue: https://github.com/eclipse/deeplearning4j/issues/7935 "fake_quant/min_max_vars/.*", "fake_quant/min_max_args/.*", - + //2019/07/09 - Need "Multinomial" op - https://github.com/eclipse/deeplearning4j/issues/7913 - "multinormal/.*" + "multinomial/.*" }; @BeforeClass