From 6e7a843d2d2c122b3708a621fdffabdacf459b99 Mon Sep 17 00:00:00 2001 From: agibsonccc Date: Fri, 26 Mar 2021 10:13:27 +0900 Subject: [PATCH] More large resource test tagging --- .../org/deeplearning4j/earlystopping/TestEarlyStopping.java | 2 ++ .../earlystopping/TestEarlyStoppingCompGraph.java | 2 ++ .../nn/layers/recurrent/RnnDataFormatTests.java | 2 ++ .../cuda/convolution/ConvDataFormatTests.java | 4 ++++ .../org/deeplearning4j/spark/TestEarlyStoppingSpark.java | 6 ++++++ .../spark/TestEarlyStoppingSparkCompGraph.java | 6 ++++++ 6 files changed, 22 insertions(+) diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/earlystopping/TestEarlyStopping.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/earlystopping/TestEarlyStopping.java index c9f03b902..8155b36ea 100644 --- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/earlystopping/TestEarlyStopping.java +++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/earlystopping/TestEarlyStopping.java @@ -87,6 +87,8 @@ import static org.junit.jupiter.api.Assertions.*; @Tag(TagNames.NDARRAY_ETL) @Tag(TagNames.TRAINING) @Tag(TagNames.DL4J_OLD_API) +@Tag(TagNames.LARGE_RESOURCES) +@Tag(TagNames.LONG_TEST) public class TestEarlyStopping extends BaseDL4JTest { diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/earlystopping/TestEarlyStoppingCompGraph.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/earlystopping/TestEarlyStoppingCompGraph.java index b04b3d62b..a70abd2fa 100644 --- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/earlystopping/TestEarlyStoppingCompGraph.java +++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/earlystopping/TestEarlyStoppingCompGraph.java @@ -75,6 +75,8 @@ import static org.junit.jupiter.api.Assertions.*; @Tag(TagNames.NDARRAY_ETL) @Tag(TagNames.TRAINING) @Tag(TagNames.DL4J_OLD_API) +@Tag(TagNames.LARGE_RESOURCES) +@Tag(TagNames.LONG_TEST) public class TestEarlyStoppingCompGraph extends BaseDL4JTest { @Override 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 669067628..5737988fc 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 @@ -155,6 +155,8 @@ public class RnnDataFormatTests extends BaseDL4JTest { @MethodSource("org.deeplearning4j.nn.layers.recurrent.RnnDataFormatTests#params") @ParameterizedTest + @Tag(TagNames.LARGE_RESOURCES) + @Tag(TagNames.LONG_TEST) public void testGraveLSTM(boolean helpers, boolean lastTimeStep, boolean maskZeros,Nd4jBackend backend) { diff --git a/deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/cuda/convolution/ConvDataFormatTests.java b/deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/cuda/convolution/ConvDataFormatTests.java index 4e226b280..38e22b988 100644 --- a/deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/cuda/convolution/ConvDataFormatTests.java +++ b/deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/cuda/convolution/ConvDataFormatTests.java @@ -38,12 +38,14 @@ import org.deeplearning4j.nn.gradient.Gradient; import org.deeplearning4j.nn.multilayer.MultiLayerNetwork; import org.deeplearning4j.nn.workspace.ArrayType; import org.deeplearning4j.nn.workspace.LayerWorkspaceMgr; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import org.nd4j.common.tests.tags.NativeTag; +import org.nd4j.common.tests.tags.TagNames; import org.nd4j.linalg.BaseNd4jTestWithBackends; import org.nd4j.linalg.activations.Activation; import org.nd4j.linalg.api.buffer.DataType; @@ -60,6 +62,8 @@ import java.util.stream.Stream; import static org.junit.jupiter.api.Assertions.assertEquals; @NativeTag +@Tag(TagNames.LARGE_RESOURCES) +@Tag(TagNames.LONG_TEST) public class ConvDataFormatTests extends BaseDL4JTest { diff --git a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/test/java/org/deeplearning4j/spark/TestEarlyStoppingSpark.java b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/test/java/org/deeplearning4j/spark/TestEarlyStoppingSpark.java index 9384558fa..e16bc135e 100644 --- a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/test/java/org/deeplearning4j/spark/TestEarlyStoppingSpark.java +++ b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/test/java/org/deeplearning4j/spark/TestEarlyStoppingSpark.java @@ -44,7 +44,9 @@ import org.deeplearning4j.optimize.listeners.ScoreIterationListener; import org.deeplearning4j.spark.earlystopping.SparkDataSetLossCalculator; import org.deeplearning4j.spark.earlystopping.SparkEarlyStoppingTrainer; import org.deeplearning4j.spark.impl.paramavg.ParameterAveragingTrainingMaster; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; +import org.nd4j.common.tests.tags.TagNames; import org.nd4j.linalg.activations.Activation; import org.nd4j.linalg.dataset.DataSet; import org.nd4j.linalg.factory.Nd4j; @@ -60,6 +62,10 @@ import java.util.concurrent.TimeUnit; import static org.junit.jupiter.api.Assertions.*; +@Tag(TagNames.LARGE_RESOURCES) +@Tag(TagNames.LONG_TEST) +@Tag(TagNames.DIST_SYSTEMS) +@Tag(TagNames.SPARK) public class TestEarlyStoppingSpark extends BaseSparkTest { @Test diff --git a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/test/java/org/deeplearning4j/spark/TestEarlyStoppingSparkCompGraph.java b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/test/java/org/deeplearning4j/spark/TestEarlyStoppingSparkCompGraph.java index 038e6e6ea..8dff45d31 100644 --- a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/test/java/org/deeplearning4j/spark/TestEarlyStoppingSparkCompGraph.java +++ b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/test/java/org/deeplearning4j/spark/TestEarlyStoppingSparkCompGraph.java @@ -46,7 +46,9 @@ import org.deeplearning4j.spark.earlystopping.SparkEarlyStoppingGraphTrainer; import org.deeplearning4j.spark.earlystopping.SparkLossCalculatorComputationGraph; import org.deeplearning4j.spark.impl.graph.dataset.DataSetToMultiDataSetFn; import org.deeplearning4j.spark.impl.paramavg.ParameterAveragingTrainingMaster; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; +import org.nd4j.common.tests.tags.TagNames; import org.nd4j.linalg.activations.Activation; import org.nd4j.linalg.dataset.DataSet; import org.nd4j.linalg.factory.Nd4j; @@ -62,6 +64,10 @@ import java.util.concurrent.TimeUnit; import static org.junit.jupiter.api.Assertions.*; +@Tag(TagNames.LARGE_RESOURCES) +@Tag(TagNames.LONG_TEST) +@Tag(TagNames.DIST_SYSTEMS) +@Tag(TagNames.SPARK) public class TestEarlyStoppingSparkCompGraph extends BaseSparkTest {