From 0463ee4eba7f5d49d0365d793bd6c4e1df83753d Mon Sep 17 00:00:00 2001
From: Serhii Shepel <9946053+sshepel@users.noreply.github.com>
Date: Thu, 29 Aug 2019 06:54:48 +0300
Subject: [PATCH] Fix backend dependencies for tests (#189)
---
arbiter/arbiter-deeplearning4j/pom.xml | 32 ++++++++++++----
arbiter/arbiter-server/pom.xml | 32 +++++++++++++---
arbiter/arbiter-ui/pom.xml | 34 ++++++++++++-----
datavec/datavec-api/pom.xml | 30 +++++++++------
datavec/datavec-arrow/pom.xml | 27 +++++++++----
.../datavec-data/datavec-data-codec/pom.xml | 28 +++++++++-----
.../datavec-data/datavec-data-image/pom.xml | 36 +++++++++---------
datavec/datavec-data/datavec-data-nlp/pom.xml | 29 +++++++++-----
datavec/datavec-hadoop/pom.xml | 29 +++++++++-----
datavec/datavec-local/pom.xml | 27 +++++++++----
datavec/datavec-perf/pom.xml | 27 +++++++++----
datavec/datavec-python/pom.xml | 38 +++++++++++++------
.../datavec-spark-inference-client/pom.xml | 27 +++++++++----
.../datavec-spark-inference-model/pom.xml | 27 +++++++++----
.../datavec-spark-inference-server/pom.xml | 30 +++++++++------
datavec/datavec-spark/pom.xml | 28 +++++++++-----
deeplearning4j/deeplearning4j-core/pom.xml | 33 ++++++++--------
.../deeplearning4j-dataimport-solrj/pom.xml | 25 ++++++++----
.../deeplearning4j-modelexport-solr/pom.xml | 23 ++++++++---
.../deeplearning4j-modelimport/pom.xml | 24 ++++++++----
.../pom.xml | 24 ++++++++----
.../nearestneighbor-core/pom.xml | 23 ++++++++---
.../deeplearning4j-json-server/pom.xml | 2 +-
.../pom.xml | 24 ++++++++----
.../deeplearning4j-play/pom.xml | 32 +++++++++-------
gym-java-client/pom.xml | 14 +++++++
jumpy/pom.xml | 17 ++++++++-
nd4j/nd4j-backends/nd4j-tests/pom.xml | 2 +-
nd4j/nd4j-remote/nd4j-grpc-client/pom.xml | 31 +++++++++++----
nd4j/nd4j-remote/nd4j-json-server/pom.xml | 32 ++++++----------
nd4s/pom.xml | 32 +++++++++++++---
pydl4j/pom.xml | 17 ++++++++-
rl4j/rl4j-core/pom.xml | 32 +++++++++++++---
scalnet/pom.xml | 32 +++++++++++++---
34 files changed, 629 insertions(+), 271 deletions(-)
diff --git a/arbiter/arbiter-deeplearning4j/pom.xml b/arbiter/arbiter-deeplearning4j/pom.xml
index 91c5a11ed..86fe15d18 100644
--- a/arbiter/arbiter-deeplearning4j/pom.xml
+++ b/arbiter/arbiter-deeplearning4j/pom.xml
@@ -38,13 +38,6 @@
${dl4j.version}
-
- org.nd4j
- nd4j-native
- ${nd4j.version}
- test
-
-
junit
junit
@@ -66,4 +59,29 @@
+
+
+ nd4j-tests-cpu
+
+
+ org.nd4j
+ nd4j-native
+ ${project.version}
+ test
+
+
+
+
+
+ nd4j-tests-cuda
+
+
+ org.nd4j
+ nd4j-cuda-10.1
+ ${project.version}
+ test
+
+
+
+
diff --git a/arbiter/arbiter-server/pom.xml b/arbiter/arbiter-server/pom.xml
index caef6b6bd..e3a6738ac 100644
--- a/arbiter/arbiter-server/pom.xml
+++ b/arbiter/arbiter-server/pom.xml
@@ -49,11 +49,31 @@
${junit.version}
test
-
- org.nd4j
- nd4j-native
- ${nd4j.version}
- test
-
+
+
+
+ nd4j-tests-cpu
+
+
+ org.nd4j
+ nd4j-native
+ ${project.version}
+ test
+
+
+
+
+
+ nd4j-tests-cuda
+
+
+ org.nd4j
+ nd4j-cuda-10.1
+ ${project.version}
+ test
+
+
+
+
diff --git a/arbiter/arbiter-ui/pom.xml b/arbiter/arbiter-ui/pom.xml
index 7d83c737c..084ad3151 100644
--- a/arbiter/arbiter-ui/pom.xml
+++ b/arbiter/arbiter-ui/pom.xml
@@ -97,6 +97,30 @@
+
+
+ nd4j-tests-cpu
+
+
+ org.nd4j
+ nd4j-native
+ ${project.version}
+ test
+
+
+
+
+
+ nd4j-tests-cuda
+
+
+ org.nd4j
+ nd4j-cuda-10.1
+ ${project.version}
+ test
+
+
+
@@ -124,13 +148,6 @@
${project.version}
-
- org.nd4j
- nd4j-native
- ${nd4j.version}
- test
-
-
junit
junit
@@ -139,9 +156,6 @@
-
-
-
diff --git a/datavec/datavec-api/pom.xml b/datavec/datavec-api/pom.xml
index 73ecef1e5..412be6e81 100644
--- a/datavec/datavec-api/pom.xml
+++ b/datavec/datavec-api/pom.xml
@@ -26,7 +26,6 @@
datavec-api
-
org.apache.commons
@@ -98,13 +97,6 @@
${stream.analytics.version}
-
- org.nd4j
- nd4j-native
- ${nd4j.version}
- test
-
-
net.sf.opencsv
@@ -125,13 +117,29 @@
-
- test-nd4j-native
+ nd4j-tests-cpu
+
+
+ org.nd4j
+ nd4j-native
+ ${project.version}
+ test
+
+
+
- test-nd4j-cuda-10.1
+ nd4j-tests-cuda
+
+
+ org.nd4j
+ nd4j-cuda-10.1
+ ${project.version}
+ test
+
+
diff --git a/datavec/datavec-arrow/pom.xml b/datavec/datavec-arrow/pom.xml
index 4bda93a5e..f86e7f3f2 100644
--- a/datavec/datavec-arrow/pom.xml
+++ b/datavec/datavec-arrow/pom.xml
@@ -34,12 +34,6 @@
nd4j-arrow
${project.version}
-
- org.nd4j
- nd4j-native
- ${nd4j.version}
- test
-
com.fasterxml.jackson.core
jackson-core
@@ -104,10 +98,27 @@
- test-nd4j-native
+ nd4j-tests-cpu
+
+
+ org.nd4j
+ nd4j-native
+ ${project.version}
+ test
+
+
+
- test-nd4j-cuda-10.1
+ nd4j-tests-cuda
+
+
+ org.nd4j
+ nd4j-cuda-10.1
+ ${project.version}
+ test
+
+
diff --git a/datavec/datavec-data/datavec-data-codec/pom.xml b/datavec/datavec-data/datavec-data-codec/pom.xml
index 6a6bceda6..e94887b40 100644
--- a/datavec/datavec-data/datavec-data-codec/pom.xml
+++ b/datavec/datavec-data/datavec-data-codec/pom.xml
@@ -43,12 +43,6 @@
datavec-api
${project.version}
-
- org.nd4j
- nd4j-native
- ${nd4j.version}
- test
-
-
- test-nd4j-native
+ nd4j-tests-cpu
+
+
+ org.nd4j
+ nd4j-native
+ ${project.version}
+ test
+
+
+
- test-nd4j-cuda-10.1
+ nd4j-tests-cuda
+
+
+ org.nd4j
+ nd4j-cuda-10.1
+ ${project.version}
+ test
+
+
diff --git a/datavec/datavec-data/datavec-data-image/pom.xml b/datavec/datavec-data/datavec-data-image/pom.xml
index 3b8664650..326102ed1 100644
--- a/datavec/datavec-data/datavec-data-image/pom.xml
+++ b/datavec/datavec-data/datavec-data-image/pom.xml
@@ -31,20 +31,12 @@
datavec-api
${project.version}
-
ch.qos.logback
logback-classic
${logback.version}
test
-
-
- org.nd4j
- nd4j-native
- ${nd4j.version}
- test
-
org.nd4j
nd4j-buffer
@@ -75,7 +67,6 @@
imageio-bmp
3.1.1
-
com.google.android
android
@@ -88,7 +79,6 @@
true
-
org.bytedeco
javacpp
@@ -99,25 +89,21 @@
javacv
${javacv.version}
-
org.bytedeco
opencv-platform
${opencv.version}-${javacpp-presets.version}
-
org.bytedeco
leptonica-platform
${leptonica.version}-${javacpp-presets.version}
-
org.bytedeco
hdf5-platform
${hdf5.version}-${javacpp-presets.version}
-
@@ -137,11 +123,27 @@
- test-nd4j-native
+ nd4j-tests-cpu
+
+
+ org.nd4j
+ nd4j-native
+ ${project.version}
+ test
+
+
+
- test-nd4j-cuda-10.1
+ nd4j-tests-cuda
+
+
+ org.nd4j
+ nd4j-cuda-10.1
+ ${project.version}
+ test
+
+
-
diff --git a/datavec/datavec-data/datavec-data-nlp/pom.xml b/datavec/datavec-data/datavec-data-nlp/pom.xml
index 6c6589ffe..b76660975 100644
--- a/datavec/datavec-data/datavec-data-nlp/pom.xml
+++ b/datavec/datavec-data/datavec-data-nlp/pom.xml
@@ -31,7 +31,6 @@
UTF-8
2.0.0
-
@@ -75,13 +74,6 @@
cleartk-opennlp-tools
${cleartk.version}
-
- org.nd4j
- nd4j-native
- ${nd4j.version}
- test
-
-
ch.qos.logback
logback-classic
@@ -92,10 +84,27 @@
- test-nd4j-native
+ nd4j-tests-cpu
+
+
+ org.nd4j
+ nd4j-native
+ ${project.version}
+ test
+
+
+
- test-nd4j-cuda-10.1
+ nd4j-tests-cuda
+
+
+ org.nd4j
+ nd4j-cuda-10.1
+ ${project.version}
+ test
+
+
diff --git a/datavec/datavec-hadoop/pom.xml b/datavec/datavec-hadoop/pom.xml
index 787b64052..cf79113a5 100644
--- a/datavec/datavec-hadoop/pom.xml
+++ b/datavec/datavec-hadoop/pom.xml
@@ -95,22 +95,31 @@
-
-
-
- org.nd4j
- nd4j-native
- ${nd4j.version}
- test
-
- test-nd4j-native
+ nd4j-tests-cpu
+
+
+ org.nd4j
+ nd4j-native
+ ${project.version}
+ test
+
+
+
- test-nd4j-cuda-10.1
+ nd4j-tests-cuda
+
+
+ org.nd4j
+ nd4j-cuda-10.1
+ ${project.version}
+ test
+
+
diff --git a/datavec/datavec-local/pom.xml b/datavec/datavec-local/pom.xml
index 6118d3ecf..840e9bd9c 100644
--- a/datavec/datavec-local/pom.xml
+++ b/datavec/datavec-local/pom.xml
@@ -50,12 +50,6 @@
protonpack
${protonpack.version}
-
- org.nd4j
- nd4j-native
- ${nd4j.version}
- test
-
org.datavec
datavec-api
@@ -126,10 +120,27 @@
- test-nd4j-native
+ nd4j-tests-cpu
+
+
+ org.nd4j
+ nd4j-native
+ ${project.version}
+ test
+
+
+
- test-nd4j-cuda-10.1
+ nd4j-tests-cuda
+
+
+ org.nd4j
+ nd4j-cuda-10.1
+ ${project.version}
+ test
+
+
diff --git a/datavec/datavec-perf/pom.xml b/datavec/datavec-perf/pom.xml
index 59aa0be79..703386f9e 100644
--- a/datavec/datavec-perf/pom.xml
+++ b/datavec/datavec-perf/pom.xml
@@ -52,12 +52,6 @@
${project.version}
test
-
- org.nd4j
- nd4j-native
- ${nd4j.version}
- test
-
org.datavec
datavec-api
@@ -67,10 +61,27 @@
- test-nd4j-native
+ nd4j-tests-cpu
+
+
+ org.nd4j
+ nd4j-native
+ ${project.version}
+ test
+
+
+
- test-nd4j-cuda-10.1
+ nd4j-tests-cuda
+
+
+ org.nd4j
+ nd4j-cuda-10.1
+ ${project.version}
+ test
+
+
diff --git a/datavec/datavec-python/pom.xml b/datavec/datavec-python/pom.xml
index 0b147bc7a..ed8af9e85 100644
--- a/datavec/datavec-python/pom.xml
+++ b/datavec/datavec-python/pom.xml
@@ -26,10 +26,8 @@
datavec-python
-
-
-
+
com.googlecode.json-simple
json-simple
1.1
@@ -39,11 +37,6 @@
cpython-platform
${cpython-platform.version}
-
- org.nd4j
- nd4j-native
- ${project.version}
-
com.google.code.findbugs
jsr305
@@ -54,21 +47,42 @@
datavec-api
${project.version}
-
ch.qos.logback
logback-classic
${logback.version}
test
+
+ org.nd4j
+ nd4j-native-api
+ ${project.version}
+
+
- test-nd4j-native
+ nd4j-tests-cpu
+
+
+ org.nd4j
+ nd4j-native
+ ${project.version}
+ test
+
+
+
- test-nd4j-cuda-10.1
+ nd4j-tests-cuda
+
+
+ org.nd4j
+ nd4j-cuda-10.1
+ ${project.version}
+ test
+
+
-
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 d27da85df..83fc78c6f 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
@@ -30,12 +30,6 @@
-
- org.nd4j
- nd4j-native
- ${nd4j.version}
- test
-
org.nd4j
nd4j-jackson
@@ -81,10 +75,27 @@
- test-nd4j-native
+ nd4j-tests-cpu
+
+
+ org.nd4j
+ nd4j-native
+ ${project.version}
+ test
+
+
+
- test-nd4j-cuda-10.1
+ nd4j-tests-cuda
+
+
+ org.nd4j
+ nd4j-cuda-10.1
+ ${project.version}
+ test
+
+
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 7483b1b3d..aed3601b0 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
@@ -35,12 +35,6 @@
datavec-api
${datavec.version}
-
- org.nd4j
- nd4j-native
- ${nd4j.version}
- test
-
org.datavec
datavec-data-image
@@ -55,10 +49,27 @@
- test-nd4j-native
+ nd4j-tests-cpu
+
+
+ org.nd4j
+ nd4j-native
+ ${project.version}
+ test
+
+
+
- test-nd4j-cuda-10.1
+ nd4j-tests-cuda
+
+
+ org.nd4j
+ nd4j-cuda-10.1
+ ${project.version}
+ test
+
+
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 2cc01e288..d6993afdf 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
@@ -194,23 +194,31 @@
jcommander
${jcommander.version}
-
-
-
- org.nd4j
- nd4j-native
- ${nd4j.version}
- test
-
-
- test-nd4j-native
+ nd4j-tests-cpu
+
+
+ org.nd4j
+ nd4j-native
+ ${project.version}
+ test
+
+
+
- test-nd4j-cuda-10.1
+ nd4j-tests-cuda
+
+
+ org.nd4j
+ nd4j-cuda-10.1
+ ${project.version}
+ test
+
+
diff --git a/datavec/datavec-spark/pom.xml b/datavec/datavec-spark/pom.xml
index 2f8a046ec..36c782bea 100644
--- a/datavec/datavec-spark/pom.xml
+++ b/datavec/datavec-spark/pom.xml
@@ -281,13 +281,6 @@
test
-
- org.nd4j
- nd4j-native
- ${nd4j.version}
- test
-
-
org.datavec
datavec-local
@@ -314,10 +307,27 @@
- test-nd4j-native
+ nd4j-tests-cpu
+
+
+ org.nd4j
+ nd4j-native
+ ${project.version}
+ test
+
+
+
- test-nd4j-cuda-10.1
+ nd4j-tests-cuda
+
+
+ org.nd4j
+ nd4j-cuda-10.1
+ ${project.version}
+ test
+
+
diff --git a/deeplearning4j/deeplearning4j-core/pom.xml b/deeplearning4j/deeplearning4j-core/pom.xml
index ba9020a8d..aeb5fe04b 100644
--- a/deeplearning4j/deeplearning4j-core/pom.xml
+++ b/deeplearning4j/deeplearning4j-core/pom.xml
@@ -29,23 +29,11 @@
nd4j-api
${nd4j.version}
-
- org.nd4j
- nd4j-native
- ${nd4j.version}
- test
-
org.nd4j
nd4j-common
${nd4j.version}
-
- org.nd4j
- nd4j-cuda-10.1
- ${nd4j.version}
- test
-
@@ -82,7 +70,6 @@
test
-
org.deeplearning4j
deeplearning4j-nn
@@ -132,8 +119,6 @@
${commonslang.version}
-
-
org.nd4j
@@ -141,7 +126,6 @@
${nd4j.version}
-
org.projectlombok
lombok
@@ -180,9 +164,26 @@
test-nd4j-native
+
+
+ org.nd4j
+ nd4j-native
+ ${project.version}
+ test
+
+
+
test-nd4j-cuda-10.1
+
+
+ org.nd4j
+ nd4j-cuda-10.1
+ ${project.version}
+ test
+
+
diff --git a/deeplearning4j/deeplearning4j-dataimport-solrj/pom.xml b/deeplearning4j/deeplearning4j-dataimport-solrj/pom.xml
index 971888fb1..c6227f27f 100644
--- a/deeplearning4j/deeplearning4j-dataimport-solrj/pom.xml
+++ b/deeplearning4j/deeplearning4j-dataimport-solrj/pom.xml
@@ -100,22 +100,31 @@
logback-classic
test
-
-
- org.nd4j
- nd4j-native
- ${nd4j.version}
- test
-
test-nd4j-native
+
+
+ org.nd4j
+ nd4j-native
+ ${project.version}
+ test
+
+
+
test-nd4j-cuda-10.1
+
+
+ org.nd4j
+ nd4j-cuda-10.1
+ ${project.version}
+ test
+
+
-
diff --git a/deeplearning4j/deeplearning4j-modelexport-solr/pom.xml b/deeplearning4j/deeplearning4j-modelexport-solr/pom.xml
index 44e81c9a6..c550547d4 100644
--- a/deeplearning4j/deeplearning4j-modelexport-solr/pom.xml
+++ b/deeplearning4j/deeplearning4j-modelexport-solr/pom.xml
@@ -286,20 +286,31 @@
${lucene-solr.version}
test
-
- org.nd4j
- nd4j-native
- ${nd4j.version}
- test
-
test-nd4j-native
+
+
+ org.nd4j
+ nd4j-native
+ ${project.version}
+ test
+
+
+
test-nd4j-cuda-10.1
+
+
+ org.nd4j
+ nd4j-cuda-10.1
+ ${project.version}
+ test
+
+
diff --git a/deeplearning4j/deeplearning4j-modelimport/pom.xml b/deeplearning4j/deeplearning4j-modelimport/pom.xml
index 1747848f0..59f05a6e8 100644
--- a/deeplearning4j/deeplearning4j-modelimport/pom.xml
+++ b/deeplearning4j/deeplearning4j-modelimport/pom.xml
@@ -87,13 +87,6 @@
test
-
- org.nd4j
- nd4j-native
- ${nd4j.version}
- test
-
-
org.deeplearning4j
deeplearning4j-datavec-iterators
@@ -105,9 +98,26 @@
test-nd4j-native
+
+
+ org.nd4j
+ nd4j-native
+ ${project.version}
+ test
+
+
+
test-nd4j-cuda-10.1
+
+
+ org.nd4j
+ nd4j-cuda-10.1
+ ${project.version}
+ test
+
+
diff --git a/deeplearning4j/deeplearning4j-nearestneighbors-parent/deeplearning4j-nearestneighbor-server/pom.xml b/deeplearning4j/deeplearning4j-nearestneighbors-parent/deeplearning4j-nearestneighbor-server/pom.xml
index 0f1df0714..5351f0955 100644
--- a/deeplearning4j/deeplearning4j-nearestneighbors-parent/deeplearning4j-nearestneighbor-server/pom.xml
+++ b/deeplearning4j/deeplearning4j-nearestneighbors-parent/deeplearning4j-nearestneighbor-server/pom.xml
@@ -218,21 +218,31 @@
akka-cluster_2.11
${akka.version}
-
-
- org.nd4j
- nd4j-native
- ${nd4j.version}
- test
-
test-nd4j-native
+
+
+ org.nd4j
+ nd4j-native
+ ${project.version}
+ test
+
+
+
test-nd4j-cuda-10.1
+
+
+ org.nd4j
+ nd4j-cuda-10.1
+ ${project.version}
+ test
+
+
diff --git a/deeplearning4j/deeplearning4j-nearestneighbors-parent/nearestneighbor-core/pom.xml b/deeplearning4j/deeplearning4j-nearestneighbors-parent/nearestneighbor-core/pom.xml
index f1b9e0b00..8b774cd56 100644
--- a/deeplearning4j/deeplearning4j-nearestneighbors-parent/nearestneighbor-core/pom.xml
+++ b/deeplearning4j/deeplearning4j-nearestneighbors-parent/nearestneighbor-core/pom.xml
@@ -33,12 +33,6 @@
-
- org.nd4j
- nd4j-native
- ${nd4j.version}
- test
-
org.nd4j
nd4j-api
@@ -71,9 +65,26 @@
test-nd4j-native
+
+
+ org.nd4j
+ nd4j-native
+ ${project.version}
+ test
+
+
+
test-nd4j-cuda-10.1
+
+
+ org.nd4j
+ nd4j-cuda-10.1
+ ${project.version}
+ test
+
+
diff --git a/deeplearning4j/deeplearning4j-remote/deeplearning4j-json-server/pom.xml b/deeplearning4j/deeplearning4j-remote/deeplearning4j-json-server/pom.xml
index e2d5f901f..a9b7879f0 100644
--- a/deeplearning4j/deeplearning4j-remote/deeplearning4j-json-server/pom.xml
+++ b/deeplearning4j/deeplearning4j-remote/deeplearning4j-json-server/pom.xml
@@ -80,7 +80,7 @@
test-nd4j-native
- true
+ false
diff --git a/deeplearning4j/deeplearning4j-scaleout/deeplearning4j-scaleout-parallelwrapper-parameter-server/pom.xml b/deeplearning4j/deeplearning4j-scaleout/deeplearning4j-scaleout-parallelwrapper-parameter-server/pom.xml
index 5d0d1403d..8fd0ea38f 100644
--- a/deeplearning4j/deeplearning4j-scaleout/deeplearning4j-scaleout-parallelwrapper-parameter-server/pom.xml
+++ b/deeplearning4j/deeplearning4j-scaleout/deeplearning4j-scaleout-parallelwrapper-parameter-server/pom.xml
@@ -51,12 +51,6 @@
deeplearning4j-parallel-wrapper
${project.version}
-
- org.nd4j
- nd4j-native
- ${project.version}
- test
-
org.nd4j
nd4j-parameter-server-client
@@ -110,10 +104,26 @@
test-nd4j-native
+
+
+ org.nd4j
+ nd4j-native
+ ${project.version}
+ test
+
+
+
test-nd4j-cuda-10.1
+
+
+ org.nd4j
+ nd4j-cuda-10.1
+ ${project.version}
+ test
+
+
-
diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-play/pom.xml b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-play/pom.xml
index c1c9a4664..f624beb6b 100644
--- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-play/pom.xml
+++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-play/pom.xml
@@ -100,11 +100,27 @@
test-nd4j-native
-
-
- test-nd4j-cuda-10.1
+
+
+ org.nd4j
+ nd4j-native
+ ${project.version}
+ test
+
+
+
+ test-nd4j-cuda-10.1
+
+
+ org.nd4j
+ nd4j-cuda-10.1
+ ${project.version}
+ test
+
+
+
@@ -306,14 +322,6 @@
test
-
- org.nd4j
- nd4j-native
- ${project.version}
- test
-
-
-
org.webjars.npm
@@ -722,6 +730,4 @@
-
-
diff --git a/gym-java-client/pom.xml b/gym-java-client/pom.xml
index 1b7488c81..fc82d01b2 100644
--- a/gym-java-client/pom.xml
+++ b/gym-java-client/pom.xml
@@ -320,4 +320,18 @@
+
+
+
+ nd4j-backend
+
+
+ libnd4j.cuda
+
+
+
+ nd4j-cuda-${libnd4j.cuda}
+
+
+
diff --git a/jumpy/pom.xml b/jumpy/pom.xml
index e298d1ce9..c3132e846 100644
--- a/jumpy/pom.xml
+++ b/jumpy/pom.xml
@@ -44,12 +44,13 @@
false
0.2.4
+ nd4j-native
org.nd4j
- nd4j-native
+ ${nd4j.backend}
${dl4j.version}
@@ -179,4 +180,18 @@
+
+
+
+ nd4j-backend
+
+
+ libnd4j.cuda
+
+
+
+ nd4j-cuda-${libnd4j.cuda}
+
+
+
diff --git a/nd4j/nd4j-backends/nd4j-tests/pom.xml b/nd4j/nd4j-backends/nd4j-tests/pom.xml
index 99731899f..5f1d372ff 100644
--- a/nd4j/nd4j-backends/nd4j-tests/pom.xml
+++ b/nd4j/nd4j-backends/nd4j-tests/pom.xml
@@ -159,7 +159,7 @@
nd4j-tests-cpu
- true
+ false
diff --git a/nd4j/nd4j-remote/nd4j-grpc-client/pom.xml b/nd4j/nd4j-remote/nd4j-grpc-client/pom.xml
index 1f668eb66..aa60e9586 100644
--- a/nd4j/nd4j-remote/nd4j-grpc-client/pom.xml
+++ b/nd4j/nd4j-remote/nd4j-grpc-client/pom.xml
@@ -44,13 +44,6 @@
test
-
- org.nd4j
- nd4j-native
- ${project.version}
- test
-
-
org.nd4j
nd4j-api
@@ -95,6 +88,30 @@
+
+ nd4j-tests-cpu
+
+
+ org.nd4j
+ nd4j-native
+ ${project.version}
+ test
+
+
+
+
+
+ nd4j-tests-cuda
+
+
+ org.nd4j
+ nd4j-cuda-10.1
+ ${project.version}
+ test
+
+
+
+
testresources
diff --git a/nd4j/nd4j-remote/nd4j-json-server/pom.xml b/nd4j/nd4j-remote/nd4j-json-server/pom.xml
index cc19f4f6d..ba4d97bd5 100644
--- a/nd4j/nd4j-remote/nd4j-json-server/pom.xml
+++ b/nd4j/nd4j-remote/nd4j-json-server/pom.xml
@@ -125,13 +125,22 @@
+
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+
+
+ ${maven.compiler.target}
+
+
+
+
nd4j-tests-cpu
-
- true
-
org.nd4j
@@ -144,9 +153,6 @@
nd4j-tests-cuda
-
- false
-
org.nd4j
@@ -160,19 +166,5 @@
testresources
-
-
-
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
-
-
- ${maven.compiler.target}
-
-
-
-
diff --git a/nd4s/pom.xml b/nd4s/pom.xml
index df20a4423..011bc7fbe 100644
--- a/nd4s/pom.xml
+++ b/nd4s/pom.xml
@@ -78,12 +78,6 @@
nd4j-api
${nd4j.version}
-
- org.nd4j
- nd4j-native
- ${nd4j.version}
- test
-
ch.qos.logback
logback-classic
@@ -295,4 +289,30 @@
+
+
+
+ nd4j-tests-cpu
+
+
+ org.nd4j
+ nd4j-native
+ ${project.version}
+ test
+
+
+
+
+
+ nd4j-tests-cuda
+
+
+ org.nd4j
+ nd4j-cuda-10.1
+ ${project.version}
+ test
+
+
+
+
diff --git a/pydl4j/pom.xml b/pydl4j/pom.xml
index d64c9bbdb..279c57e07 100644
--- a/pydl4j/pom.xml
+++ b/pydl4j/pom.xml
@@ -44,12 +44,13 @@
false
0.1.3
+ nd4j-native
org.nd4j
- nd4j-native
+ ${nd4j.backend}
${dl4j.version}
@@ -179,4 +180,18 @@
+
+
+
+ nd4j-backend
+
+
+ libnd4j.cuda
+
+
+
+ nd4j-cuda-${libnd4j.cuda}
+
+
+
diff --git a/rl4j/rl4j-core/pom.xml b/rl4j/rl4j-core/pom.xml
index 1831700b2..497128f30 100644
--- a/rl4j/rl4j-core/pom.xml
+++ b/rl4j/rl4j-core/pom.xml
@@ -91,12 +91,6 @@
deeplearning4j-core
${dl4j.version}
-
- org.nd4j
- nd4j-native
- ${nd4j.version}
- test
-
org.apache.commons
commons-collections4
@@ -108,4 +102,30 @@
${jackson.version}
+
+
+
+ nd4j-tests-cpu
+
+
+ org.nd4j
+ nd4j-native
+ ${project.version}
+ test
+
+
+
+
+
+ nd4j-tests-cuda
+
+
+ org.nd4j
+ nd4j-cuda-10.1
+ ${project.version}
+ test
+
+
+
+
diff --git a/scalnet/pom.xml b/scalnet/pom.xml
index 0f83a9b69..5d0f85dd8 100644
--- a/scalnet/pom.xml
+++ b/scalnet/pom.xml
@@ -61,12 +61,6 @@
-
- org.nd4j
- nd4j-native
- ${nd4j.version}
- test
-
org.scala-lang
scala-library
@@ -274,4 +268,30 @@
+
+
+
+ nd4j-tests-cpu
+
+
+ org.nd4j
+ nd4j-native
+ ${project.version}
+ test
+
+
+
+
+
+ nd4j-tests-cuda
+
+
+ org.nd4j
+ nd4j-cuda-10.1
+ ${project.version}
+ test
+
+
+
+