diff --git a/arbiter/arbiter-core/pom.xml b/arbiter/arbiter-core/pom.xml index 064dd3ecd..04a1fc0f0 100644 --- a/arbiter/arbiter-core/pom.xml +++ b/arbiter/arbiter-core/pom.xml @@ -91,7 +91,7 @@ test-nd4j-native - test-nd4j-cuda-10.1 + test-nd4j-cuda-10.2 diff --git a/arbiter/arbiter-deeplearning4j/pom.xml b/arbiter/arbiter-deeplearning4j/pom.xml index 85afe7a6b..b163e2ae4 100644 --- a/arbiter/arbiter-deeplearning4j/pom.xml +++ b/arbiter/arbiter-deeplearning4j/pom.xml @@ -70,7 +70,7 @@ test-nd4j-native - test-nd4j-cuda-10.1 + test-nd4j-cuda-10.2 diff --git a/arbiter/arbiter-server/pom.xml b/arbiter/arbiter-server/pom.xml index 5d14fa6a0..bdea61138 100644 --- a/arbiter/arbiter-server/pom.xml +++ b/arbiter/arbiter-server/pom.xml @@ -56,7 +56,7 @@ test-nd4j-native - test-nd4j-cuda-10.1 + test-nd4j-cuda-10.2 diff --git a/arbiter/arbiter-ui/pom.xml b/arbiter/arbiter-ui/pom.xml index 03a335ea8..2067a3fc7 100644 --- a/arbiter/arbiter-ui/pom.xml +++ b/arbiter/arbiter-ui/pom.xml @@ -37,7 +37,7 @@ test-nd4j-native - test-nd4j-cuda-10.1 + test-nd4j-cuda-10.2 diff --git a/arbiter/pom.xml b/arbiter/pom.xml index 5f660c646..364c6d904 100644 --- a/arbiter/pom.xml +++ b/arbiter/pom.xml @@ -151,7 +151,7 @@ ${skipTestResourceEnforcement} - test-nd4j-native,test-nd4j-cuda-10.1 + test-nd4j-native,test-nd4j-cuda-10.2 false @@ -333,11 +333,11 @@ - test-nd4j-cuda-10.1 + test-nd4j-cuda-10.2 org.nd4j - nd4j-cuda-10.1 + nd4j-cuda-10.2 ${nd4j.version} test diff --git a/change-cuda-versions.sh b/change-cuda-versions.sh index 8acda5b1a..21f17bb72 100755 --- a/change-cuda-versions.sh +++ b/change-cuda-versions.sh @@ -20,7 +20,7 @@ set -e -VALID_VERSIONS=( 9.2 10.0 10.1 ) +VALID_VERSIONS=( 9.2 10.0 10.1 10.2 ) usage() { echo "Usage: $(basename $0) [-h|--help] @@ -47,6 +47,10 @@ check_cuda_version() { check_cuda_version "$VERSION" case $VERSION in + 10.2) + VERSION2="7.6" + VERSION3="1.5.2" + ;; 10.1) VERSION2="7.6" VERSION3="1.5.2" diff --git a/datavec/datavec-api/pom.xml b/datavec/datavec-api/pom.xml index b3401b431..10ed3517a 100644 --- a/datavec/datavec-api/pom.xml +++ b/datavec/datavec-api/pom.xml @@ -117,7 +117,7 @@ test-nd4j-native - test-nd4j-cuda-10.1 + test-nd4j-cuda-10.2 diff --git a/datavec/datavec-arrow/pom.xml b/datavec/datavec-arrow/pom.xml index 6134bbf27..04420a5e9 100644 --- a/datavec/datavec-arrow/pom.xml +++ b/datavec/datavec-arrow/pom.xml @@ -56,7 +56,7 @@ test-nd4j-native - test-nd4j-cuda-10.1 + test-nd4j-cuda-10.2 diff --git a/datavec/datavec-camel/pom.xml b/datavec/datavec-camel/pom.xml index fdd8cdd86..3390242bc 100644 --- a/datavec/datavec-camel/pom.xml +++ b/datavec/datavec-camel/pom.xml @@ -110,7 +110,7 @@ test-nd4j-native - test-nd4j-cuda-10.1 + test-nd4j-cuda-10.2 diff --git a/datavec/datavec-data/datavec-data-audio/pom.xml b/datavec/datavec-data/datavec-data-audio/pom.xml index a7ee9a51d..1f99eab7c 100644 --- a/datavec/datavec-data/datavec-data-audio/pom.xml +++ b/datavec/datavec-data/datavec-data-audio/pom.xml @@ -72,7 +72,7 @@ test-nd4j-native - test-nd4j-cuda-10.1 + test-nd4j-cuda-10.2 diff --git a/datavec/datavec-data/datavec-data-codec/pom.xml b/datavec/datavec-data/datavec-data-codec/pom.xml index 2a65cb41a..a8e7ce493 100644 --- a/datavec/datavec-data/datavec-data-codec/pom.xml +++ b/datavec/datavec-data/datavec-data-codec/pom.xml @@ -59,7 +59,7 @@ test-nd4j-native - test-nd4j-cuda-10.1 + test-nd4j-cuda-10.2 diff --git a/datavec/datavec-data/datavec-data-image/pom.xml b/datavec/datavec-data/datavec-data-image/pom.xml index b97c9d5c6..fc85482a4 100644 --- a/datavec/datavec-data/datavec-data-image/pom.xml +++ b/datavec/datavec-data/datavec-data-image/pom.xml @@ -126,7 +126,7 @@ test-nd4j-native - test-nd4j-cuda-10.1 + test-nd4j-cuda-10.2 diff --git a/datavec/datavec-data/datavec-data-nlp/pom.xml b/datavec/datavec-data/datavec-data-nlp/pom.xml index 12df0fb08..0933a283e 100644 --- a/datavec/datavec-data/datavec-data-nlp/pom.xml +++ b/datavec/datavec-data/datavec-data-nlp/pom.xml @@ -67,7 +67,7 @@ test-nd4j-native - test-nd4j-cuda-10.1 + test-nd4j-cuda-10.2 diff --git a/datavec/datavec-data/pom.xml b/datavec/datavec-data/pom.xml index d6361cfb8..ef1558aab 100644 --- a/datavec/datavec-data/pom.xml +++ b/datavec/datavec-data/pom.xml @@ -58,7 +58,7 @@ test-nd4j-native - test-nd4j-cuda-10.1 + test-nd4j-cuda-10.2 diff --git a/datavec/datavec-excel/pom.xml b/datavec/datavec-excel/pom.xml index 589bf8b14..00fc890d8 100644 --- a/datavec/datavec-excel/pom.xml +++ b/datavec/datavec-excel/pom.xml @@ -58,7 +58,7 @@ test-nd4j-native - test-nd4j-cuda-10.1 + test-nd4j-cuda-10.2 diff --git a/datavec/datavec-geo/pom.xml b/datavec/datavec-geo/pom.xml index 50e843555..007d1cccd 100644 --- a/datavec/datavec-geo/pom.xml +++ b/datavec/datavec-geo/pom.xml @@ -49,7 +49,7 @@ test-nd4j-native - test-nd4j-cuda-10.1 + test-nd4j-cuda-10.2 diff --git a/datavec/datavec-hadoop/pom.xml b/datavec/datavec-hadoop/pom.xml index 5ec6d4c3f..7b74ead38 100644 --- a/datavec/datavec-hadoop/pom.xml +++ b/datavec/datavec-hadoop/pom.xml @@ -67,7 +67,7 @@ test-nd4j-native - test-nd4j-cuda-10.1 + test-nd4j-cuda-10.2 diff --git a/datavec/datavec-jdbc/pom.xml b/datavec/datavec-jdbc/pom.xml index 54a531047..bfafd25d0 100644 --- a/datavec/datavec-jdbc/pom.xml +++ b/datavec/datavec-jdbc/pom.xml @@ -65,7 +65,7 @@ test-nd4j-native - test-nd4j-cuda-10.1 + test-nd4j-cuda-10.2 diff --git a/datavec/datavec-local/pom.xml b/datavec/datavec-local/pom.xml index d2b15ffed..5c2c6f4ac 100644 --- a/datavec/datavec-local/pom.xml +++ b/datavec/datavec-local/pom.xml @@ -88,7 +88,7 @@ test-nd4j-native - test-nd4j-cuda-10.1 + test-nd4j-cuda-10.2 diff --git a/datavec/datavec-perf/pom.xml b/datavec/datavec-perf/pom.xml index 95f3135e5..a51b9aba1 100644 --- a/datavec/datavec-perf/pom.xml +++ b/datavec/datavec-perf/pom.xml @@ -59,7 +59,7 @@ test-nd4j-native - test-nd4j-cuda-10.1 + test-nd4j-cuda-10.2 diff --git a/datavec/datavec-python/pom.xml b/datavec/datavec-python/pom.xml index e60bc9219..449364207 100644 --- a/datavec/datavec-python/pom.xml +++ b/datavec/datavec-python/pom.xml @@ -65,7 +65,7 @@ test-nd4j-native - test-nd4j-cuda-10.1 + test-nd4j-cuda-10.2 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 95f13081f..10cca8e5a 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 @@ -58,7 +58,7 @@ test-nd4j-native - test-nd4j-cuda-10.1 + test-nd4j-cuda-10.2 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 ade8acd14..470340dc1 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 @@ -52,7 +52,7 @@ test-nd4j-native - test-nd4j-cuda-10.1 + test-nd4j-cuda-10.2 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 77eff8758..47951b1aa 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 @@ -171,7 +171,7 @@ test-nd4j-native - test-nd4j-cuda-10.1 + test-nd4j-cuda-10.2 diff --git a/datavec/datavec-spark-inference-parent/pom.xml b/datavec/datavec-spark-inference-parent/pom.xml index d7d2991ad..cc3a6b0c1 100644 --- a/datavec/datavec-spark-inference-parent/pom.xml +++ b/datavec/datavec-spark-inference-parent/pom.xml @@ -38,7 +38,7 @@ test-nd4j-native - test-nd4j-cuda-10.1 + test-nd4j-cuda-10.2 diff --git a/datavec/datavec-spark/pom.xml b/datavec/datavec-spark/pom.xml index 72f0b105f..50194c91e 100644 --- a/datavec/datavec-spark/pom.xml +++ b/datavec/datavec-spark/pom.xml @@ -138,7 +138,7 @@ test-nd4j-native - test-nd4j-cuda-10.1 + test-nd4j-cuda-10.2 diff --git a/datavec/pom.xml b/datavec/pom.xml index 7e9bf9bf0..ff4bfa51b 100644 --- a/datavec/pom.xml +++ b/datavec/pom.xml @@ -112,7 +112,7 @@ ${skipTestResourceEnforcement} - test-nd4j-native,test-nd4j-cuda-10.1 + test-nd4j-native,test-nd4j-cuda-10.2 false @@ -365,11 +365,11 @@ - test-nd4j-cuda-10.1 + test-nd4j-cuda-10.2 org.nd4j - nd4j-cuda-10.1 + nd4j-cuda-10.2 ${nd4j.version} test diff --git a/deeplearning4j/deeplearning4j-common/pom.xml b/deeplearning4j/deeplearning4j-common/pom.xml index 761460d21..1928eff91 100644 --- a/deeplearning4j/deeplearning4j-common/pom.xml +++ b/deeplearning4j/deeplearning4j-common/pom.xml @@ -40,7 +40,7 @@ test-nd4j-native - test-nd4j-cuda-10.1 + test-nd4j-cuda-10.2 diff --git a/deeplearning4j/deeplearning4j-core/pom.xml b/deeplearning4j/deeplearning4j-core/pom.xml index 81142fd68..65830d341 100644 --- a/deeplearning4j/deeplearning4j-core/pom.xml +++ b/deeplearning4j/deeplearning4j-core/pom.xml @@ -163,11 +163,11 @@ - test-nd4j-cuda-10.1 + test-nd4j-cuda-10.2 org.nd4j - nd4j-cuda-10.1 + nd4j-cuda-10.2 ${project.version} test diff --git a/deeplearning4j/deeplearning4j-cuda/pom.xml b/deeplearning4j/deeplearning4j-cuda/pom.xml index 4ec0729d5..95c5f5deb 100644 --- a/deeplearning4j/deeplearning4j-cuda/pom.xml +++ b/deeplearning4j/deeplearning4j-cuda/pom.xml @@ -16,7 +16,7 @@ 4.0.0 - deeplearning4j-cuda-10.1 + deeplearning4j-cuda-10.2 deeplearning4j-cuda org.deeplearning4j @@ -26,7 +26,7 @@ - 10.1 + 10.2 7.6 1.5.2 @@ -106,7 +106,7 @@ - test-nd4j-cuda-10.1 + test-nd4j-cuda-10.2 diff --git a/deeplearning4j/deeplearning4j-data/deeplearning4j-datasets/pom.xml b/deeplearning4j/deeplearning4j-data/deeplearning4j-datasets/pom.xml index eb6b8fec7..b1adbe93e 100644 --- a/deeplearning4j/deeplearning4j-data/deeplearning4j-datasets/pom.xml +++ b/deeplearning4j/deeplearning4j-data/deeplearning4j-datasets/pom.xml @@ -51,7 +51,7 @@ test-nd4j-native - test-nd4j-cuda-10.1 + test-nd4j-cuda-10.2 diff --git a/deeplearning4j/deeplearning4j-data/deeplearning4j-datavec-iterators/pom.xml b/deeplearning4j/deeplearning4j-data/deeplearning4j-datavec-iterators/pom.xml index 4df187848..c87a94b37 100644 --- a/deeplearning4j/deeplearning4j-data/deeplearning4j-datavec-iterators/pom.xml +++ b/deeplearning4j/deeplearning4j-data/deeplearning4j-datavec-iterators/pom.xml @@ -46,7 +46,7 @@ test-nd4j-native - test-nd4j-cuda-10.1 + test-nd4j-cuda-10.2 diff --git a/deeplearning4j/deeplearning4j-data/deeplearning4j-utility-iterators/pom.xml b/deeplearning4j/deeplearning4j-data/deeplearning4j-utility-iterators/pom.xml index eb3ca627f..462bebc95 100644 --- a/deeplearning4j/deeplearning4j-data/deeplearning4j-utility-iterators/pom.xml +++ b/deeplearning4j/deeplearning4j-data/deeplearning4j-utility-iterators/pom.xml @@ -48,7 +48,7 @@ test-nd4j-native - test-nd4j-cuda-10.1 + test-nd4j-cuda-10.2 diff --git a/deeplearning4j/deeplearning4j-data/pom.xml b/deeplearning4j/deeplearning4j-data/pom.xml index a4ffc7d2d..ca29f35b7 100644 --- a/deeplearning4j/deeplearning4j-data/pom.xml +++ b/deeplearning4j/deeplearning4j-data/pom.xml @@ -38,7 +38,7 @@ test-nd4j-native - test-nd4j-cuda-10.1 + test-nd4j-cuda-10.2 diff --git a/deeplearning4j/deeplearning4j-dataimport-solrj/pom.xml b/deeplearning4j/deeplearning4j-dataimport-solrj/pom.xml index c6227f27f..ecc33b57e 100644 --- a/deeplearning4j/deeplearning4j-dataimport-solrj/pom.xml +++ b/deeplearning4j/deeplearning4j-dataimport-solrj/pom.xml @@ -116,11 +116,11 @@ - test-nd4j-cuda-10.1 + test-nd4j-cuda-10.2 org.nd4j - nd4j-cuda-10.1 + nd4j-cuda-10.2 ${project.version} test diff --git a/deeplearning4j/deeplearning4j-graph/pom.xml b/deeplearning4j/deeplearning4j-graph/pom.xml index 6f3e5f555..9c4b25ac3 100644 --- a/deeplearning4j/deeplearning4j-graph/pom.xml +++ b/deeplearning4j/deeplearning4j-graph/pom.xml @@ -58,7 +58,7 @@ test-nd4j-native - test-nd4j-cuda-10.1 + test-nd4j-cuda-10.2 diff --git a/deeplearning4j/deeplearning4j-manifold/deeplearning4j-tsne/pom.xml b/deeplearning4j/deeplearning4j-manifold/deeplearning4j-tsne/pom.xml index 2353a6bdd..37002b5e1 100644 --- a/deeplearning4j/deeplearning4j-manifold/deeplearning4j-tsne/pom.xml +++ b/deeplearning4j/deeplearning4j-manifold/deeplearning4j-tsne/pom.xml @@ -62,7 +62,7 @@ test-nd4j-native - test-nd4j-cuda-10.1 + test-nd4j-cuda-10.2 diff --git a/deeplearning4j/deeplearning4j-manifold/pom.xml b/deeplearning4j/deeplearning4j-manifold/pom.xml index 5ac781ff3..921ee9653 100644 --- a/deeplearning4j/deeplearning4j-manifold/pom.xml +++ b/deeplearning4j/deeplearning4j-manifold/pom.xml @@ -41,7 +41,7 @@ test-nd4j-native - test-nd4j-cuda-10.1 + test-nd4j-cuda-10.2 diff --git a/deeplearning4j/deeplearning4j-modelexport-solr/pom.xml b/deeplearning4j/deeplearning4j-modelexport-solr/pom.xml index c550547d4..02ce30a40 100644 --- a/deeplearning4j/deeplearning4j-modelexport-solr/pom.xml +++ b/deeplearning4j/deeplearning4j-modelexport-solr/pom.xml @@ -302,11 +302,11 @@ - test-nd4j-cuda-10.1 + test-nd4j-cuda-10.2 org.nd4j - nd4j-cuda-10.1 + nd4j-cuda-10.2 ${project.version} test diff --git a/deeplearning4j/deeplearning4j-modelimport/pom.xml b/deeplearning4j/deeplearning4j-modelimport/pom.xml index dec29266f..223aebdaa 100644 --- a/deeplearning4j/deeplearning4j-modelimport/pom.xml +++ b/deeplearning4j/deeplearning4j-modelimport/pom.xml @@ -115,11 +115,11 @@ - test-nd4j-cuda-10.1 + test-nd4j-cuda-10.2 org.nd4j - nd4j-cuda-10.1 + nd4j-cuda-10.2 ${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 1fe0d20ff..ab28d78c4 100644 --- a/deeplearning4j/deeplearning4j-nearestneighbors-parent/deeplearning4j-nearestneighbor-server/pom.xml +++ b/deeplearning4j/deeplearning4j-nearestneighbors-parent/deeplearning4j-nearestneighbor-server/pom.xml @@ -119,11 +119,11 @@ - test-nd4j-cuda-10.1 + test-nd4j-cuda-10.2 org.nd4j - nd4j-cuda-10.1 + nd4j-cuda-10.2 ${project.version} test diff --git a/deeplearning4j/deeplearning4j-nearestneighbors-parent/deeplearning4j-nearestneighbors-client/pom.xml b/deeplearning4j/deeplearning4j-nearestneighbors-parent/deeplearning4j-nearestneighbors-client/pom.xml index d6b64b025..e3ca20366 100644 --- a/deeplearning4j/deeplearning4j-nearestneighbors-parent/deeplearning4j-nearestneighbors-client/pom.xml +++ b/deeplearning4j/deeplearning4j-nearestneighbors-parent/deeplearning4j-nearestneighbors-client/pom.xml @@ -54,7 +54,7 @@ test-nd4j-native - test-nd4j-cuda-10.1 + test-nd4j-cuda-10.2 diff --git a/deeplearning4j/deeplearning4j-nearestneighbors-parent/deeplearning4j-nearestneighbors-model/pom.xml b/deeplearning4j/deeplearning4j-nearestneighbors-parent/deeplearning4j-nearestneighbors-model/pom.xml index 609d48a39..bfd004c41 100644 --- a/deeplearning4j/deeplearning4j-nearestneighbors-parent/deeplearning4j-nearestneighbors-model/pom.xml +++ b/deeplearning4j/deeplearning4j-nearestneighbors-parent/deeplearning4j-nearestneighbors-model/pom.xml @@ -53,7 +53,7 @@ test-nd4j-native - test-nd4j-cuda-10.1 + test-nd4j-cuda-10.2 diff --git a/deeplearning4j/deeplearning4j-nearestneighbors-parent/nearestneighbor-core/pom.xml b/deeplearning4j/deeplearning4j-nearestneighbors-parent/nearestneighbor-core/pom.xml index f95f9268d..87bb7e68e 100644 --- a/deeplearning4j/deeplearning4j-nearestneighbors-parent/nearestneighbor-core/pom.xml +++ b/deeplearning4j/deeplearning4j-nearestneighbors-parent/nearestneighbor-core/pom.xml @@ -83,11 +83,11 @@ - test-nd4j-cuda-10.1 + test-nd4j-cuda-10.2 org.nd4j - nd4j-cuda-10.1 + nd4j-cuda-10.2 ${project.version} test diff --git a/deeplearning4j/deeplearning4j-nearestneighbors-parent/pom.xml b/deeplearning4j/deeplearning4j-nearestneighbors-parent/pom.xml index 720e7a5f3..23d5d225d 100644 --- a/deeplearning4j/deeplearning4j-nearestneighbors-parent/pom.xml +++ b/deeplearning4j/deeplearning4j-nearestneighbors-parent/pom.xml @@ -44,7 +44,7 @@ test-nd4j-native - test-nd4j-cuda-10.1 + test-nd4j-cuda-10.2 diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-chinese/pom.xml b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-chinese/pom.xml index 35eb2903d..219301c56 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-chinese/pom.xml +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-chinese/pom.xml @@ -66,7 +66,7 @@ test-nd4j-native - test-nd4j-cuda-10.1 + test-nd4j-cuda-10.2 diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-japanese/pom.xml b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-japanese/pom.xml index 260de2004..beeb07d34 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-japanese/pom.xml +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-japanese/pom.xml @@ -68,7 +68,7 @@ test-nd4j-native - test-nd4j-cuda-10.1 + test-nd4j-cuda-10.2 diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-korean/pom.xml b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-korean/pom.xml index aa9eb15b0..e11e9044f 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-korean/pom.xml +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-korean/pom.xml @@ -61,7 +61,7 @@ test-nd4j-native - test-nd4j-cuda-10.1 + test-nd4j-cuda-10.2 diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/pom.xml b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/pom.xml index 619d36db6..39eda5e50 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/pom.xml +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/pom.xml @@ -79,7 +79,7 @@ test-nd4j-native - test-nd4j-cuda-10.1 + test-nd4j-cuda-10.2 diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/pom.xml b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/pom.xml index 3f367689c..da4fd9cba 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/pom.xml +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/pom.xml @@ -84,7 +84,7 @@ test-nd4j-native - test-nd4j-cuda-10.1 + test-nd4j-cuda-10.2 diff --git a/deeplearning4j/deeplearning4j-nlp-parent/pom.xml b/deeplearning4j/deeplearning4j-nlp-parent/pom.xml index 838a3bb6e..6c4eea3fd 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/pom.xml +++ b/deeplearning4j/deeplearning4j-nlp-parent/pom.xml @@ -42,7 +42,7 @@ test-nd4j-native - test-nd4j-cuda-10.1 + test-nd4j-cuda-10.2 diff --git a/deeplearning4j/deeplearning4j-nn/pom.xml b/deeplearning4j/deeplearning4j-nn/pom.xml index 2564330b3..c1ff45a61 100644 --- a/deeplearning4j/deeplearning4j-nn/pom.xml +++ b/deeplearning4j/deeplearning4j-nn/pom.xml @@ -124,7 +124,7 @@ test-nd4j-native - test-nd4j-cuda-10.1 + test-nd4j-cuda-10.2 diff --git a/deeplearning4j/deeplearning4j-remote/deeplearning4j-json-server/pom.xml b/deeplearning4j/deeplearning4j-remote/deeplearning4j-json-server/pom.xml index a9b7879f0..62f95f736 100644 --- a/deeplearning4j/deeplearning4j-remote/deeplearning4j-json-server/pom.xml +++ b/deeplearning4j/deeplearning4j-remote/deeplearning4j-json-server/pom.xml @@ -93,14 +93,14 @@ - test-nd4j-cuda-10.1 + test-nd4j-cuda-10.2 false org.nd4j - nd4j-cuda-10.1 + nd4j-cuda-10.2 ${project.version} test diff --git a/deeplearning4j/deeplearning4j-remote/pom.xml b/deeplearning4j/deeplearning4j-remote/pom.xml index c1244455a..4ef2e06dd 100644 --- a/deeplearning4j/deeplearning4j-remote/pom.xml +++ b/deeplearning4j/deeplearning4j-remote/pom.xml @@ -24,7 +24,7 @@ test-nd4j-native - test-nd4j-cuda-10.1 + test-nd4j-cuda-10.2 diff --git a/deeplearning4j/deeplearning4j-scaleout/deeplearning4j-aws/pom.xml b/deeplearning4j/deeplearning4j-scaleout/deeplearning4j-aws/pom.xml index 94f66b405..969025e50 100644 --- a/deeplearning4j/deeplearning4j-scaleout/deeplearning4j-aws/pom.xml +++ b/deeplearning4j/deeplearning4j-scaleout/deeplearning4j-aws/pom.xml @@ -93,7 +93,7 @@ test-nd4j-native - test-nd4j-cuda-10.1 + test-nd4j-cuda-10.2 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 f95b9935b..97515cf5e 100644 --- a/deeplearning4j/deeplearning4j-scaleout/deeplearning4j-scaleout-parallelwrapper-parameter-server/pom.xml +++ b/deeplearning4j/deeplearning4j-scaleout/deeplearning4j-scaleout-parallelwrapper-parameter-server/pom.xml @@ -102,11 +102,11 @@ - test-nd4j-cuda-10.1 + test-nd4j-cuda-10.2 org.nd4j - nd4j-cuda-10.1 + nd4j-cuda-10.2 ${project.version} test diff --git a/deeplearning4j/deeplearning4j-scaleout/deeplearning4j-scaleout-parallelwrapper/pom.xml b/deeplearning4j/deeplearning4j-scaleout/deeplearning4j-scaleout-parallelwrapper/pom.xml index e3b6444bf..08eed7f15 100644 --- a/deeplearning4j/deeplearning4j-scaleout/deeplearning4j-scaleout-parallelwrapper/pom.xml +++ b/deeplearning4j/deeplearning4j-scaleout/deeplearning4j-scaleout-parallelwrapper/pom.xml @@ -97,7 +97,7 @@ test-nd4j-native - test-nd4j-cuda-10.1 + test-nd4j-cuda-10.2 diff --git a/deeplearning4j/deeplearning4j-scaleout/pom.xml b/deeplearning4j/deeplearning4j-scaleout/pom.xml index 65ddf17f5..2c192cc10 100644 --- a/deeplearning4j/deeplearning4j-scaleout/pom.xml +++ b/deeplearning4j/deeplearning4j-scaleout/pom.xml @@ -39,7 +39,7 @@ test-nd4j-native - test-nd4j-cuda-10.1 + test-nd4j-cuda-10.2 diff --git a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp-java8/pom.xml b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp-java8/pom.xml index 8a19b3b68..42e799b69 100644 --- a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp-java8/pom.xml +++ b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp-java8/pom.xml @@ -67,7 +67,7 @@ test-nd4j-native - test-nd4j-cuda-10.1 + test-nd4j-cuda-10.2 diff --git a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/pom.xml b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/pom.xml index 8d49f4d19..0a92d19ab 100644 --- a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/pom.xml +++ b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/pom.xml @@ -72,7 +72,7 @@ test-nd4j-native - test-nd4j-cuda-10.1 + test-nd4j-cuda-10.2 diff --git a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-parameterserver/pom.xml b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-parameterserver/pom.xml index f22f2f6b8..fc1e96ec0 100644 --- a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-parameterserver/pom.xml +++ b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-parameterserver/pom.xml @@ -73,7 +73,7 @@ test-nd4j-native - test-nd4j-cuda-10.1 + test-nd4j-cuda-10.2 diff --git a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/pom.xml b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/pom.xml index e70e61939..7b49dfce3 100644 --- a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/pom.xml +++ b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/pom.xml @@ -98,7 +98,7 @@ test-nd4j-native - test-nd4j-cuda-10.1 + test-nd4j-cuda-10.2 diff --git a/deeplearning4j/deeplearning4j-scaleout/spark/pom.xml b/deeplearning4j/deeplearning4j-scaleout/spark/pom.xml index a24676022..8a4fb02d5 100644 --- a/deeplearning4j/deeplearning4j-scaleout/spark/pom.xml +++ b/deeplearning4j/deeplearning4j-scaleout/spark/pom.xml @@ -181,7 +181,7 @@ test-nd4j-native - test-nd4j-cuda-10.1 + test-nd4j-cuda-10.2 diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-components/pom.xml b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-components/pom.xml index 88f94a5a1..2fe90e566 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-components/pom.xml +++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-components/pom.xml @@ -74,7 +74,7 @@ test-nd4j-native - test-nd4j-cuda-10.1 + test-nd4j-cuda-10.2 diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/pom.xml b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/pom.xml index dd8447a6a..b6e1f2f67 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/pom.xml +++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/pom.xml @@ -106,7 +106,7 @@ test-nd4j-native - test-nd4j-cuda-10.1 + test-nd4j-cuda-10.2 diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-standalone/pom.xml b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-standalone/pom.xml index 654e34dc1..1b85a1d87 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-standalone/pom.xml +++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-standalone/pom.xml @@ -32,7 +32,7 @@ test-nd4j-native - test-nd4j-cuda-10.1 + test-nd4j-cuda-10.2 diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui/pom.xml b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui/pom.xml index d829971b4..282867e7e 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui/pom.xml +++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui/pom.xml @@ -72,7 +72,7 @@ test-nd4j-native - test-nd4j-cuda-10.1 + test-nd4j-cuda-10.2 diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-vertx/pom.xml b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-vertx/pom.xml index 5e5ae75c1..3f37266c9 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-vertx/pom.xml +++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-vertx/pom.xml @@ -440,7 +440,7 @@ test-nd4j-native - test-nd4j-cuda-10.1 + test-nd4j-cuda-10.2 \ No newline at end of file diff --git a/deeplearning4j/deeplearning4j-ui-parent/pom.xml b/deeplearning4j/deeplearning4j-ui-parent/pom.xml index 087261f0c..70c32b984 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/pom.xml +++ b/deeplearning4j/deeplearning4j-ui-parent/pom.xml @@ -49,7 +49,7 @@ test-nd4j-native - test-nd4j-cuda-10.1 + test-nd4j-cuda-10.2 diff --git a/deeplearning4j/deeplearning4j-util/pom.xml b/deeplearning4j/deeplearning4j-util/pom.xml index 36845c54e..b49239a9e 100644 --- a/deeplearning4j/deeplearning4j-util/pom.xml +++ b/deeplearning4j/deeplearning4j-util/pom.xml @@ -52,7 +52,7 @@ test-nd4j-native - test-nd4j-cuda-10.1 + test-nd4j-cuda-10.2 diff --git a/deeplearning4j/deeplearning4j-zoo/pom.xml b/deeplearning4j/deeplearning4j-zoo/pom.xml index aec30b64e..976d7500b 100644 --- a/deeplearning4j/deeplearning4j-zoo/pom.xml +++ b/deeplearning4j/deeplearning4j-zoo/pom.xml @@ -78,7 +78,7 @@ test-nd4j-native - test-nd4j-cuda-10.1 + test-nd4j-cuda-10.2 diff --git a/deeplearning4j/dl4j-integration-tests/pom.xml b/deeplearning4j/dl4j-integration-tests/pom.xml index d38410fcd..27461c923 100644 --- a/deeplearning4j/dl4j-integration-tests/pom.xml +++ b/deeplearning4j/dl4j-integration-tests/pom.xml @@ -113,7 +113,7 @@ test-nd4j-native - test-nd4j-cuda-10.1 + test-nd4j-cuda-10.2 \ No newline at end of file diff --git a/deeplearning4j/dl4j-perf/pom.xml b/deeplearning4j/dl4j-perf/pom.xml index cfd0347be..239eead6b 100644 --- a/deeplearning4j/dl4j-perf/pom.xml +++ b/deeplearning4j/dl4j-perf/pom.xml @@ -122,7 +122,7 @@ test-nd4j-native - test-nd4j-cuda-10.1 + test-nd4j-cuda-10.2 diff --git a/deeplearning4j/pom.xml b/deeplearning4j/pom.xml index a139c4f44..f9b1eecce 100644 --- a/deeplearning4j/pom.xml +++ b/deeplearning4j/pom.xml @@ -226,7 +226,7 @@ ${skipBackendChoice} - test-nd4j-native,test-nd4j-cuda-10.1 + test-nd4j-native,test-nd4j-cuda-10.2 false @@ -501,7 +501,7 @@ - test-nd4j-cuda-10.1 + test-nd4j-cuda-10.2 false @@ -514,7 +514,7 @@ org.nd4j - nd4j-cuda-10.1 + nd4j-cuda-10.2 ${nd4j.version} test diff --git a/docs/deeplearning4j/templates/config-cudnn.md b/docs/deeplearning4j/templates/config-cudnn.md index 5044b3ca0..24f69da87 100644 --- a/docs/deeplearning4j/templates/config-cudnn.md +++ b/docs/deeplearning4j/templates/config-cudnn.md @@ -10,17 +10,8 @@ weight: 3 Deeplearning4j supports CUDA but can be further accelerated with cuDNN. Most 2D CNN layers (such as ConvolutionLayer, SubsamplingLayer, etc), and also LSTM and BatchNormalization layers support CuDNN. -The only thing we need to do to have DL4J load cuDNN is to add a dependency on `deeplearning4j-cuda-9.2`, `deeplearning4j-cuda-10.0`, or `deeplearning4j-cuda-10.1`, for example: +The only thing we need to do to have DL4J load cuDNN is to add a dependency on `deeplearning4j-cuda-10.0`, `deeplearning4j-cuda-10.1`, or `deeplearning4j-cuda-10.2` for example: -```xml - - org.deeplearning4j - deeplearning4j-cuda-9.2 - {{page.version}} - -``` - -or ```xml org.deeplearning4j @@ -38,6 +29,16 @@ or ``` +or +```xml + + org.deeplearning4j + deeplearning4j-cuda-10.2 + {{page.version}} + +``` + + The actual library for cuDNN is not bundled, so be sure to download and install the appropriate package for your platform from NVIDIA: * [NVIDIA cuDNN](https://developer.nvidia.com/cudnn) @@ -48,39 +49,20 @@ Note there are multiple combinations of cuDNN and CUDA supported. At this time t CUDA Version cuDNN Version - 9.27.2 10.07.4 10.17.6 + 10.27.6 - To install, simply extract the library to a directory found in the system path used by native libraries. The easiest way is to place it alongside other libraries from CUDA in the default directory (`/usr/local/cuda/lib64/` on Linux, `/usr/local/cuda/lib/` on Mac OS X, and `C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v9.2\bin\`, `C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v10.0\bin\`, or `C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v10.1\bin\` on Windows). + To install, simply extract the library to a directory found in the system path used by native libraries. The easiest way is to place it alongside other libraries from CUDA in the default directory (`/usr/local/cuda/lib64/` on Linux, `/usr/local/cuda/lib/` on Mac OS X, and `C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v10.0\bin\`, `C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v10.1\bin\`, or `C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v10.2\bin\` on Windows). -Alternatively, in the case of CUDA 10.1, cuDNN comes bundled with the "redist" package of the [JavaCPP Presets for CUDA](https://github.com/bytedeco/javacpp-presets/tree/master/cuda). [After agreeing to the license](https://github.com/bytedeco/javacpp-presets/tree/master/cuda#license-agreements), we can add the following dependencies instead of installing CUDA and cuDNN: +Alternatively, in the case of CUDA 10.2, cuDNN comes bundled with the "redist" package of the [JavaCPP Presets for CUDA](https://github.com/bytedeco/javacpp-presets/tree/master/cuda). [After agreeing to the license](https://github.com/bytedeco/javacpp-presets/tree/master/cuda#license-agreements), we can add the following dependencies instead of installing CUDA and cuDNN: org.bytedeco - cuda - 10.1-7.6-1.5.2 - linux-x86_64-redist - - - org.bytedeco - cuda - 10.1-7.6-1.5.2 - linux-ppc64le-redist - - - org.bytedeco - cuda - 10.1-7.6-1.5.2 - macosx-x86_64-redist - - - org.bytedeco - cuda - 10.1-7.6-1.5.2 - windows-x86_64-redist + cuda-platform-redist + 10.2-7.6-1.5.2 Also note that, by default, Deeplearning4j will use the fastest algorithms available according to cuDNN, but memory usage may be excessive, causing strange launch errors. When this happens, try to reduce memory usage by using the [`NO_WORKSPACE` mode settable via the network configuration](/api/{{page.version}}/org/deeplearning4j/nn/conf/layers/ConvolutionLayer.Builder.html#cudnnAlgoMode-org.deeplearning4j.nn.conf.layers.ConvolutionLayer.AlgoMode-), instead of the default of `ConvolutionLayer.AlgoMode.PREFER_FASTEST`, for example: diff --git a/libnd4j/pom.xml b/libnd4j/pom.xml index 3e766b944..374bc5640 100644 --- a/libnd4j/pom.xml +++ b/libnd4j/pom.xml @@ -64,7 +64,7 @@ - 10.1 + 10.2 7.6 release cpu diff --git a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda-platform/pom.xml b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda-platform/pom.xml index c99b496d1..027b49844 100644 --- a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda-platform/pom.xml +++ b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda-platform/pom.xml @@ -22,12 +22,12 @@ 4.0.0 - nd4j-cuda-10.1-platform + nd4j-cuda-10.2-platform nd4j-cuda-platform - 10.1 + 10.2 7.6 1.5.2 nd4j-cuda-${cuda.version} 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 df22d05ab..ec0eab208 100644 --- a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/pom.xml +++ b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/pom.xml @@ -22,12 +22,12 @@ 4.0.0 - nd4j-cuda-10.1 + nd4j-cuda-10.2 nd4j-cuda - 10.1 + 10.2 7.6 1.5.2 @@ -95,6 +95,17 @@ nd4j-native-api ${project.version} + + org.bytedeco + cuda + ${cuda.version}-${cudnn.version}-${javacpp-presets.cuda.version} + + + org.bytedeco + cuda + ${cuda.version}-${cudnn.version}-${javacpp-presets.cuda.version} + ${dependency.platform} + ${javacpp.platform} diff --git a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/nativeblas/Nd4jCuda.java b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/nativeblas/Nd4jCuda.java index cdfb45257..45a20bfbc 100644 --- a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/nativeblas/Nd4jCuda.java +++ b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/nativeblas/Nd4jCuda.java @@ -7627,9 +7627,9 @@ public static final int PREALLOC_SIZE = 33554432; * the given shape info buffer * represents a scalar shape */ - @Namespace("shape") public static native int isScalar(@Cast("Nd4jLong*") LongPointer info); - @Namespace("shape") public static native int isScalar(@Cast("Nd4jLong*") LongBuffer info); - @Namespace("shape") public static native int isScalar(@Cast("Nd4jLong*") long[] info); + @Namespace("shape") public static native int isScalar(@Cast("const Nd4jLong*") LongPointer info); + @Namespace("shape") public static native int isScalar(@Cast("const Nd4jLong*") LongBuffer info); + @Namespace("shape") public static native int isScalar(@Cast("const Nd4jLong*") long[] info); /** * Returns whether @@ -8033,6 +8033,9 @@ public static final int PREALLOC_SIZE = 33554432; @Namespace("shape") public static native void index2coords(@Cast("Nd4jLong") long index, int rank, @Cast("const Nd4jLong*") LongPointer shape, @Cast("Nd4jLong*") LongPointer coords); @Namespace("shape") public static native void index2coords(@Cast("Nd4jLong") long index, int rank, @Cast("const Nd4jLong*") LongBuffer shape, @Cast("Nd4jLong*") LongBuffer coords); @Namespace("shape") public static native void index2coords(@Cast("Nd4jLong") long index, int rank, @Cast("const Nd4jLong*") long[] shape, @Cast("Nd4jLong*") long[] coords); + @Namespace("shape") public static native void index2coords(@Cast("Nd4jLong") long index, int rank, @Cast("const Nd4jLong*") LongPointer shape, IntPointer coords); + @Namespace("shape") public static native void index2coords(@Cast("Nd4jLong") long index, int rank, @Cast("const Nd4jLong*") LongBuffer shape, IntBuffer coords); + @Namespace("shape") public static native void index2coords(@Cast("Nd4jLong") long index, int rank, @Cast("const Nd4jLong*") long[] shape, int[] coords); /** * take into account only dimensions stored in tadDims, tadDims must be sorted in increasing order! */ @@ -9127,6 +9130,8 @@ public static final int PREALLOC_SIZE = 33554432; ////////////////////////////////////////////////////////////////////// +////////////////////////////////////////////////////////////////////// + diff --git a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/nativeblas/Nd4jCudaPresets.java b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/nativeblas/Nd4jCudaPresets.java index 113960951..8c2109f7c 100644 --- a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/nativeblas/Nd4jCudaPresets.java +++ b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/nativeblas/Nd4jCudaPresets.java @@ -16,6 +16,10 @@ package org.nd4j.nativeblas; +import java.util.List; +import org.bytedeco.javacpp.ClassProperties; +import org.bytedeco.javacpp.LoadEnabled; +import org.bytedeco.javacpp.Loader; import org.bytedeco.javacpp.annotation.Platform; import org.bytedeco.javacpp.annotation.Properties; import org.bytedeco.javacpp.tools.Info; @@ -111,7 +115,42 @@ import org.bytedeco.javacpp.tools.InfoMapper; @Platform(value = "linux-arm64", preloadpath = {"/usr/aarch64-linux-gnu/lib/", "/usr/lib/aarch64-linux-gnu/"}), @Platform(value = "linux-ppc64", preloadpath = {"/usr/powerpc64-linux-gnu/lib/", "/usr/powerpc64le-linux-gnu/lib/", "/usr/lib/powerpc64-linux-gnu/", "/usr/lib/powerpc64le-linux-gnu/"}), @Platform(value = "windows", preload = {"libwinpthread-1", "libgcc_s_seh-1", "libgomp-1", "libstdc++-6", "libnd4jcpu"}) }) -public class Nd4jCudaPresets implements InfoMapper { +public class Nd4jCudaPresets implements LoadEnabled, InfoMapper { + + @Override public void init(ClassProperties properties) { + String platform = properties.getProperty("platform"); + List preloads = properties.get("platform.preload"); + List resources = properties.get("platform.preloadresource"); + + // Only apply this at load time since we don't want to copy the CUDA libraries here + if (!Loader.isLoadLibraries()) { + return; + } + int i = 0; + String[] libs = {"cudart", "cublasLt", "cublas", "cusolver", "cusparse", "cudnn"}; + for (String lib : libs) { + switch (platform) { + case "linux-arm64": + case "linux-ppc64le": + case "linux-x86_64": + case "macosx-x86_64": + lib += lib.equals("cudnn") ? "@.7" : lib.equals("cudart") ? "@.10.2" : "@.10"; + break; + case "windows-x86_64": + lib += lib.equals("cudnn") ? "64_7" : lib.equals("cudart") ? "64_102" : "64_10"; + break; + default: + continue; // no CUDA + } + if (!preloads.contains(lib)) { + preloads.add(i++, lib); + } + } + if (i > 0) { + resources.add("/org/bytedeco/cuda/"); + } + } + @Override public void map(InfoMap infoMap) { infoMap.put(new Info("thread_local", "ND4J_EXPORT", "INLINEDEF", "CUBLASWINAPI", "FORCEINLINE", diff --git a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/src/main/java/org/nd4j/nativeblas/Nd4jCpu.java b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/src/main/java/org/nd4j/nativeblas/Nd4jCpu.java index 85c1f92f4..ff1619490 100644 --- a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/src/main/java/org/nd4j/nativeblas/Nd4jCpu.java +++ b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/src/main/java/org/nd4j/nativeblas/Nd4jCpu.java @@ -7630,9 +7630,9 @@ public static final int PREALLOC_SIZE = 33554432; * the given shape info buffer * represents a scalar shape */ - @Namespace("shape") public static native int isScalar(@Cast("Nd4jLong*") LongPointer info); - @Namespace("shape") public static native int isScalar(@Cast("Nd4jLong*") LongBuffer info); - @Namespace("shape") public static native int isScalar(@Cast("Nd4jLong*") long[] info); + @Namespace("shape") public static native int isScalar(@Cast("const Nd4jLong*") LongPointer info); + @Namespace("shape") public static native int isScalar(@Cast("const Nd4jLong*") LongBuffer info); + @Namespace("shape") public static native int isScalar(@Cast("const Nd4jLong*") long[] info); /** * Returns whether @@ -8036,6 +8036,9 @@ public static final int PREALLOC_SIZE = 33554432; @Namespace("shape") public static native void index2coords(@Cast("Nd4jLong") long index, int rank, @Cast("const Nd4jLong*") LongPointer shape, @Cast("Nd4jLong*") LongPointer coords); @Namespace("shape") public static native void index2coords(@Cast("Nd4jLong") long index, int rank, @Cast("const Nd4jLong*") LongBuffer shape, @Cast("Nd4jLong*") LongBuffer coords); @Namespace("shape") public static native void index2coords(@Cast("Nd4jLong") long index, int rank, @Cast("const Nd4jLong*") long[] shape, @Cast("Nd4jLong*") long[] coords); + @Namespace("shape") public static native void index2coords(@Cast("Nd4jLong") long index, int rank, @Cast("const Nd4jLong*") LongPointer shape, IntPointer coords); + @Namespace("shape") public static native void index2coords(@Cast("Nd4jLong") long index, int rank, @Cast("const Nd4jLong*") LongBuffer shape, IntBuffer coords); + @Namespace("shape") public static native void index2coords(@Cast("Nd4jLong") long index, int rank, @Cast("const Nd4jLong*") long[] shape, int[] coords); /** * take into account only dimensions stored in tadDims, tadDims must be sorted in increasing order! */ @@ -9130,6 +9133,8 @@ public static final int PREALLOC_SIZE = 33554432; ////////////////////////////////////////////////////////////////////// +////////////////////////////////////////////////////////////////////// + diff --git a/nd4j/nd4j-backends/nd4j-tests-tensorflow/pom.xml b/nd4j/nd4j-backends/nd4j-tests-tensorflow/pom.xml index 0ad010efd..bc468c874 100644 --- a/nd4j/nd4j-backends/nd4j-tests-tensorflow/pom.xml +++ b/nd4j/nd4j-backends/nd4j-tests-tensorflow/pom.xml @@ -225,7 +225,7 @@ org.nd4j - nd4j-cuda-10.1 + nd4j-cuda-10.2 ${project.version} diff --git a/nd4j/nd4j-backends/nd4j-tests/pom.xml b/nd4j/nd4j-backends/nd4j-tests/pom.xml index 50fa24bf9..e6861d257 100644 --- a/nd4j/nd4j-backends/nd4j-tests/pom.xml +++ b/nd4j/nd4j-backends/nd4j-tests/pom.xml @@ -208,7 +208,7 @@ org.nd4j - nd4j-cuda-10.1 + nd4j-cuda-10.2 ${project.version} diff --git a/nd4j/nd4j-remote/nd4j-grpc-client/pom.xml b/nd4j/nd4j-remote/nd4j-grpc-client/pom.xml index 9dbdcbf24..93d171535 100644 --- a/nd4j/nd4j-remote/nd4j-grpc-client/pom.xml +++ b/nd4j/nd4j-remote/nd4j-grpc-client/pom.xml @@ -107,7 +107,7 @@ org.nd4j - nd4j-cuda-10.1 + nd4j-cuda-10.2 ${project.version} test diff --git a/nd4j/nd4j-remote/nd4j-json-server/pom.xml b/nd4j/nd4j-remote/nd4j-json-server/pom.xml index 47ef995a9..6c307f71c 100644 --- a/nd4j/nd4j-remote/nd4j-json-server/pom.xml +++ b/nd4j/nd4j-remote/nd4j-json-server/pom.xml @@ -163,7 +163,7 @@ org.nd4j - nd4j-cuda-10.1 + nd4j-cuda-10.2 ${project.version} test diff --git a/nd4j/nd4j-uberjar/pom.xml b/nd4j/nd4j-uberjar/pom.xml index bb61f0f70..c3398dea9 100644 --- a/nd4j/nd4j-uberjar/pom.xml +++ b/nd4j/nd4j-uberjar/pom.xml @@ -284,7 +284,7 @@ org.nd4j - nd4j-cuda-10.1 + nd4j-cuda-10.2 ${project.version} @@ -316,12 +316,12 @@ org.nd4j - nd4j-cuda-10.1 + nd4j-cuda-10.2 ${project.version} org.nd4j - nd4j-cuda-10.1-platform + nd4j-cuda-10.2-platform ${project.version} diff --git a/nd4s/pom.xml b/nd4s/pom.xml index f165cfae9..f10f8cf41 100644 --- a/nd4s/pom.xml +++ b/nd4s/pom.xml @@ -312,11 +312,11 @@ - test-nd4j-cuda-10.1 + test-nd4j-cuda-10.2 org.nd4j - nd4j-cuda-10.1 + nd4j-cuda-10.2 ${project.version} test diff --git a/rl4j/rl4j-core/pom.xml b/rl4j/rl4j-core/pom.xml index 67b050ba1..ebdfec1a6 100644 --- a/rl4j/rl4j-core/pom.xml +++ b/rl4j/rl4j-core/pom.xml @@ -127,7 +127,7 @@ org.nd4j - nd4j-cuda-10.1 + nd4j-cuda-10.2 ${project.version} test diff --git a/scalnet/pom.xml b/scalnet/pom.xml index a6e220280..39408dbf5 100644 --- a/scalnet/pom.xml +++ b/scalnet/pom.xml @@ -293,7 +293,7 @@ org.nd4j - nd4j-cuda-10.1 + nd4j-cuda-10.2 ${project.version} test