diff --git a/arbiter/arbiter-core/pom.xml b/arbiter/arbiter-core/pom.xml index 5d06744d3..296af48fd 100644 --- a/arbiter/arbiter-core/pom.xml +++ b/arbiter/arbiter-core/pom.xml @@ -80,4 +80,13 @@ ${nd4j.version} + + + + test-nd4j-native + + + test-nd4j-cuda-10.1 + + diff --git a/arbiter/arbiter-deeplearning4j/pom.xml b/arbiter/arbiter-deeplearning4j/pom.xml index 86fe15d18..77f7e34a9 100644 --- a/arbiter/arbiter-deeplearning4j/pom.xml +++ b/arbiter/arbiter-deeplearning4j/pom.xml @@ -61,27 +61,10 @@ - nd4j-tests-cpu - - - org.nd4j - nd4j-native - ${project.version} - test - - + test-nd4j-native - - nd4j-tests-cuda - - - org.nd4j - nd4j-cuda-10.1 - ${project.version} - test - - + test-nd4j-cuda-10.1 diff --git a/arbiter/arbiter-server/pom.xml b/arbiter/arbiter-server/pom.xml index e3a6738ac..5d14fa6a0 100644 --- a/arbiter/arbiter-server/pom.xml +++ b/arbiter/arbiter-server/pom.xml @@ -53,27 +53,10 @@ - nd4j-tests-cpu - - - org.nd4j - nd4j-native - ${project.version} - test - - + test-nd4j-native - - nd4j-tests-cuda - - - org.nd4j - nd4j-cuda-10.1 - ${project.version} - test - - + test-nd4j-cuda-10.1 diff --git a/arbiter/arbiter-ui/pom.xml b/arbiter/arbiter-ui/pom.xml index 084ad3151..93e955219 100644 --- a/arbiter/arbiter-ui/pom.xml +++ b/arbiter/arbiter-ui/pom.xml @@ -99,27 +99,10 @@ - nd4j-tests-cpu - - - org.nd4j - nd4j-native - ${project.version} - test - - + test-nd4j-native - - nd4j-tests-cuda - - - org.nd4j - nd4j-cuda-10.1 - ${project.version} - test - - + test-nd4j-cuda-10.1 @@ -236,5 +219,4 @@ - diff --git a/arbiter/pom.xml b/arbiter/pom.xml index f4380c58c..5f660c646 100644 --- a/arbiter/pom.xml +++ b/arbiter/pom.xml @@ -136,6 +136,31 @@ + + org.apache.maven.plugins + maven-enforcer-plugin + ${maven-enforcer-plugin.version} + + + test + enforce-test-resources + + enforce + + + ${skipTestResourceEnforcement} + + + test-nd4j-native,test-nd4j-cuda-10.1 + false + + + true + + + + + maven-javadoc-plugin ${maven-javadoc-plugin.version} @@ -287,4 +312,42 @@ + + + + test-nd4j-native + + + org.nd4j + nd4j-native + ${nd4j.version} + test + + + org.deeplearning4j + dl4j-test-resources + ${nd4j.version} + test + + + + + + test-nd4j-cuda-10.1 + + + org.nd4j + nd4j-cuda-10.1 + ${nd4j.version} + test + + + org.deeplearning4j + dl4j-test-resources + ${nd4j.version} + test + + + + diff --git a/datavec/datavec-api/pom.xml b/datavec/datavec-api/pom.xml index 412be6e81..022f2e38b 100644 --- a/datavec/datavec-api/pom.xml +++ b/datavec/datavec-api/pom.xml @@ -119,27 +119,10 @@ - nd4j-tests-cpu - - - org.nd4j - nd4j-native - ${project.version} - test - - + test-nd4j-native - - nd4j-tests-cuda - - - org.nd4j - nd4j-cuda-10.1 - ${project.version} - test - - + test-nd4j-cuda-10.1 diff --git a/datavec/datavec-arrow/pom.xml b/datavec/datavec-arrow/pom.xml index f86e7f3f2..4d4381790 100644 --- a/datavec/datavec-arrow/pom.xml +++ b/datavec/datavec-arrow/pom.xml @@ -98,27 +98,10 @@ - nd4j-tests-cpu - - - org.nd4j - nd4j-native - ${project.version} - test - - + test-nd4j-native - - nd4j-tests-cuda - - - org.nd4j - nd4j-cuda-10.1 - ${project.version} - test - - + test-nd4j-cuda-10.1 diff --git a/datavec/datavec-data/datavec-data-codec/pom.xml b/datavec/datavec-data/datavec-data-codec/pom.xml index e94887b40..2a65cb41a 100644 --- a/datavec/datavec-data/datavec-data-codec/pom.xml +++ b/datavec/datavec-data/datavec-data-codec/pom.xml @@ -56,27 +56,10 @@ - nd4j-tests-cpu - - - org.nd4j - nd4j-native - ${project.version} - test - - + test-nd4j-native - - nd4j-tests-cuda - - - org.nd4j - nd4j-cuda-10.1 - ${project.version} - test - - + test-nd4j-cuda-10.1 diff --git a/datavec/datavec-data/datavec-data-image/pom.xml b/datavec/datavec-data/datavec-data-image/pom.xml index 326102ed1..b97c9d5c6 100644 --- a/datavec/datavec-data/datavec-data-image/pom.xml +++ b/datavec/datavec-data/datavec-data-image/pom.xml @@ -123,27 +123,10 @@ - nd4j-tests-cpu - - - org.nd4j - nd4j-native - ${project.version} - test - - + test-nd4j-native - - nd4j-tests-cuda - - - org.nd4j - nd4j-cuda-10.1 - ${project.version} - test - - + test-nd4j-cuda-10.1 diff --git a/datavec/datavec-data/datavec-data-nlp/pom.xml b/datavec/datavec-data/datavec-data-nlp/pom.xml index b76660975..17ad11211 100644 --- a/datavec/datavec-data/datavec-data-nlp/pom.xml +++ b/datavec/datavec-data/datavec-data-nlp/pom.xml @@ -84,27 +84,10 @@ - nd4j-tests-cpu - - - org.nd4j - nd4j-native - ${project.version} - test - - + test-nd4j-native - - nd4j-tests-cuda - - - org.nd4j - nd4j-cuda-10.1 - ${project.version} - test - - + test-nd4j-cuda-10.1 diff --git a/datavec/datavec-hadoop/pom.xml b/datavec/datavec-hadoop/pom.xml index cf79113a5..38889228c 100644 --- a/datavec/datavec-hadoop/pom.xml +++ b/datavec/datavec-hadoop/pom.xml @@ -99,27 +99,10 @@ - nd4j-tests-cpu - - - org.nd4j - nd4j-native - ${project.version} - test - - + test-nd4j-native - - nd4j-tests-cuda - - - org.nd4j - nd4j-cuda-10.1 - ${project.version} - test - - + test-nd4j-cuda-10.1 diff --git a/datavec/datavec-local/pom.xml b/datavec/datavec-local/pom.xml index 840e9bd9c..f286eeb95 100644 --- a/datavec/datavec-local/pom.xml +++ b/datavec/datavec-local/pom.xml @@ -120,27 +120,10 @@ - nd4j-tests-cpu - - - org.nd4j - nd4j-native - ${project.version} - test - - + test-nd4j-native - - nd4j-tests-cuda - - - org.nd4j - nd4j-cuda-10.1 - ${project.version} - test - - + test-nd4j-cuda-10.1 diff --git a/datavec/datavec-perf/pom.xml b/datavec/datavec-perf/pom.xml index 703386f9e..fb4eaaa89 100644 --- a/datavec/datavec-perf/pom.xml +++ b/datavec/datavec-perf/pom.xml @@ -61,27 +61,10 @@ - nd4j-tests-cpu - - - org.nd4j - nd4j-native - ${project.version} - test - - + test-nd4j-native - - nd4j-tests-cuda - - - org.nd4j - nd4j-cuda-10.1 - ${project.version} - test - - + test-nd4j-cuda-10.1 diff --git a/datavec/datavec-python/pom.xml b/datavec/datavec-python/pom.xml index ed8af9e85..e60bc9219 100644 --- a/datavec/datavec-python/pom.xml +++ b/datavec/datavec-python/pom.xml @@ -62,27 +62,10 @@ - nd4j-tests-cpu - - - org.nd4j - nd4j-native - ${project.version} - test - - + test-nd4j-native - - nd4j-tests-cuda - - - org.nd4j - nd4j-cuda-10.1 - ${project.version} - test - - + test-nd4j-cuda-10.1 diff --git a/datavec/datavec-spark-inference-parent/datavec-spark-inference-client/pom.xml b/datavec/datavec-spark-inference-parent/datavec-spark-inference-client/pom.xml index 83fc78c6f..db110703b 100644 --- a/datavec/datavec-spark-inference-parent/datavec-spark-inference-client/pom.xml +++ b/datavec/datavec-spark-inference-parent/datavec-spark-inference-client/pom.xml @@ -75,27 +75,10 @@ - nd4j-tests-cpu - - - org.nd4j - nd4j-native - ${project.version} - test - - + test-nd4j-native - - nd4j-tests-cuda - - - org.nd4j - nd4j-cuda-10.1 - ${project.version} - test - - + test-nd4j-cuda-10.1 diff --git a/datavec/datavec-spark-inference-parent/datavec-spark-inference-model/pom.xml b/datavec/datavec-spark-inference-parent/datavec-spark-inference-model/pom.xml index aed3601b0..ade8acd14 100644 --- a/datavec/datavec-spark-inference-parent/datavec-spark-inference-model/pom.xml +++ b/datavec/datavec-spark-inference-parent/datavec-spark-inference-model/pom.xml @@ -49,27 +49,10 @@ - nd4j-tests-cpu - - - org.nd4j - nd4j-native - ${project.version} - test - - + test-nd4j-native - - nd4j-tests-cuda - - - org.nd4j - nd4j-cuda-10.1 - ${project.version} - test - - + test-nd4j-cuda-10.1 diff --git a/datavec/datavec-spark-inference-parent/datavec-spark-inference-server/pom.xml b/datavec/datavec-spark-inference-parent/datavec-spark-inference-server/pom.xml index d6993afdf..940ad01cc 100644 --- a/datavec/datavec-spark-inference-parent/datavec-spark-inference-server/pom.xml +++ b/datavec/datavec-spark-inference-parent/datavec-spark-inference-server/pom.xml @@ -198,27 +198,10 @@ - nd4j-tests-cpu - - - org.nd4j - nd4j-native - ${project.version} - test - - + test-nd4j-native - - nd4j-tests-cuda - - - org.nd4j - nd4j-cuda-10.1 - ${project.version} - test - - + test-nd4j-cuda-10.1 diff --git a/datavec/datavec-spark/pom.xml b/datavec/datavec-spark/pom.xml index 36c782bea..d98730407 100644 --- a/datavec/datavec-spark/pom.xml +++ b/datavec/datavec-spark/pom.xml @@ -307,27 +307,10 @@ - nd4j-tests-cpu - - - org.nd4j - nd4j-native - ${project.version} - test - - + test-nd4j-native - - nd4j-tests-cuda - - - org.nd4j - nd4j-cuda-10.1 - ${project.version} - test - - + test-nd4j-cuda-10.1 diff --git a/datavec/pom.xml b/datavec/pom.xml index 62c722ace..a8d141516 100644 --- a/datavec/pom.xml +++ b/datavec/pom.xml @@ -330,50 +330,56 @@ + + + + maven-surefire-report-plugin + ${maven-surefire-plugin.version} + + + + org.codehaus.mojo + cobertura-maven-plugin + 2.7 + + + + - test-nd4j-native - - false - - - org.deeplearning4j - dl4j-test-resources - ${dl4j-test-resources.version} - test - org.nd4j nd4j-native ${nd4j.version} test - - - - - test-nd4j-cuda-10.1 - - false - - org.deeplearning4j dl4j-test-resources - ${dl4j-test-resources.version} + ${nd4j.version} test + + + + + test-nd4j-cuda-10.1 + org.nd4j nd4j-cuda-10.1 ${nd4j.version} test + + org.deeplearning4j + dl4j-test-resources + ${nd4j.version} + test + -