Brutex
/
cavis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add support for CUDA 10.2 (#89)

master
Samuel Audet 2019-11-29 14:31:03 +09:00 committed by Alex Black
parent 009007120b
commit 5e07998e59
89 changed files with 193 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arbiter/arbiter-core/pom.xml
View File

@ -91,7 +91,7 @@
<id>test-nd4j-native</id> <id>test-nd4j-native</id>
</profile> </profile>
<profile> <profile>
<id>test-nd4j-cuda-10.1</id> <id>test-nd4j-cuda-10.2</id>
</profile> </profile>
</profiles> </profiles>
</project> </project>

2
arbiter/arbiter-deeplearning4j/pom.xml
View File

@ -70,7 +70,7 @@
<id>test-nd4j-native</id> <id>test-nd4j-native</id>
</profile> </profile>
<profile> <profile>
<id>test-nd4j-cuda-10.1</id> <id>test-nd4j-cuda-10.2</id>
</profile> </profile>
</profiles> </profiles>
</project> </project>

2
arbiter/arbiter-server/pom.xml
View File

@ -56,7 +56,7 @@
<id>test-nd4j-native</id> <id>test-nd4j-native</id>
</profile> </profile>
<profile> <profile>
<id>test-nd4j-cuda-10.1</id> <id>test-nd4j-cuda-10.2</id>
</profile> </profile>
</profiles> </profiles>
</project> </project>

2
arbiter/arbiter-ui/pom.xml
View File

@ -37,7 +37,7 @@
<id>test-nd4j-native</id> <id>test-nd4j-native</id>
</profile> </profile>
<profile> <profile>
<id>test-nd4j-cuda-10.1</id> <id>test-nd4j-cuda-10.2</id>
</profile> </profile>
</profiles> </profiles>

6
arbiter/pom.xml
View File

@ -151,7 +151,7 @@
<skip>${skipTestResourceEnforcement}</skip> <skip>${skipTestResourceEnforcement}</skip>
<rules> <rules>
<requireActiveProfile> <requireActiveProfile>
<profiles>test-nd4j-native,test-nd4j-cuda-10.1</profiles> <profiles>test-nd4j-native,test-nd4j-cuda-10.2</profiles>
<all>false</all> <all>false</all>
</requireActiveProfile> </requireActiveProfile>
</rules> </rules>
@ -333,11 +333,11 @@
</profile> </profile>
<profile> <profile>
<id>test-nd4j-cuda-10.1</id> <id>test-nd4j-cuda-10.2</id>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.nd4j</groupId> <groupId>org.nd4j</groupId>
<artifactId>nd4j-cuda-10.1</artifactId> <artifactId>nd4j-cuda-10.2</artifactId>
<version>${nd4j.version}</version> <version>${nd4j.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>

6
change-cuda-versions.sh
View File

@ -20,7 +20,7 @@
set -e set -e
VALID_VERSIONS=( 9.2 10.0 10.1 ) VALID_VERSIONS=( 9.2 10.0 10.1 10.2 )
usage() { usage() {
echo "Usage: $(basename $0) [-h|--help] <cuda version to be used> echo "Usage: $(basename $0) [-h|--help] <cuda version to be used>
@ -47,6 +47,10 @@ check_cuda_version() {
check_cuda_version "$VERSION" check_cuda_version "$VERSION"
case $VERSION in case $VERSION in
10.2)
VERSION2="7.6"
VERSION3="1.5.2"
;;
10.1) 10.1)
VERSION2="7.6" VERSION2="7.6"
VERSION3="1.5.2" VERSION3="1.5.2"

2
datavec/datavec-api/pom.xml
View File

@ -117,7 +117,7 @@
<id>test-nd4j-native</id> <id>test-nd4j-native</id>
</profile> </profile>
<profile> <profile>
<id>test-nd4j-cuda-10.1</id> <id>test-nd4j-cuda-10.2</id>
</profile> </profile>
</profiles> </profiles>
</project> </project>

2
datavec/datavec-arrow/pom.xml
View File

@ -56,7 +56,7 @@
<id>test-nd4j-native</id> <id>test-nd4j-native</id>
</profile> </profile>
<profile> <profile>
<id>test-nd4j-cuda-10.1</id> <id>test-nd4j-cuda-10.2</id>
</profile> </profile>
</profiles> </profiles>
</project> </project>

2
datavec/datavec-camel/pom.xml
View File

@ -110,7 +110,7 @@
<id>test-nd4j-native</id> <id>test-nd4j-native</id>
</profile> </profile>
<profile> <profile>
<id>test-nd4j-cuda-10.1</id> <id>test-nd4j-cuda-10.2</id>
</profile> </profile>
</profiles> </profiles>
</project> </project>

2
datavec/datavec-data/datavec-data-audio/pom.xml
View File

@ -72,7 +72,7 @@
<id>test-nd4j-native</id> <id>test-nd4j-native</id>
</profile> </profile>
<profile> <profile>
<id>test-nd4j-cuda-10.1</id> <id>test-nd4j-cuda-10.2</id>
</profile> </profile>
</profiles> </profiles>
</project> </project>

2
datavec/datavec-data/datavec-data-codec/pom.xml
View File

@ -59,7 +59,7 @@
<id>test-nd4j-native</id> <id>test-nd4j-native</id>
</profile> </profile>
<profile> <profile>
<id>test-nd4j-cuda-10.1</id> <id>test-nd4j-cuda-10.2</id>
</profile> </profile>
</profiles> </profiles>
</project> </project>

2
datavec/datavec-data/datavec-data-image/pom.xml
View File

@ -126,7 +126,7 @@
<id>test-nd4j-native</id> <id>test-nd4j-native</id>
</profile> </profile>
<profile> <profile>
<id>test-nd4j-cuda-10.1</id> <id>test-nd4j-cuda-10.2</id>
</profile> </profile>
</profiles> </profiles>
</project> </project>

2
datavec/datavec-data/datavec-data-nlp/pom.xml
View File

@ -67,7 +67,7 @@
<id>test-nd4j-native</id> <id>test-nd4j-native</id>
</profile> </profile>
<profile> <profile>
<id>test-nd4j-cuda-10.1</id> <id>test-nd4j-cuda-10.2</id>
</profile> </profile>
</profiles> </profiles>
</project> </project>

2
datavec/datavec-data/pom.xml
View File

@ -58,7 +58,7 @@
<id>test-nd4j-native</id> <id>test-nd4j-native</id>
</profile> </profile>
<profile> <profile>
<id>test-nd4j-cuda-10.1</id> <id>test-nd4j-cuda-10.2</id>
</profile> </profile>
</profiles> </profiles>

2
datavec/datavec-excel/pom.xml
View File

@ -58,7 +58,7 @@
<id>test-nd4j-native</id> <id>test-nd4j-native</id>
</profile> </profile>
<profile> <profile>
<id>test-nd4j-cuda-10.1</id> <id>test-nd4j-cuda-10.2</id>
</profile> </profile>
</profiles> </profiles>
</project> </project>

2
datavec/datavec-geo/pom.xml
View File

@ -49,7 +49,7 @@
<id>test-nd4j-native</id> <id>test-nd4j-native</id>
</profile> </profile>
<profile> <profile>
<id>test-nd4j-cuda-10.1</id> <id>test-nd4j-cuda-10.2</id>
</profile> </profile>
</profiles> </profiles>
</project> </project>

2
datavec/datavec-hadoop/pom.xml
View File

@ -67,7 +67,7 @@
<id>test-nd4j-native</id> <id>test-nd4j-native</id>
</profile> </profile>
<profile> <profile>
<id>test-nd4j-cuda-10.1</id> <id>test-nd4j-cuda-10.2</id>
</profile> </profile>
</profiles> </profiles>
</project> </project>

2
datavec/datavec-jdbc/pom.xml
View File

@ -65,7 +65,7 @@
<id>test-nd4j-native</id> <id>test-nd4j-native</id>
</profile> </profile>
<profile> <profile>
<id>test-nd4j-cuda-10.1</id> <id>test-nd4j-cuda-10.2</id>
</profile> </profile>
</profiles> </profiles>
</project> </project>

2
datavec/datavec-local/pom.xml
View File

@ -88,7 +88,7 @@
<id>test-nd4j-native</id> <id>test-nd4j-native</id>
</profile> </profile>
<profile> <profile>
<id>test-nd4j-cuda-10.1</id> <id>test-nd4j-cuda-10.2</id>
</profile> </profile>
</profiles> </profiles>
</project> </project>

2
datavec/datavec-perf/pom.xml
View File

@ -59,7 +59,7 @@
<id>test-nd4j-native</id> <id>test-nd4j-native</id>
</profile> </profile>
<profile> <profile>
<id>test-nd4j-cuda-10.1</id> <id>test-nd4j-cuda-10.2</id>
</profile> </profile>
</profiles> </profiles>
</project> </project>

2
datavec/datavec-python/pom.xml
View File

@ -65,7 +65,7 @@
<id>test-nd4j-native</id> <id>test-nd4j-native</id>
</profile> </profile>
<profile> <profile>
<id>test-nd4j-cuda-10.1</id> <id>test-nd4j-cuda-10.2</id>
</profile> </profile>
</profiles> </profiles>
</project> </project>

2
datavec/datavec-spark-inference-parent/datavec-spark-inference-client/pom.xml
View File

@ -58,7 +58,7 @@
<id>test-nd4j-native</id> <id>test-nd4j-native</id>
</profile> </profile>
<profile> <profile>
<id>test-nd4j-cuda-10.1</id> <id>test-nd4j-cuda-10.2</id>
</profile> </profile>
</profiles> </profiles>
</project> </project>

2
datavec/datavec-spark-inference-parent/datavec-spark-inference-model/pom.xml
View File

@ -52,7 +52,7 @@
<id>test-nd4j-native</id> <id>test-nd4j-native</id>
</profile> </profile>
<profile> <profile>
<id>test-nd4j-cuda-10.1</id> <id>test-nd4j-cuda-10.2</id>
</profile> </profile>
</profiles> </profiles>
</project> </project>

2
datavec/datavec-spark-inference-parent/datavec-spark-inference-server/pom.xml
View File

@ -171,7 +171,7 @@
<id>test-nd4j-native</id> <id>test-nd4j-native</id>
</profile> </profile>
<profile> <profile>
<id>test-nd4j-cuda-10.1</id> <id>test-nd4j-cuda-10.2</id>
</profile> </profile>
</profiles> </profiles>
</project> </project>

2
datavec/datavec-spark-inference-parent/pom.xml
View File

@ -38,7 +38,7 @@
<id>test-nd4j-native</id> <id>test-nd4j-native</id>
</profile> </profile>
<profile> <profile>
<id>test-nd4j-cuda-10.1</id> <id>test-nd4j-cuda-10.2</id>
</profile> </profile>
</profiles> </profiles>
</project> </project>

2
datavec/datavec-spark/pom.xml
View File

@ -138,7 +138,7 @@
<id>test-nd4j-native</id> <id>test-nd4j-native</id>
</profile> </profile>
<profile> <profile>
<id>test-nd4j-cuda-10.1</id> <id>test-nd4j-cuda-10.2</id>
</profile> </profile>
</profiles> </profiles>
</project> </project>

6
datavec/pom.xml
View File

@ -112,7 +112,7 @@
<skip>${skipTestResourceEnforcement}</skip> <skip>${skipTestResourceEnforcement}</skip>
<rules> <rules>
<requireActiveProfile> <requireActiveProfile>
<profiles>test-nd4j-native,test-nd4j-cuda-10.1</profiles> <profiles>test-nd4j-native,test-nd4j-cuda-10.2</profiles>
<all>false</all> <all>false</all>
</requireActiveProfile> </requireActiveProfile>
</rules> </rules>
@ -365,11 +365,11 @@
</profile> </profile>
<profile> <profile>
<id>test-nd4j-cuda-10.1</id> <id>test-nd4j-cuda-10.2</id>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.nd4j</groupId> <groupId>org.nd4j</groupId>
<artifactId>nd4j-cuda-10.1</artifactId> <artifactId>nd4j-cuda-10.2</artifactId>
<version>${nd4j.version}</version> <version>${nd4j.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>

2
deeplearning4j/deeplearning4j-common/pom.xml
View File

@ -40,7 +40,7 @@
<id>test-nd4j-native</id> <id>test-nd4j-native</id>
</profile> </profile>
<profile> <profile>
<id>test-nd4j-cuda-10.1</id> <id>test-nd4j-cuda-10.2</id>
</profile> </profile>
</profiles> </profiles>

4
deeplearning4j/deeplearning4j-core/pom.xml
View File

@ -163,11 +163,11 @@
</profile> </profile>
<profile> <profile>
<id>test-nd4j-cuda-10.1</id> <id>test-nd4j-cuda-10.2</id>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.nd4j</groupId> <groupId>org.nd4j</groupId>
<artifactId>nd4j-cuda-10.1</artifactId> <artifactId>nd4j-cuda-10.2</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>

6
deeplearning4j/deeplearning4j-cuda/pom.xml
View File

@ -16,7 +16,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>deeplearning4j-cuda-10.1</artifactId> <artifactId>deeplearning4j-cuda-10.2</artifactId>
<name>deeplearning4j-cuda</name> <name>deeplearning4j-cuda</name>
<parent> <parent>
<groupId>org.deeplearning4j</groupId> <groupId>org.deeplearning4j</groupId>
@ -26,7 +26,7 @@
<properties> <properties>
<!-- CUDA version is linked with the artifact name so cannot move to parent pom.xml --> <!-- CUDA version is linked with the artifact name so cannot move to parent pom.xml -->
<cuda.version>10.1</cuda.version> <cuda.version>10.2</cuda.version>
<cudnn.version>7.6</cudnn.version> <cudnn.version>7.6</cudnn.version>
<javacpp-presets.cuda.version>1.5.2</javacpp-presets.cuda.version> <javacpp-presets.cuda.version>1.5.2</javacpp-presets.cuda.version>
</properties> </properties>
@ -106,7 +106,7 @@
</build> </build>
</profile> </profile>
<profile> <profile>
<id>test-nd4j-cuda-10.1</id> <id>test-nd4j-cuda-10.2</id>
</profile> </profile>
</profiles> </profiles>

2
deeplearning4j/deeplearning4j-data/deeplearning4j-datasets/pom.xml
View File

@ -51,7 +51,7 @@
<id>test-nd4j-native</id> <id>test-nd4j-native</id>
</profile> </profile>
<profile> <profile>
<id>test-nd4j-cuda-10.1</id> <id>test-nd4j-cuda-10.2</id>
</profile> </profile>
</profiles> </profiles>

2
deeplearning4j/deeplearning4j-data/deeplearning4j-datavec-iterators/pom.xml
View File

@ -46,7 +46,7 @@
<id>test-nd4j-native</id> <id>test-nd4j-native</id>
</profile> </profile>
<profile> <profile>
<id>test-nd4j-cuda-10.1</id> <id>test-nd4j-cuda-10.2</id>
</profile> </profile>
</profiles> </profiles>
</project> </project>

2
deeplearning4j/deeplearning4j-data/deeplearning4j-utility-iterators/pom.xml
View File

@ -48,7 +48,7 @@
<id>test-nd4j-native</id> <id>test-nd4j-native</id>
</profile> </profile>
<profile> <profile>
<id>test-nd4j-cuda-10.1</id> <id>test-nd4j-cuda-10.2</id>
</profile> </profile>
</profiles> </profiles>
</project> </project>

2
deeplearning4j/deeplearning4j-data/pom.xml
View File

@ -38,7 +38,7 @@
<id>test-nd4j-native</id> <id>test-nd4j-native</id>
</profile> </profile>
<profile> <profile>
<id>test-nd4j-cuda-10.1</id> <id>test-nd4j-cuda-10.2</id>
</profile> </profile>
</profiles> </profiles>

4
deeplearning4j/deeplearning4j-dataimport-solrj/pom.xml
View File

@ -116,11 +116,11 @@
</profile> </profile>
<profile> <profile>
<id>test-nd4j-cuda-10.1</id> <id>test-nd4j-cuda-10.2</id>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.nd4j</groupId> <groupId>org.nd4j</groupId>
<artifactId>nd4j-cuda-10.1</artifactId> <artifactId>nd4j-cuda-10.2</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>

2
deeplearning4j/deeplearning4j-graph/pom.xml
View File

@ -58,7 +58,7 @@
<id>test-nd4j-native</id> <id>test-nd4j-native</id>
</profile> </profile>
<profile> <profile>
<id>test-nd4j-cuda-10.1</id> <id>test-nd4j-cuda-10.2</id>
</profile> </profile>
</profiles> </profiles>

2
deeplearning4j/deeplearning4j-manifold/deeplearning4j-tsne/pom.xml
View File

@ -62,7 +62,7 @@
<id>test-nd4j-native</id> <id>test-nd4j-native</id>
</profile> </profile>
<profile> <profile>
<id>test-nd4j-cuda-10.1</id> <id>test-nd4j-cuda-10.2</id>
</profile> </profile>
</profiles> </profiles>
</project> </project>

2
deeplearning4j/deeplearning4j-manifold/pom.xml
View File

@ -41,7 +41,7 @@
<id>test-nd4j-native</id> <id>test-nd4j-native</id>
</profile> </profile>
<profile> <profile>
<id>test-nd4j-cuda-10.1</id> <id>test-nd4j-cuda-10.2</id>
</profile> </profile>
</profiles> </profiles>
</project> </project>

4
deeplearning4j/deeplearning4j-modelexport-solr/pom.xml
View File

@ -302,11 +302,11 @@
</profile> </profile>
<profile> <profile>
<id>test-nd4j-cuda-10.1</id> <id>test-nd4j-cuda-10.2</id>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.nd4j</groupId> <groupId>org.nd4j</groupId>
<artifactId>nd4j-cuda-10.1</artifactId> <artifactId>nd4j-cuda-10.2</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>

4
deeplearning4j/deeplearning4j-modelimport/pom.xml
View File

@ -115,11 +115,11 @@
</profile> </profile>
<profile> <profile>
<id>test-nd4j-cuda-10.1</id> <id>test-nd4j-cuda-10.2</id>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.nd4j</groupId> <groupId>org.nd4j</groupId>
<artifactId>nd4j-cuda-10.1</artifactId> <artifactId>nd4j-cuda-10.2</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>

4
deeplearning4j/deeplearning4j-nearestneighbors-parent/deeplearning4j-nearestneighbor-server/pom.xml
View File

@ -119,11 +119,11 @@
</profile> </profile>
<profile> <profile>
<id>test-nd4j-cuda-10.1</id> <id>test-nd4j-cuda-10.2</id>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.nd4j</groupId> <groupId>org.nd4j</groupId>
<artifactId>nd4j-cuda-10.1</artifactId> <artifactId>nd4j-cuda-10.2</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>

2
deeplearning4j/deeplearning4j-nearestneighbors-parent/deeplearning4j-nearestneighbors-client/pom.xml
View File

@ -54,7 +54,7 @@
<id>test-nd4j-native</id> <id>test-nd4j-native</id>
</profile> </profile>
<profile> <profile>
<id>test-nd4j-cuda-10.1</id> <id>test-nd4j-cuda-10.2</id>
</profile> </profile>
</profiles> </profiles>
</project> </project>

2
deeplearning4j/deeplearning4j-nearestneighbors-parent/deeplearning4j-nearestneighbors-model/pom.xml
View File

@ -53,7 +53,7 @@
<id>test-nd4j-native</id> <id>test-nd4j-native</id>
</profile> </profile>
<profile> <profile>
<id>test-nd4j-cuda-10.1</id> <id>test-nd4j-cuda-10.2</id>
</profile> </profile>
</profiles> </profiles>
</project> </project>

4
deeplearning4j/deeplearning4j-nearestneighbors-parent/nearestneighbor-core/pom.xml
View File

@ -83,11 +83,11 @@
</profile> </profile>
<profile> <profile>
<id>test-nd4j-cuda-10.1</id> <id>test-nd4j-cuda-10.2</id>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.nd4j</groupId> <groupId>org.nd4j</groupId>
<artifactId>nd4j-cuda-10.1</artifactId> <artifactId>nd4j-cuda-10.2</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>

2
deeplearning4j/deeplearning4j-nearestneighbors-parent/pom.xml
View File

@ -44,7 +44,7 @@
<id>test-nd4j-native</id> <id>test-nd4j-native</id>
</profile> </profile>
<profile> <profile>
<id>test-nd4j-cuda-10.1</id> <id>test-nd4j-cuda-10.2</id>
</profile> </profile>
</profiles> </profiles>
</project> </project>

2
deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-chinese/pom.xml
View File

@ -66,7 +66,7 @@
<id>test-nd4j-native</id> <id>test-nd4j-native</id>
</profile> </profile>
<profile> <profile>
<id>test-nd4j-cuda-10.1</id> <id>test-nd4j-cuda-10.2</id>
</profile> </profile>
</profiles> </profiles>

2
deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-japanese/pom.xml
View File

@ -68,7 +68,7 @@
<id>test-nd4j-native</id> <id>test-nd4j-native</id>
</profile> </profile>
<profile> <profile>
<id>test-nd4j-cuda-10.1</id> <id>test-nd4j-cuda-10.2</id>
</profile> </profile>
</profiles> </profiles>

2
deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-korean/pom.xml
View File

@ -61,7 +61,7 @@
<id>test-nd4j-native</id> <id>test-nd4j-native</id>
</profile> </profile>
<profile> <profile>
<id>test-nd4j-cuda-10.1</id> <id>test-nd4j-cuda-10.2</id>
</profile> </profile>
</profiles> </profiles>

2
deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/pom.xml
View File

@ -79,7 +79,7 @@
<id>test-nd4j-native</id> <id>test-nd4j-native</id>
</profile> </profile>
<profile> <profile>
<id>test-nd4j-cuda-10.1</id> <id>test-nd4j-cuda-10.2</id>
</profile> </profile>
</profiles> </profiles>

2
deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/pom.xml
View File

@ -84,7 +84,7 @@
<id>test-nd4j-native</id> <id>test-nd4j-native</id>
</profile> </profile>
<profile> <profile>
<id>test-nd4j-cuda-10.1</id> <id>test-nd4j-cuda-10.2</id>
</profile> </profile>
</profiles> </profiles>

2
deeplearning4j/deeplearning4j-nlp-parent/pom.xml
View File

@ -42,7 +42,7 @@
<id>test-nd4j-native</id> <id>test-nd4j-native</id>
</profile> </profile>
<profile> <profile>
<id>test-nd4j-cuda-10.1</id> <id>test-nd4j-cuda-10.2</id>
</profile> </profile>
</profiles> </profiles>

2
deeplearning4j/deeplearning4j-nn/pom.xml
View File

@ -124,7 +124,7 @@
<id>test-nd4j-native</id> <id>test-nd4j-native</id>
</profile> </profile>
<profile> <profile>
<id>test-nd4j-cuda-10.1</id> <id>test-nd4j-cuda-10.2</id>
</profile> </profile>
</profiles> </profiles>

4
deeplearning4j/deeplearning4j-remote/deeplearning4j-json-server/pom.xml
View File

@ -93,14 +93,14 @@
</profile> </profile>
<profile> <profile>
<id>test-nd4j-cuda-10.1</id> <id>test-nd4j-cuda-10.2</id>
<activation> <activation>
<activeByDefault>false</activeByDefault> <activeByDefault>false</activeByDefault>
</activation> </activation>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.nd4j</groupId> <groupId>org.nd4j</groupId>
<artifactId>nd4j-cuda-10.1</artifactId> <artifactId>nd4j-cuda-10.2</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>

2
deeplearning4j/deeplearning4j-remote/pom.xml
View File

@ -24,7 +24,7 @@
<id>test-nd4j-native</id> <id>test-nd4j-native</id>
</profile> </profile>
<profile> <profile>
<id>test-nd4j-cuda-10.1</id> <id>test-nd4j-cuda-10.2</id>
</profile> </profile>
</profiles> </profiles>
</project> </project>

2
deeplearning4j/deeplearning4j-scaleout/deeplearning4j-aws/pom.xml
View File

@ -93,7 +93,7 @@
<id>test-nd4j-native</id> <id>test-nd4j-native</id>
</profile> </profile>
<profile> <profile>
<id>test-nd4j-cuda-10.1</id> <id>test-nd4j-cuda-10.2</id>
</profile> </profile>
</profiles> </profiles>
</project> </project>

4
deeplearning4j/deeplearning4j-scaleout/deeplearning4j-scaleout-parallelwrapper-parameter-server/pom.xml
View File

@ -102,11 +102,11 @@
</profile> </profile>
<profile> <profile>
<id>test-nd4j-cuda-10.1</id> <id>test-nd4j-cuda-10.2</id>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.nd4j</groupId> <groupId>org.nd4j</groupId>
<artifactId>nd4j-cuda-10.1</artifactId> <artifactId>nd4j-cuda-10.2</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>

2
deeplearning4j/deeplearning4j-scaleout/deeplearning4j-scaleout-parallelwrapper/pom.xml
View File

@ -97,7 +97,7 @@
<id>test-nd4j-native</id> <id>test-nd4j-native</id>
</profile> </profile>
<profile> <profile>
<id>test-nd4j-cuda-10.1</id> <id>test-nd4j-cuda-10.2</id>
</profile> </profile>
</profiles> </profiles>

2
deeplearning4j/deeplearning4j-scaleout/pom.xml
View File

@ -39,7 +39,7 @@
<id>test-nd4j-native</id> <id>test-nd4j-native</id>
</profile> </profile>
<profile> <profile>
<id>test-nd4j-cuda-10.1</id> <id>test-nd4j-cuda-10.2</id>
</profile> </profile>
</profiles> </profiles>

2
deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp-java8/pom.xml
View File

@ -67,7 +67,7 @@
<id>test-nd4j-native</id> <id>test-nd4j-native</id>
</profile> </profile>
<profile> <profile>
<id>test-nd4j-cuda-10.1</id> <id>test-nd4j-cuda-10.2</id>
</profile> </profile>
</profiles> </profiles>

2
deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/pom.xml
View File

@ -72,7 +72,7 @@
<id>test-nd4j-native</id> <id>test-nd4j-native</id>
</profile> </profile>
<profile> <profile>
<id>test-nd4j-cuda-10.1</id> <id>test-nd4j-cuda-10.2</id>
</profile> </profile>
</profiles> </profiles>

2
deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-parameterserver/pom.xml
View File

@ -73,7 +73,7 @@
<id>test-nd4j-native</id> <id>test-nd4j-native</id>
</profile> </profile>
<profile> <profile>
<id>test-nd4j-cuda-10.1</id> <id>test-nd4j-cuda-10.2</id>
</profile> </profile>
</profiles> </profiles>

2
deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/pom.xml
View File

@ -98,7 +98,7 @@
<id>test-nd4j-native</id> <id>test-nd4j-native</id>
</profile> </profile>
<profile> <profile>
<id>test-nd4j-cuda-10.1</id> <id>test-nd4j-cuda-10.2</id>
</profile> </profile>
</profiles> </profiles>

2
deeplearning4j/deeplearning4j-scaleout/spark/pom.xml
View File

@ -181,7 +181,7 @@
<id>test-nd4j-native</id> <id>test-nd4j-native</id>
</profile> </profile>
<profile> <profile>
<id>test-nd4j-cuda-10.1</id> <id>test-nd4j-cuda-10.2</id>
</profile> </profile>
</profiles> </profiles>
</project> </project>

2
deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-components/pom.xml
View File

@ -74,7 +74,7 @@
<id>test-nd4j-native</id> <id>test-nd4j-native</id>
</profile> </profile>
<profile> <profile>
<id>test-nd4j-cuda-10.1</id> <id>test-nd4j-cuda-10.2</id>
</profile> </profile>
</profiles> </profiles>

2
deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/pom.xml
View File

@ -106,7 +106,7 @@
<id>test-nd4j-native</id> <id>test-nd4j-native</id>
</profile> </profile>
<profile> <profile>
<id>test-nd4j-cuda-10.1</id> <id>test-nd4j-cuda-10.2</id>
</profile> </profile>
</profiles> </profiles>

2
deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-standalone/pom.xml
View File

@ -32,7 +32,7 @@
<id>test-nd4j-native</id> <id>test-nd4j-native</id>
</profile> </profile>
<profile> <profile>
<id>test-nd4j-cuda-10.1</id> <id>test-nd4j-cuda-10.2</id>
</profile> </profile>
</profiles> </profiles>

2
deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui/pom.xml
View File

@ -72,7 +72,7 @@
<id>test-nd4j-native</id> <id>test-nd4j-native</id>
</profile> </profile>
<profile> <profile>
<id>test-nd4j-cuda-10.1</id> <id>test-nd4j-cuda-10.2</id>
</profile> </profile>
</profiles> </profiles>

2
deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-vertx/pom.xml
View File

@ -440,7 +440,7 @@
<id>test-nd4j-native</id> <id>test-nd4j-native</id>
</profile> </profile>
<profile> <profile>
<id>test-nd4j-cuda-10.1</id> <id>test-nd4j-cuda-10.2</id>
</profile> </profile>
</profiles> </profiles>
</project> </project>

2
deeplearning4j/deeplearning4j-ui-parent/pom.xml
View File

@ -49,7 +49,7 @@
<id>test-nd4j-native</id> <id>test-nd4j-native</id>
</profile> </profile>
<profile> <profile>
<id>test-nd4j-cuda-10.1</id> <id>test-nd4j-cuda-10.2</id>
</profile> </profile>
</profiles> </profiles>

2
deeplearning4j/deeplearning4j-util/pom.xml
View File

@ -52,7 +52,7 @@
<id>test-nd4j-native</id> <id>test-nd4j-native</id>
</profile> </profile>
<profile> <profile>
<id>test-nd4j-cuda-10.1</id> <id>test-nd4j-cuda-10.2</id>
</profile> </profile>
</profiles> </profiles>
</project> </project>

2
deeplearning4j/deeplearning4j-zoo/pom.xml
View File

@ -78,7 +78,7 @@
<id>test-nd4j-native</id> <id>test-nd4j-native</id>
</profile> </profile>
<profile> <profile>
<id>test-nd4j-cuda-10.1</id> <id>test-nd4j-cuda-10.2</id>
</profile> </profile>
</profiles> </profiles>

2
deeplearning4j/dl4j-integration-tests/pom.xml
View File

@ -113,7 +113,7 @@
<id>test-nd4j-native</id> <id>test-nd4j-native</id>
</profile> </profile>
<profile> <profile>
<id>test-nd4j-cuda-10.1</id> <id>test-nd4j-cuda-10.2</id>
</profile> </profile>
</profiles> </profiles>
</project> </project>

2
deeplearning4j/dl4j-perf/pom.xml
View File

@ -122,7 +122,7 @@
<id>test-nd4j-native</id> <id>test-nd4j-native</id>
</profile> </profile>
<profile> <profile>
<id>test-nd4j-cuda-10.1</id> <id>test-nd4j-cuda-10.2</id>
</profile> </profile>
</profiles> </profiles>
</project> </project>

6
deeplearning4j/pom.xml
View File

@ -226,7 +226,7 @@
<skip>${skipBackendChoice}</skip> <skip>${skipBackendChoice}</skip>
<rules> <rules>
<requireActiveProfile> <requireActiveProfile>
<profiles>test-nd4j-native,test-nd4j-cuda-10.1</profiles> <profiles>test-nd4j-native,test-nd4j-cuda-10.2</profiles>
<all>false</all> <all>false</all>
</requireActiveProfile> </requireActiveProfile>
</rules> </rules>
@ -501,7 +501,7 @@
</profile> </profile>
<!-- For running unit tests with nd4j-cuda-8.0: "mvn clean test -P test-nd4j-cuda-8.0" --> <!-- For running unit tests with nd4j-cuda-8.0: "mvn clean test -P test-nd4j-cuda-8.0" -->
<profile> <profile>
<id>test-nd4j-cuda-10.1</id> <id>test-nd4j-cuda-10.2</id>
<activation> <activation>
<activeByDefault>false</activeByDefault> <activeByDefault>false</activeByDefault>
</activation> </activation>
@ -514,7 +514,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.nd4j</groupId> <groupId>org.nd4j</groupId>
<artifactId>nd4j-cuda-10.1</artifactId> <artifactId>nd4j-cuda-10.2</artifactId>
<version>${nd4j.version}</version> <version>${nd4j.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>

50
docs/deeplearning4j/templates/config-cudnn.md
View File

@ -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. 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
<dependency>
<groupId>org.deeplearning4j</groupId>
<artifactId>deeplearning4j-cuda-9.2</artifactId>
<version>{{page.version}}</version>
</dependency>
```
or
```xml ```xml
<dependency> <dependency>
<groupId>org.deeplearning4j</groupId> <groupId>org.deeplearning4j</groupId>
@ -38,6 +29,16 @@ or
</dependency> </dependency>
``` ```
or
```xml
<dependency>
<groupId>org.deeplearning4j</groupId>
<artifactId>deeplearning4j-cuda-10.2</artifactId>
<version>{{page.version}}</version>
</dependency>
```
The actual library for cuDNN is not bundled, so be sure to download and install the appropriate package for your platform from NVIDIA: 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) * [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
<th>CUDA Version</th> <th>CUDA Version</th>
<th>cuDNN Version</th> <th>cuDNN Version</th>
</tr> </tr>
<tr><td>9.2</td><td>7.2</td></tr>
<tr><td>10.0</td><td>7.4</td></tr> <tr><td>10.0</td><td>7.4</td></tr>
<tr><td>10.1</td><td>7.6</td></tr> <tr><td>10.1</td><td>7.6</td></tr>
<tr><td>10.2</td><td>7.6</td></tr>
</table> </table>
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:
<dependency> <dependency>
<groupId>org.bytedeco</groupId> <groupId>org.bytedeco</groupId>
<artifactId>cuda</artifactId> <artifactId>cuda-platform-redist</artifactId>
<version>10.1-7.6-1.5.2</version> <version>10.2-7.6-1.5.2</version>
<classifier>linux-x86_64-redist</classifier>
</dependency>
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>cuda</artifactId>
<version>10.1-7.6-1.5.2</version>
<classifier>linux-ppc64le-redist</classifier>
</dependency>
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>cuda</artifactId>
<version>10.1-7.6-1.5.2</version>
<classifier>macosx-x86_64-redist</classifier>
</dependency>
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>cuda</artifactId>
<version>10.1-7.6-1.5.2</version>
<classifier>windows-x86_64-redist</classifier>
</dependency> </dependency>
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: 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:

2
libnd4j/pom.xml
View File

@ -64,7 +64,7 @@
<properties> <properties>
<!-- CUDA version is linked with the artifact name so cannot move to parent pom.xml --> <!-- CUDA version is linked with the artifact name so cannot move to parent pom.xml -->
<cuda.version>10.1</cuda.version> <cuda.version>10.2</cuda.version>
<cudnn.version>7.6</cudnn.version> <cudnn.version>7.6</cudnn.version>
<libnd4j.build>release</libnd4j.build> <libnd4j.build>release</libnd4j.build>
<libnd4j.chip>cpu</libnd4j.chip> <libnd4j.chip>cpu</libnd4j.chip>

4
nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda-platform/pom.xml
View File

@ -22,12 +22,12 @@
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>nd4j-cuda-10.1-platform</artifactId> <artifactId>nd4j-cuda-10.2-platform</artifactId>
<name>nd4j-cuda-platform</name> <name>nd4j-cuda-platform</name>
<properties> <properties>
<!-- CUDA version is linked with the artifact name so cannot move to parent pom.xml --> <!-- CUDA version is linked with the artifact name so cannot move to parent pom.xml -->
<cuda.version>10.1</cuda.version> <cuda.version>10.2</cuda.version>
<cudnn.version>7.6</cudnn.version> <cudnn.version>7.6</cudnn.version>
<javacpp-presets.cuda.version>1.5.2</javacpp-presets.cuda.version> <javacpp-presets.cuda.version>1.5.2</javacpp-presets.cuda.version>
<nd4j.backend>nd4j-cuda-${cuda.version}</nd4j.backend> <nd4j.backend>nd4j-cuda-${cuda.version}</nd4j.backend>

15
nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/pom.xml
View File

@ -22,12 +22,12 @@
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>nd4j-cuda-10.1</artifactId> <artifactId>nd4j-cuda-10.2</artifactId>
<name>nd4j-cuda</name> <name>nd4j-cuda</name>
<properties> <properties>
<!-- CUDA version is linked with the artifact name so cannot move to parent pom.xml --> <!-- CUDA version is linked with the artifact name so cannot move to parent pom.xml -->
<cuda.version>10.1</cuda.version> <cuda.version>10.2</cuda.version>
<cudnn.version>7.6</cudnn.version> <cudnn.version>7.6</cudnn.version>
<javacpp-presets.cuda.version>1.5.2</javacpp-presets.cuda.version> <javacpp-presets.cuda.version>1.5.2</javacpp-presets.cuda.version>
</properties> </properties>
@ -95,6 +95,17 @@
<artifactId>nd4j-native-api</artifactId> <artifactId>nd4j-native-api</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>cuda</artifactId>
<version>${cuda.version}-${cudnn.version}-${javacpp-presets.cuda.version}</version>
</dependency>
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>cuda</artifactId>
<version>${cuda.version}-${cudnn.version}-${javacpp-presets.cuda.version}</version>
<classifier>${dependency.platform}</classifier>
</dependency>
</dependencies> </dependencies>
<configuration> <configuration>
<properties>${javacpp.platform}</properties> <properties>${javacpp.platform}</properties>

11
nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/nativeblas/Nd4jCuda.java
View File

@ -7627,9 +7627,9 @@ public static final int PREALLOC_SIZE = 33554432;
* the given shape info buffer * the given shape info buffer
* represents a scalar shape * represents a scalar shape
*/ */
@Namespace("shape") public static native int isScalar(@Cast("Nd4jLong*") LongPointer info); @Namespace("shape") public static native int isScalar(@Cast("const Nd4jLong*") LongPointer info);
@Namespace("shape") public static native int isScalar(@Cast("Nd4jLong*") LongBuffer info); @Namespace("shape") public static native int isScalar(@Cast("const Nd4jLong*") LongBuffer info);
@Namespace("shape") public static native int isScalar(@Cast("Nd4jLong*") long[] info); @Namespace("shape") public static native int isScalar(@Cast("const Nd4jLong*") long[] info);
/** /**
* Returns whether * 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*") 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*") 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*") 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! * 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;
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////

41
nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/nativeblas/Nd4jCudaPresets.java
View File

@ -16,6 +16,10 @@
package org.nd4j.nativeblas; 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.Platform;
import org.bytedeco.javacpp.annotation.Properties; import org.bytedeco.javacpp.annotation.Properties;
import org.bytedeco.javacpp.tools.Info; 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-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 = "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"}) }) @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<String> preloads = properties.get("platform.preload");
List<String> 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 @Override
public void map(InfoMap infoMap) { public void map(InfoMap infoMap) {
infoMap.put(new Info("thread_local", "ND4J_EXPORT", "INLINEDEF", "CUBLASWINAPI", "FORCEINLINE", infoMap.put(new Info("thread_local", "ND4J_EXPORT", "INLINEDEF", "CUBLASWINAPI", "FORCEINLINE",

11
nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/src/main/java/org/nd4j/nativeblas/Nd4jCpu.java
View File

@ -7630,9 +7630,9 @@ public static final int PREALLOC_SIZE = 33554432;
* the given shape info buffer * the given shape info buffer
* represents a scalar shape * represents a scalar shape
*/ */
@Namespace("shape") public static native int isScalar(@Cast("Nd4jLong*") LongPointer info); @Namespace("shape") public static native int isScalar(@Cast("const Nd4jLong*") LongPointer info);
@Namespace("shape") public static native int isScalar(@Cast("Nd4jLong*") LongBuffer info); @Namespace("shape") public static native int isScalar(@Cast("const Nd4jLong*") LongBuffer info);
@Namespace("shape") public static native int isScalar(@Cast("Nd4jLong*") long[] info); @Namespace("shape") public static native int isScalar(@Cast("const Nd4jLong*") long[] info);
/** /**
* Returns whether * 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*") 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*") 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*") 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! * 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;
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////

2
nd4j/nd4j-backends/nd4j-tests-tensorflow/pom.xml
View File

@ -225,7 +225,7 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.nd4j</groupId> <groupId>org.nd4j</groupId>
<artifactId>nd4j-cuda-10.1</artifactId> <artifactId>nd4j-cuda-10.2</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>

2
nd4j/nd4j-backends/nd4j-tests/pom.xml
View File

@ -208,7 +208,7 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.nd4j</groupId> <groupId>org.nd4j</groupId>
<artifactId>nd4j-cuda-10.1</artifactId> <artifactId>nd4j-cuda-10.2</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>

2
nd4j/nd4j-remote/nd4j-grpc-client/pom.xml
View File

@ -107,7 +107,7 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.nd4j</groupId> <groupId>org.nd4j</groupId>
<artifactId>nd4j-cuda-10.1</artifactId> <artifactId>nd4j-cuda-10.2</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>

2
nd4j/nd4j-remote/nd4j-json-server/pom.xml
View File

@ -163,7 +163,7 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.nd4j</groupId> <groupId>org.nd4j</groupId>
<artifactId>nd4j-cuda-10.1</artifactId> <artifactId>nd4j-cuda-10.2</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>

6
nd4j/nd4j-uberjar/pom.xml
View File

@ -284,7 +284,7 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.nd4j</groupId> <groupId>org.nd4j</groupId>
<artifactId>nd4j-cuda-10.1</artifactId> <artifactId>nd4j-cuda-10.2</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
@ -316,12 +316,12 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.nd4j</groupId> <groupId>org.nd4j</groupId>
<artifactId>nd4j-cuda-10.1</artifactId> <artifactId>nd4j-cuda-10.2</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.nd4j</groupId> <groupId>org.nd4j</groupId>
<artifactId>nd4j-cuda-10.1-platform</artifactId> <artifactId>nd4j-cuda-10.2-platform</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>

4
nd4s/pom.xml
View File

@ -312,11 +312,11 @@
</profile> </profile>
<profile> <profile>
<id>test-nd4j-cuda-10.1</id> <id>test-nd4j-cuda-10.2</id>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.nd4j</groupId> <groupId>org.nd4j</groupId>
<artifactId>nd4j-cuda-10.1</artifactId> <artifactId>nd4j-cuda-10.2</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>

2
rl4j/rl4j-core/pom.xml
View File

@ -127,7 +127,7 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.nd4j</groupId> <groupId>org.nd4j</groupId>
<artifactId>nd4j-cuda-10.1</artifactId> <artifactId>nd4j-cuda-10.2</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>

2
scalnet/pom.xml
View File

@ -293,7 +293,7 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.nd4j</groupId> <groupId>org.nd4j</groupId>
<artifactId>nd4j-cuda-10.1</artifactId> <artifactId>nd4j-cuda-10.2</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>