From 1a8f36079813eee8e488205bbc80ea6b03c9dc8f Mon Sep 17 00:00:00 2001 From: agibsonccc Date: Sat, 27 Mar 2021 18:20:07 +0900 Subject: [PATCH] Ensure all stack traces are printed, fix 1 test failure --- .../TestObjectDetectionRecordReader.java | 2 ++ .../deeplearning4j-dataimport-solrj/pom.xml | 1 + .../deeplearning4j-modelexport-solr/pom.xml | 1 + .../ParagraphVectorsTest.java | 34 +++++++++++++++++-- .../nd4j-backend-impls/nd4j-cuda/pom.xml | 1 + nd4j/nd4j-backends/nd4j-backend-impls/pom.xml | 1 + nd4j/nd4j-backends/nd4j-tests/pom.xml | 1 + .../nd4j-parameter-server-node/pom.xml | 3 +- .../nd4j-parameter-server/pom.xml | 2 +- pom.xml | 3 +- 10 files changed, 44 insertions(+), 5 deletions(-) diff --git a/datavec/datavec-data/datavec-data-image/src/test/java/org/datavec/image/recordreader/TestObjectDetectionRecordReader.java b/datavec/datavec-data/datavec-data-image/src/test/java/org/datavec/image/recordreader/TestObjectDetectionRecordReader.java index d68c33c1c..8ab4f431a 100644 --- a/datavec/datavec-data/datavec-data-image/src/test/java/org/datavec/image/recordreader/TestObjectDetectionRecordReader.java +++ b/datavec/datavec-data/datavec-data-image/src/test/java/org/datavec/image/recordreader/TestObjectDetectionRecordReader.java @@ -59,6 +59,8 @@ import java.util.List; import static org.junit.jupiter.api.Assertions.*; @NativeTag @Tag(TagNames.FILE_IO) +@Tag(TagNames.LONG_TEST) +@Tag(TagNames.LARGE_RESOURCES) public class TestObjectDetectionRecordReader { diff --git a/deeplearning4j/deeplearning4j-dataimport-solrj/pom.xml b/deeplearning4j/deeplearning4j-dataimport-solrj/pom.xml index 25417853f..2abb61c15 100644 --- a/deeplearning4j/deeplearning4j-dataimport-solrj/pom.xml +++ b/deeplearning4j/deeplearning4j-dataimport-solrj/pom.xml @@ -47,6 +47,7 @@ ${cpu.core.count} false + false -Ddtype=float -Dfile.encoding=UTF-8 -Dtest.solr.allowed.securerandom=NativePRNG -Xmx${test.heap.size} -Dorg.bytedeco.javacpp.maxphysicalbytes=${test.offheap.size} -Dorg.bytedeco.javacpp.maxbytes=${test.offheap.size} diff --git a/deeplearning4j/deeplearning4j-modelexport-solr/pom.xml b/deeplearning4j/deeplearning4j-modelexport-solr/pom.xml index 0e63c8354..98052c3d7 100644 --- a/deeplearning4j/deeplearning4j-modelexport-solr/pom.xml +++ b/deeplearning4j/deeplearning4j-modelexport-solr/pom.xml @@ -41,6 +41,7 @@ org.apache.maven.plugins maven-surefire-plugin + false -Ddtype=float -Dfile.encoding=UTF-8 -Xmx${test.heap.size} -Dtest.solr.allowed.securerandom=NativePRNG diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/models/paragraphvectors/ParagraphVectorsTest.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/models/paragraphvectors/ParagraphVectorsTest.java index 5c015226d..1df454831 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/models/paragraphvectors/ParagraphVectorsTest.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/models/paragraphvectors/ParagraphVectorsTest.java @@ -111,6 +111,7 @@ public class ParagraphVectorsTest extends BaseDL4JTest { @ParameterizedTest @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs") @Tag(TagNames.LONG_TEST) + @Tag(TagNames.LARGE_RESOURCES) public void testParagraphVectorsVocabBuilding1() throws Exception { File file = Resources.asFile("/big/raw_sentences.txt"); SentenceIterator iter = new BasicLineIterator(file); //UimaSentenceIterator.createWithPath(file.getAbsolutePath()); @@ -160,6 +161,8 @@ public class ParagraphVectorsTest extends BaseDL4JTest { @Tag(TagNames.LONG_TEST) @ParameterizedTest @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs") + @Tag(TagNames.LONG_TEST) + @Tag(TagNames.LARGE_RESOURCES) public void testParagraphVectorsModelling1(Nd4jBackend backend) throws Exception { File file = Resources.asFile("/big/raw_sentences.txt"); SentenceIterator iter = new BasicLineIterator(file); @@ -288,7 +291,7 @@ public class ParagraphVectorsTest extends BaseDL4JTest { SerializationUtils.saveObject(vec, tempFile); - ParagraphVectors vec2 = (ParagraphVectors) SerializationUtils.readObject(tempFile); + ParagraphVectors vec2 = SerializationUtils.readObject(tempFile); INDArray day2 = vec2.getWordVectorMatrix("day").dup(); List labelsBinary = vec2.labelsSource.getLabels(); @@ -352,6 +355,8 @@ public class ParagraphVectorsTest extends BaseDL4JTest { @Test + @Tag(TagNames.LONG_TEST) + @Tag(TagNames.LARGE_RESOURCES) public void testParagraphVectorsDM() throws Exception { File file = Resources.asFile("/big/raw_sentences.txt"); SentenceIterator iter = new BasicLineIterator(file); @@ -416,6 +421,8 @@ public class ParagraphVectorsTest extends BaseDL4JTest { @Timeout(300000) + @Tag(TagNames.LONG_TEST) + @Tag(TagNames.LARGE_RESOURCES) public void testParagraphVectorsDBOW() throws Exception { skipUnlessIntegrationTests(); @@ -494,6 +501,8 @@ public class ParagraphVectorsTest extends BaseDL4JTest { @Test() @Timeout(300000) + @Tag(TagNames.LONG_TEST) + @Tag(TagNames.LARGE_RESOURCES) public void testParagraphVectorsWithWordVectorsModelling1() throws Exception { String backend = Nd4j.getExecutioner().getEnvironmentInformation().getProperty("backend"); if(!isIntegrationTests() && "CUDA".equalsIgnoreCase(backend)) { @@ -585,6 +594,8 @@ public class ParagraphVectorsTest extends BaseDL4JTest { * @throws Exception */ @Test + @Tag(TagNames.LONG_TEST) + @Tag(TagNames.LARGE_RESOURCES) public void testParagraphVectorsReducedLabels1(@TempDir Path testDir) throws Exception { val tempDir = testDir.toFile(); ClassPathResource resource = new ClassPathResource("/labeled"); @@ -636,6 +647,8 @@ public class ParagraphVectorsTest extends BaseDL4JTest { @Test() @Timeout(300000) + @Tag(TagNames.LONG_TEST) + @Tag(TagNames.LARGE_RESOURCES) public void testParallelIterator() throws IOException { TokenizerFactory factory = new DefaultTokenizerFactory(); SentenceIterator iterator = new BasicLineIterator(Resources.asFile("big/raw_sentences.txt")); @@ -659,6 +672,8 @@ public class ParagraphVectorsTest extends BaseDL4JTest { } @Test + @Tag(TagNames.LONG_TEST) + @Tag(TagNames.LARGE_RESOURCES) public void testIterator(@TempDir Path testDir) throws IOException { val folder_labeled = new File(testDir.toFile(),"labeled"); val folder_unlabeled = new File(testDir.toFile(),"unlabeled"); @@ -708,6 +723,8 @@ public class ParagraphVectorsTest extends BaseDL4JTest { there's no need in this test within travis, use it manually only for problems detection */ @Test + @Tag(TagNames.LONG_TEST) + @Tag(TagNames.LARGE_RESOURCES) public void testParagraphVectorsOverExistingWordVectorsModel(@TempDir Path testDir) throws Exception { String backend = Nd4j.getExecutioner().getEnvironmentInformation().getProperty("backend"); if(!isIntegrationTests() && "CUDA".equalsIgnoreCase(backend)) { @@ -854,6 +871,8 @@ public class ParagraphVectorsTest extends BaseDL4JTest { * Special test to check d2v inference against pre-trained gensim model and */ @Test + @Tag(TagNames.LONG_TEST) + @Tag(TagNames.LARGE_RESOURCES) public void testGensimEquality() throws Exception { INDArray expA = Nd4j.create(new double[] {-0.02461922, -0.00801059, -0.01821643, 0.0167951, 0.02240154, @@ -1003,6 +1022,8 @@ public class ParagraphVectorsTest extends BaseDL4JTest { } @Test + @Tag(TagNames.LONG_TEST) + @Tag(TagNames.LARGE_RESOURCES) public void testDirectInference(@TempDir Path testDir) throws Exception { boolean isIntegration = isIntegrationTests(); File resource = Resources.asFile("/big/raw_sentences.txt"); @@ -1036,6 +1057,8 @@ public class ParagraphVectorsTest extends BaseDL4JTest { } @Test + @Tag(TagNames.LONG_TEST) + @Tag(TagNames.LARGE_RESOURCES) public void testGoogleModelForInference() throws Exception { WordVectors googleVectors = WordVectorSerializer.readWord2VecModel(new File("/ext/GoogleNews-vectors-negative300.bin.gz")); @@ -1055,6 +1078,8 @@ public class ParagraphVectorsTest extends BaseDL4JTest { @Test() @Timeout(300000) + @Tag(TagNames.LONG_TEST) + @Tag(TagNames.LARGE_RESOURCES) public void testHash() { VocabWord w1 = new VocabWord(1.0, "D1"); VocabWord w2 = new VocabWord(1.0, "Bo"); @@ -1076,7 +1101,9 @@ public class ParagraphVectorsTest extends BaseDL4JTest { @Tag(TagNames.LONG_TEST) @ParameterizedTest @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs") - public void testsParallelFit1() throws Exception { + @Tag(TagNames.LONG_TEST) + @Tag(TagNames.LARGE_RESOURCES) + public void testsParallelFit1(Nd4jBackend backend) throws Exception { final File file = Resources.asFile("big/raw_sentences.txt"); for (int i = 0; i < 1000; i++) { @@ -1119,6 +1146,8 @@ public class ParagraphVectorsTest extends BaseDL4JTest { @Test() @Timeout(300000) + @Tag(TagNames.LONG_TEST) + @Tag(TagNames.LARGE_RESOURCES) public void testJSONSerialization() { ParagraphVectors paragraphVectors = new ParagraphVectors.Builder().build(); AbstractCache cache = new AbstractCache.Builder().build(); @@ -1160,6 +1189,7 @@ public class ParagraphVectorsTest extends BaseDL4JTest { @Test() @Timeout(300000) @Tag(TagNames.LONG_TEST) + @Tag(TagNames.LARGE_RESOURCES) public void testDoubleFit() throws Exception { boolean isIntegration = isIntegrationTests(); File resource = Resources.asFile("/big/raw_sentences.txt"); diff --git a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/pom.xml b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/pom.xml index a5410a8a2..c09413ebc 100644 --- a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/pom.xml +++ b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/pom.xml @@ -140,6 +140,7 @@ org.apache.maven.plugins maven-surefire-plugin + false ${cpu.core.count} false diff --git a/nd4j/nd4j-backends/nd4j-backend-impls/pom.xml b/nd4j/nd4j-backends/nd4j-backend-impls/pom.xml index 56ea2759a..19006b3e6 100644 --- a/nd4j/nd4j-backends/nd4j-backend-impls/pom.xml +++ b/nd4j/nd4j-backends/nd4j-backend-impls/pom.xml @@ -127,6 +127,7 @@ ${cpu.core.count} false + false 1 ${env.LD_LIBRARY_PATH}:${user.dir} diff --git a/nd4j/nd4j-backends/nd4j-tests/pom.xml b/nd4j/nd4j-backends/nd4j-tests/pom.xml index f6c0188ed..d4bb62542 100644 --- a/nd4j/nd4j-backends/nd4j-tests/pom.xml +++ b/nd4j/nd4j-backends/nd4j-tests/pom.xml @@ -232,6 +232,7 @@ ${cpu.core.count} false + false 1 diff --git a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/pom.xml b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/pom.xml index ca677ed0c..05009cf4b 100644 --- a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/pom.xml +++ b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/pom.xml @@ -109,6 +109,7 @@ ${cpu.core.count} false + false 1 @@ -146,7 +147,7 @@ ${cpu.core.count} false -Xmx${test.heap.size} -Dorg.bytedeco.javacpp.maxphysicalbytes=${test.offheap.size} -Dorg.bytedeco.javacpp.maxbytes=${test.offheap.size} - + false diff --git a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server/pom.xml b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server/pom.xml index 8ada3e8a5..a2ec230f0 100644 --- a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server/pom.xml +++ b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server/pom.xml @@ -107,7 +107,7 @@ **/*.java -Xmx${test.heap.size} -Dorg.bytedeco.javacpp.maxphysicalbytes=${test.offheap.size} -Dorg.bytedeco.javacpp.maxbytes=${test.offheap.size} - + false diff --git a/pom.xml b/pom.xml index 0c4e0decc..6b56ef736 100644 --- a/pom.xml +++ b/pom.xml @@ -474,6 +474,7 @@ + false ${cpu.core.count} false @@ -1197,7 +1198,7 @@ ${cpu.core.count} false - + false 1 true