From 4f4939534a76c20af7cf06dd53be75f32be776e6 Mon Sep 17 00:00:00 2001 From: agibsonccc Date: Fri, 26 Mar 2021 11:15:26 +0900 Subject: [PATCH] More test tagging --- .github/workflows/run-cpu-integration-tests-self-hosted.yml | 2 +- .../deeplearning4j/nn/graph/TestComputationGraphNetwork.java | 2 ++ .../java/org/deeplearning4j/nn/layers/DropoutLayerTest.java | 2 ++ .../nn/layers/recurrent/RnnDataFormatTests.java | 2 ++ .../org/deeplearning4j/nn/weights/LegacyWeightInitTest.java | 2 ++ .../cuda/gradientcheck/CNNGradientCheckTest.java | 4 ++++ 6 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.github/workflows/run-cpu-integration-tests-self-hosted.yml b/.github/workflows/run-cpu-integration-tests-self-hosted.yml index 2ccb3249f..8da788ee3 100644 --- a/.github/workflows/run-cpu-integration-tests-self-hosted.yml +++ b/.github/workflows/run-cpu-integration-tests-self-hosted.yml @@ -22,6 +22,6 @@ jobs: cmake --version protoc --version export OMP_NUM_THREADS=1 - mvn -DexcludedGroups="long-running-tests,large-resources, distributed-systems" -DskipTestResourceEnforcement=true -Ptestresources -Pintegration-tests -Pnd4j-tests-cpu clean test + mvn -DexcludedGroups="long-running-tests,large-resources, distributed-systems" -DskipTestResourceEnforcement=true -Ptestresources -Pintegration-tests -Pnd4j-tests-cpu clean test -rf :deeplearning4j-core mvn -Dgroups="long-running-tests, large-resources, distributed-systems" -Ptestresources -Pnd4j-tests-cpu -Dtest.offheap.size=14g -Dtest.heap.size=6g -Dsurefire.parallel.forcedTimeout=200 0Dsurefire.parallel.timeout=200 -Dsurefire.timeout=200 -Dsurefire.exitTimeout=200 test diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/graph/TestComputationGraphNetwork.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/graph/TestComputationGraphNetwork.java index ec0ac41d5..ed16e0abf 100644 --- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/graph/TestComputationGraphNetwork.java +++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/graph/TestComputationGraphNetwork.java @@ -327,6 +327,8 @@ public class TestComputationGraphNetwork extends BaseDL4JTest { @Test() @Timeout(300000) + @Tag(TagNames.LARGE_RESOURCES) + @Tag(TagNames.LONG_TEST) public void testIrisFitMultiDataSetIterator() throws Exception { RecordReader rr = new CSVRecordReader(0, ','); diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/DropoutLayerTest.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/DropoutLayerTest.java index 14ae31f6a..14f9c7447 100644 --- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/DropoutLayerTest.java +++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/DropoutLayerTest.java @@ -81,6 +81,8 @@ class DropoutLayerTest extends BaseDL4JTest { @Test @DisplayName("Test Dropout Layer Without Training") + @Tag(TagNames.LARGE_RESOURCES) + @Tag(TagNames.LONG_TEST) void testDropoutLayerWithoutTraining() throws Exception { MultiLayerConfiguration confIntegrated = new NeuralNetConfiguration.Builder().seed(3648).list().layer(0, new ConvolutionLayer.Builder(1, 1).stride(1, 1).nIn(1).nOut(1).dropOut(0.25).activation(Activation.IDENTITY).weightInit(WeightInit.XAVIER).build()).layer(1, new OutputLayer.Builder(LossFunctions.LossFunction.MCXENT).activation(Activation.SOFTMAX).weightInit(WeightInit.XAVIER).dropOut(0.25).nOut(4).build()).setInputType(InputType.convolutionalFlat(2, 2, 1)).build(); MultiLayerNetwork netIntegrated = new MultiLayerNetwork(confIntegrated); diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/recurrent/RnnDataFormatTests.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/recurrent/RnnDataFormatTests.java index 5737988fc..01c76aecc 100644 --- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/recurrent/RnnDataFormatTests.java +++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/recurrent/RnnDataFormatTests.java @@ -65,6 +65,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals; @AllArgsConstructor @NativeTag @Tag(TagNames.DL4J_OLD_API) +@Tag(TagNames.LONG_TEST) +@Tag(TagNames.LARGE_RESOURCES) public class RnnDataFormatTests extends BaseDL4JTest { diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/weights/LegacyWeightInitTest.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/weights/LegacyWeightInitTest.java index 41ae2eda2..968985bac 100644 --- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/weights/LegacyWeightInitTest.java +++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/weights/LegacyWeightInitTest.java @@ -153,6 +153,8 @@ class LegacyWeightInitTest extends BaseDL4JTest { */ @Test @DisplayName("Serialize Deserialize Distribution Json") + @Disabled("") + @Tag(TagNames.NEEDS_VERIFY) void serializeDeserializeDistributionJson() throws IOException { // To make identity happy final long[] shape = { 3, 7 }; diff --git a/deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/cuda/gradientcheck/CNNGradientCheckTest.java b/deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/cuda/gradientcheck/CNNGradientCheckTest.java index caac883d3..46355b74e 100644 --- a/deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/cuda/gradientcheck/CNNGradientCheckTest.java +++ b/deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/cuda/gradientcheck/CNNGradientCheckTest.java @@ -39,6 +39,7 @@ import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.nd4j.common.tests.tags.NativeTag; +import org.nd4j.common.tests.tags.TagNames; import org.nd4j.linalg.activations.Activation; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; @@ -58,6 +59,8 @@ import org.junit.jupiter.api.extension.ExtendWith; */ @NativeTag @DisplayName("Cnn Gradient Check Test") +@Tag(TagNames.LARGE_RESOURCES) +@Tag(TagNames.LONG_TEST) class CNNGradientCheckTest extends BaseDL4JTest { private static final boolean PRINT_RESULTS = true; @@ -81,6 +84,7 @@ class CNNGradientCheckTest extends BaseDL4JTest { @Test @DisplayName("Test Gradient CNNMLN") + void testGradientCNNMLN() { // Parameterized test, testing combinations of: // (a) activation function