From 838c3ddb5a30891044d671c03c1eabba7b2f2f0c Mon Sep 17 00:00:00 2001 From: Alex Black Date: Tue, 24 Mar 2020 12:05:17 +1100 Subject: [PATCH] Timeouts and temp ignore for logged issue - #8802 (#342) Signed-off-by: Alex Black --- .../java/org/deeplearning4j/AssertTestsExtendBaseClass.java | 5 +++++ .../src/test/java/org/nd4j/AssertTestsExtendBaseClass.java | 5 +++++ .../org/nd4j/autodiff/samediff/SameDiffMultiThreadTests.java | 2 ++ 3 files changed, 12 insertions(+) diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/AssertTestsExtendBaseClass.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/AssertTestsExtendBaseClass.java index 20d2967bb..5f0567094 100644 --- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/AssertTestsExtendBaseClass.java +++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/AssertTestsExtendBaseClass.java @@ -37,6 +37,11 @@ import static org.junit.Assert.assertEquals; @Slf4j public class AssertTestsExtendBaseClass extends BaseDL4JTest { + @Override + public long getTimeoutMilliseconds() { + return 240000L; + } + //Set of classes that are exclusions to the rule (either run manually or have their own logging + timeouts) private static final Set> exclusions = new HashSet<>(); diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/AssertTestsExtendBaseClass.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/AssertTestsExtendBaseClass.java index 5d8a70725..658a63579 100644 --- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/AssertTestsExtendBaseClass.java +++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/AssertTestsExtendBaseClass.java @@ -42,6 +42,11 @@ import static org.junit.Assert.assertEquals; @Slf4j public class AssertTestsExtendBaseClass extends BaseND4JTest { + @Override + public long getTimeoutMilliseconds() { + return 240000L; + } + //Set of classes that are exclusions to the rule (either run manually or have their own logging + timeouts) private static final Set> exclusions = new HashSet<>(Arrays.asList( TFGraphTestAllSameDiff.class, diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/samediff/SameDiffMultiThreadTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/samediff/SameDiffMultiThreadTests.java index 7addd5098..004aac209 100644 --- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/samediff/SameDiffMultiThreadTests.java +++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/samediff/SameDiffMultiThreadTests.java @@ -1,6 +1,7 @@ package org.nd4j.autodiff.samediff; import lombok.extern.slf4j.Slf4j; +import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; @@ -82,6 +83,7 @@ public class SameDiffMultiThreadTests extends BaseND4JTest { } @Test + @Ignore //2020/03/24 AB - https://github.com/eclipse/deeplearning4j/issues/8802 public void testMobilenet() throws Exception { TFGraphTestZooModels.currentTestDir = testDir.newFolder(); File f = Resources.asFile("tf_graphs/zoo_models/mobilenet_v2_1.0_224/tf_model.txt");