Skip to content

Commit

Permalink
Update dependencies to just released JavaCPP and JavaCV 1.4.3 (#6587)
Browse files Browse the repository at this point in the history
  • Loading branch information
@saudet @AlexDBlack
saudet authored and AlexDBlack committed Oct 15, 2018
1 parent d56bf78 commit 4048757
Show file tree
Hide file tree
Showing 76 changed files with 220 additions and 138 deletions.
2 changes: 1 addition & 1 deletion change-cuda-versions.sh
View file
Expand Up @@ -32,7 +32,7 @@ CUDNN_71_VERSION="7\.1"
CUDNN_73_VERSION="7\.3"
JAVACPP_141_VERSION="1\.4\.1"
JAVACPP_142_VERSION="1\.4\.2"
JAVACPP_143_VERSION="1\.4\.3-SNAPSHOT"
JAVACPP_143_VERSION="1\.4\.3"

usage() {
echo "Usage: $(basename $0) [-h|--help] <cuda version to be used>
Expand Down
2 changes: 1 addition & 1 deletion datavec/datavec-api/pom.xml
View file
Expand Up @@ -136,7 +136,7 @@
<id>test-nd4j-native</id>
</profile>
<profile>
<id>test-nd4j-cuda-9.2</id>
<id>test-nd4j-cuda-10.0</id>
</profile>
</profiles>
</project>
2 changes: 1 addition & 1 deletion datavec/datavec-arrow/pom.xml
View file
Expand Up @@ -107,7 +107,7 @@
<id>test-nd4j-native</id>
</profile>
<profile>
<id>test-nd4j-cuda-9.2</id>
<id>test-nd4j-cuda-10.0</id>
</profile>
</profiles>
</project>
2 changes: 1 addition & 1 deletion datavec/datavec-camel/pom.xml
View file
Expand Up @@ -110,7 +110,7 @@
<id>test-nd4j-native</id>
</profile>
<profile>
<id>test-nd4j-cuda-9.2</id>
<id>test-nd4j-cuda-10.0</id>
</profile>
</profiles>
</project>
2 changes: 1 addition & 1 deletion datavec/datavec-data/datavec-data-audio/pom.xml
View file
Expand Up @@ -72,7 +72,7 @@
<id>test-nd4j-native</id>
</profile>
<profile>
<id>test-nd4j-cuda-9.2</id>
<id>test-nd4j-cuda-10.0</id>
</profile>
</profiles>
</project>
2 changes: 1 addition & 1 deletion datavec/datavec-data/datavec-data-codec/pom.xml
View file
Expand Up @@ -66,7 +66,7 @@
<id>test-nd4j-native</id>
</profile>
<profile>
<id>test-nd4j-cuda-9.2</id>
<id>test-nd4j-cuda-10.0</id>
</profile>
</profiles>
</project>
2 changes: 1 addition & 1 deletion datavec/datavec-data/datavec-data-image/pom.xml
View file
Expand Up @@ -140,7 +140,7 @@
<id>test-nd4j-native</id>
</profile>
<profile>
<id>test-nd4j-cuda-9.2</id>
<id>test-nd4j-cuda-10.0</id>
</profile>
</profiles>

Expand Down
2 changes: 1 addition & 1 deletion datavec/datavec-data/datavec-data-nlp/pom.xml
View file
Expand Up @@ -88,7 +88,7 @@
<id>test-nd4j-native</id>
</profile>
<profile>
<id>test-nd4j-cuda-9.2</id>
<id>test-nd4j-cuda-10.0</id>
</profile>
</profiles>
</project>
2 changes: 1 addition & 1 deletion datavec/datavec-data/pom.xml
View file
Expand Up @@ -52,7 +52,7 @@
<id>test-nd4j-native</id>
</profile>
<profile>
<id>test-nd4j-cuda-9.2</id>
<id>test-nd4j-cuda-10.0</id>
</profile>
</profiles>

Expand Down
2 changes: 1 addition & 1 deletion datavec/datavec-excel/pom.xml
View file
Expand Up @@ -58,7 +58,7 @@
<id>test-nd4j-native</id>
</profile>
<profile>
<id>test-nd4j-cuda-9.2</id>
<id>test-nd4j-cuda-10.0</id>
</profile>
</profiles>
</project>
2 changes: 1 addition & 1 deletion datavec/datavec-geo/pom.xml
View file
Expand Up @@ -73,7 +73,7 @@
<id>test-nd4j-native</id>
</profile>
<profile>
<id>test-nd4j-cuda-9.2</id>
<id>test-nd4j-cuda-10.0</id>
</profile>
</profiles>
</project>
2 changes: 1 addition & 1 deletion datavec/datavec-hadoop/pom.xml
View file
Expand Up @@ -110,7 +110,7 @@
<id>test-nd4j-native</id>
</profile>
<profile>
<id>test-nd4j-cuda-9.2</id>
<id>test-nd4j-cuda-10.0</id>
</profile>
</profiles>
</project>
2 changes: 1 addition & 1 deletion datavec/datavec-jdbc/pom.xml
View file
Expand Up @@ -65,7 +65,7 @@
<id>test-nd4j-native</id>
</profile>
<profile>
<id>test-nd4j-cuda-9.2</id>
<id>test-nd4j-cuda-10.0</id>
</profile>
</profiles>
</project>
2 changes: 1 addition & 1 deletion datavec/datavec-local/pom.xml
View file
Expand Up @@ -134,7 +134,7 @@
<id>test-nd4j-native</id>
</profile>
<profile>
<id>test-nd4j-cuda-9.2</id>
<id>test-nd4j-cuda-10.0</id>
</profile>
</profiles>
</project>
2 changes: 1 addition & 1 deletion datavec/datavec-perf/pom.xml
View file
Expand Up @@ -70,7 +70,7 @@
<id>test-nd4j-native</id>
</profile>
<profile>
<id>test-nd4j-cuda-9.2</id>
<id>test-nd4j-cuda-10.0</id>
</profile>
</profiles>
</project>
2 changes: 1 addition & 1 deletion datavec/datavec-spark-inference-parent/datavec-spark-inference-client/pom.xml
View file
Expand Up @@ -84,7 +84,7 @@
<id>test-nd4j-native</id>
</profile>
<profile>
<id>test-nd4j-cuda-9.2</id>
<id>test-nd4j-cuda-10.0</id>
</profile>
</profiles>
</project>
2 changes: 1 addition & 1 deletion datavec/datavec-spark-inference-parent/datavec-spark-inference-model/pom.xml
View file
Expand Up @@ -63,7 +63,7 @@
<id>test-nd4j-native</id>
</profile>
<profile>
<id>test-nd4j-cuda-9.2</id>
<id>test-nd4j-cuda-10.0</id>
</profile>
</profiles>
</project>
2 changes: 1 addition & 1 deletion datavec/datavec-spark-inference-parent/datavec-spark-inference-server/pom.xml
View file
Expand Up @@ -188,7 +188,7 @@
<id>test-nd4j-native</id>
</profile>
<profile>
<id>test-nd4j-cuda-9.2</id>
<id>test-nd4j-cuda-10.0</id>
</profile>
</profiles>
</project>
2 changes: 1 addition & 1 deletion datavec/datavec-spark-inference-parent/pom.xml
View file
Expand Up @@ -38,7 +38,7 @@
<id>test-nd4j-native</id>
</profile>
<profile>
<id>test-nd4j-cuda-9.2</id>
<id>test-nd4j-cuda-10.0</id>
</profile>
</profiles>
</project>
2 changes: 1 addition & 1 deletion datavec/datavec-spark/pom.xml
View file
Expand Up @@ -309,7 +309,7 @@
<id>test-nd4j-native</id>
</profile>
<profile>
<id>test-nd4j-cuda-9.2</id>
<id>test-nd4j-cuda-10.0</id>
</profile>
</profiles>
</project>
6 changes: 3 additions & 3 deletions datavec/pom.xml
View file
Expand Up @@ -111,7 +111,7 @@
<skip>${skipTestResourceEnforcement}</skip>
<rules>
<requireActiveProfile>
<profiles>test-nd4j-native,test-nd4j-cuda-9.2</profiles>
<profiles>test-nd4j-native,test-nd4j-cuda-10.0</profiles>
<all>false</all>
</requireActiveProfile>
</rules>
Expand Down Expand Up @@ -354,7 +354,7 @@
</profile>
<!-- For running unit tests with nd4j-cuda-8.0: "mvn clean test -P test-nd4j-cuda-8.0" -->
<profile>
<id>test-nd4j-cuda-9.2</id>
<id>test-nd4j-cuda-10.0</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
Expand All @@ -367,7 +367,7 @@
</dependency>
<dependency>
<groupId>org.nd4j</groupId>
<artifactId>nd4j-cuda-9.2</artifactId>
<artifactId>nd4j-cuda-10.0</artifactId>
<version>${nd4j.version}</version>
<scope>test</scope>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion deeplearning4j/deeplearning4j-common/pom.xml
View file
Expand Up @@ -40,7 +40,7 @@
<id>test-nd4j-native</id>
</profile>
<profile>
<id>test-nd4j-cuda-9.2</id>
<id>test-nd4j-cuda-10.0</id>
</profile>
</profiles>

Expand Down
4 changes: 2 additions & 2 deletions deeplearning4j/deeplearning4j-core/pom.xml
View file
Expand Up @@ -55,7 +55,7 @@
</dependency>
<dependency>
<groupId>org.nd4j</groupId>
<artifactId>nd4j-cuda-9.2</artifactId>
<artifactId>nd4j-cuda-10.0</artifactId>
<version>${nd4j.version}</version>
<scope>test</scope>
</dependency>
Expand Down Expand Up @@ -187,7 +187,7 @@
<id>test-nd4j-native</id>
</profile>
<profile>
<id>test-nd4j-cuda-9.2</id>
<id>test-nd4j-cuda-10.0</id>
</profile>
</profiles>

Expand Down
10 changes: 5 additions & 5 deletions deeplearning4j/deeplearning4j-cuda/pom.xml
View file
Expand Up @@ -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">
<modelVersion>4.0.0</modelVersion>
<artifactId>deeplearning4j-cuda-9.2</artifactId>
<artifactId>deeplearning4j-cuda-10.0</artifactId>
<name>deeplearning4j-cuda</name>
<parent>
<groupId>org.deeplearning4j</groupId>
Expand All @@ -26,9 +26,9 @@

<properties>
<!-- CUDA version is linked with the artifact name so cannot move to parent pom.xml -->
<cuda.version>9.2</cuda.version>
<cudnn.version>7.1</cudnn.version>
<javacpp-presets.cuda.version>1.4.2</javacpp-presets.cuda.version>
<cuda.version>10.0</cuda.version>
<cudnn.version>7.3</cudnn.version>
<javacpp-presets.cuda.version>1.4.3</javacpp-presets.cuda.version>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -117,7 +117,7 @@
</build>
</profile>
<profile>
<id>test-nd4j-cuda-9.2</id>
<id>test-nd4j-cuda-10.0</id>
</profile>
</profiles>

Expand Down
2 changes: 1 addition & 1 deletion deeplearning4j/deeplearning4j-data/deeplearning4j-datasets/pom.xml
View file
Expand Up @@ -51,7 +51,7 @@
<id>test-nd4j-native</id>
</profile>
<profile>
<id>test-nd4j-cuda-9.2</id>
<id>test-nd4j-cuda-10.0</id>
</profile>
</profiles>

Expand Down
2 changes: 1 addition & 1 deletion deeplearning4j/deeplearning4j-data/deeplearning4j-datavec-iterators/pom.xml
View file
Expand Up @@ -46,7 +46,7 @@
<id>test-nd4j-native</id>
</profile>
<profile>
<id>test-nd4j-cuda-9.2</id>
<id>test-nd4j-cuda-10.0</id>
</profile>
</profiles>
</project>
2 changes: 1 addition & 1 deletion deeplearning4j/deeplearning4j-data/deeplearning4j-utility-iterators/pom.xml
View file
Expand Up @@ -48,7 +48,7 @@
<id>test-nd4j-native</id>
</profile>
<profile>
<id>test-nd4j-cuda-9.2</id>
<id>test-nd4j-cuda-10.0</id>
</profile>
</profiles>
</project>
2 changes: 1 addition & 1 deletion deeplearning4j/deeplearning4j-data/pom.xml
View file
Expand Up @@ -38,7 +38,7 @@
<id>test-nd4j-native</id>
</profile>
<profile>
<id>test-nd4j-cuda-9.2</id>
<id>test-nd4j-cuda-10.0</id>
</profile>
</profiles>

Expand Down
2 changes: 1 addition & 1 deletion deeplearning4j/deeplearning4j-dataimport-solrj/pom.xml
View file
Expand Up @@ -108,7 +108,7 @@
<id>test-nd4j-native</id>
</profile>
<profile>
<id>test-nd4j-cuda-9.2</id>
<id>test-nd4j-cuda-10.0</id>
</profile>
</profiles>

Expand Down
2 changes: 1 addition & 1 deletion deeplearning4j/deeplearning4j-graph/pom.xml
View file
Expand Up @@ -52,7 +52,7 @@
<id>test-nd4j-native</id>
</profile>
<profile>
<id>test-nd4j-cuda-9.2</id>
<id>test-nd4j-cuda-10.0</id>
</profile>
</profiles>

Expand Down
2 changes: 1 addition & 1 deletion deeplearning4j/deeplearning4j-manifold/deeplearning4j-tsne/pom.xml
View file
Expand Up @@ -62,7 +62,7 @@
<id>test-nd4j-native</id>
</profile>
<profile>
<id>test-nd4j-cuda-9.2</id>
<id>test-nd4j-cuda-10.0</id>
</profile>
</profiles>
</project>
2 changes: 1 addition & 1 deletion deeplearning4j/deeplearning4j-manifold/pom.xml
View file
Expand Up @@ -41,7 +41,7 @@
<id>test-nd4j-native</id>
</profile>
<profile>
<id>test-nd4j-cuda-9.2</id>
<id>test-nd4j-cuda-10.0</id>
</profile>
</profiles>
</project>
2 changes: 1 addition & 1 deletion deeplearning4j/deeplearning4j-modelexport-solr/pom.xml
View file
Expand Up @@ -283,7 +283,7 @@
<id>test-nd4j-native</id>
</profile>
<profile>
<id>test-nd4j-cuda-9.2</id>
<id>test-nd4j-cuda-10.0</id>
</profile>
</profiles>

Expand Down
2 changes: 1 addition & 1 deletion deeplearning4j/deeplearning4j-modelimport/pom.xml
View file
Expand Up @@ -121,7 +121,7 @@
<id>test-nd4j-native</id>
</profile>
<profile>
<id>test-nd4j-cuda-9.2</id>
<id>test-nd4j-cuda-10.0</id>
</profile>
</profiles>

Expand Down
2 changes: 1 addition & 1 deletion ...ng4j/deeplearning4j-nearestneighbors-parent/deeplearning4j-nearestneighbor-server/pom.xml
View file
Expand Up @@ -223,7 +223,7 @@
<id>test-nd4j-native</id>
</profile>
<profile>
<id>test-nd4j-cuda-9.2</id>
<id>test-nd4j-cuda-10.0</id>
</profile>
</profiles>
</project>
2 changes: 1 addition & 1 deletion ...g4j/deeplearning4j-nearestneighbors-parent/deeplearning4j-nearestneighbors-client/pom.xml
View file
Expand Up @@ -69,7 +69,7 @@
<id>test-nd4j-native</id>
</profile>
<profile>
<id>test-nd4j-cuda-9.2</id>
<id>test-nd4j-cuda-10.0</id>
</profile>
</profiles>
</project>
2 changes: 1 addition & 1 deletion ...ng4j/deeplearning4j-nearestneighbors-parent/deeplearning4j-nearestneighbors-model/pom.xml
View file
Expand Up @@ -53,7 +53,7 @@
<id>test-nd4j-native</id>
</profile>
<profile>
<id>test-nd4j-cuda-9.2</id>
<id>test-nd4j-cuda-10.0</id>
</profile>
</profiles>
</project>
2 changes: 1 addition & 1 deletion deeplearning4j/deeplearning4j-nearestneighbors-parent/nearestneighbor-core/pom.xml
View file
Expand Up @@ -73,7 +73,7 @@
<id>test-nd4j-native</id>
</profile>
<profile>
<id>test-nd4j-cuda-9.2</id>
<id>test-nd4j-cuda-10.0</id>
</profile>
</profiles>
</project>
2 changes: 1 addition & 1 deletion deeplearning4j/deeplearning4j-nearestneighbors-parent/pom.xml
View file
Expand Up @@ -43,7 +43,7 @@
<id>test-nd4j-native</id>
</profile>
<profile>
<id>test-nd4j-cuda-9.2</id>
<id>test-nd4j-cuda-10.0</id>
</profile>
</profiles>
</project>

0 comments on commit 4048757

Please sign in to comment.