From 88ea9a49ebc7971216fcafe589a79f9ec5b82769 Mon Sep 17 00:00:00 2001 From: Alex Black Date: Sat, 6 Jul 2019 14:33:14 +1000 Subject: [PATCH] TF optional properties resolution fix (#48) Signed-off-by: AlexDBlack --- .../org/nd4j/autodiff/functions/DifferentialFunction.java | 2 ++ .../org/nd4j/imports/TFGraphs/TFGraphTestZooModels.java | 6 ------ 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/functions/DifferentialFunction.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/functions/DifferentialFunction.java index 7c7c40ccc..46cbb1523 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/functions/DifferentialFunction.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/functions/DifferentialFunction.java @@ -550,6 +550,8 @@ public abstract class DifferentialFunction { continue; val var = sameDiff.getVarNameForFieldAndFunction(this,property); + if(var == null) + continue; //Rarely (like Conv2D) properties will be optional. For example kH/kW args will be inferred from weight shape val fieldType = fields.get(property); val varArr = sameDiff.getArrForVarName(var); //already defined diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/imports/TFGraphs/TFGraphTestZooModels.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/imports/TFGraphs/TFGraphTestZooModels.java index 9668ddd84..1e944c544 100644 --- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/imports/TFGraphs/TFGraphTestZooModels.java +++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/imports/TFGraphs/TFGraphTestZooModels.java @@ -30,12 +30,10 @@ import org.junit.runners.Parameterized; import org.nd4j.OpValidationSuite; import org.nd4j.autodiff.samediff.SameDiff; import org.nd4j.base.Preconditions; -import org.nd4j.linalg.BaseNd4jTest; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.executioner.OpExecutioner; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.factory.Nd4jBackend; import org.nd4j.linalg.function.BiFunction; import org.nd4j.resources.Downloader; import org.nd4j.util.ArchiveUtils; @@ -62,10 +60,6 @@ public class TFGraphTestZooModels { //Note: Can't extend BaseNd4jTest here as we //2019/06/28 - Output incorrect, can't debug b/c https://github.com/eclipse/deeplearning4j/issues/7957 "cifar10_gan_85", - //2019/07/03 - java.lang.NullPointerException: varName is marked @NonNull but is null - // https://github.com/eclipse/deeplearning4j/issues/7975 - "alexnet", - //2019/07/03 - Out of Memory error "compression_residual_gru",