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

Update dependencies to just released JavaCPP and JavaCV 1.5.1 (#8004) 

Signed-off-by: Samuel Audet <samuel.audet@gmail.com>
master
Samuel Audet 2019-07-15 03:07:33 +09:00 committed by Serhii Shepel
parent 85e212fece
commit deba1e0df9
8 changed files with 20 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
change-cuda-versions.sh
View File

@ -48,8 +48,8 @@ check_cuda_version "$VERSION"
case $VERSION in case $VERSION in
10.1) 10.1)
VERSION2="7.5" VERSION2="7.6"
VERSION3="1.5" VERSION3="1.5.1"
;; ;;
10.0) 10.0)
VERSION2="7.4" VERSION2="7.4"

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

@ -27,8 +27,8 @@
<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.1</cuda.version>
<cudnn.version>7.5</cudnn.version> <cudnn.version>7.6</cudnn.version>
<javacpp-presets.cuda.version>1.5</javacpp-presets.cuda.version> <javacpp-presets.cuda.version>1.5.1</javacpp-presets.cuda.version>
</properties> </properties>
<dependencyManagement> <dependencyManagement>

2
libnd4j/pom.xml
View File

@ -65,7 +65,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.1</cuda.version>
<cudnn.version>7.5</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>
<libnd4j.platform>${javacpp.platform}</libnd4j.platform> <libnd4j.platform>${javacpp.platform}</libnd4j.platform>

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

@ -28,8 +28,8 @@
<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.1</cuda.version>
<cudnn.version>7.5</cudnn.version> <cudnn.version>7.6</cudnn.version>
<javacpp-presets.cuda.version>1.5</javacpp-presets.cuda.version> <javacpp-presets.cuda.version>1.5.1</javacpp-presets.cuda.version>
<nd4j.backend>nd4j-cuda-${cuda.version}</nd4j.backend> <nd4j.backend>nd4j-cuda-${cuda.version}</nd4j.backend>
</properties> </properties>

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

@ -28,8 +28,8 @@
<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.1</cuda.version>
<cudnn.version>7.5</cudnn.version> <cudnn.version>7.6</cudnn.version>
<javacpp-presets.cuda.version>1.5</javacpp-presets.cuda.version> <javacpp-presets.cuda.version>1.5.1</javacpp-presets.cuda.version>
</properties> </properties>
<build> <build>

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

@ -1,4 +1,4 @@
// Targeted by JavaCPP version 1.5: DO NOT EDIT THIS FILE // Targeted by JavaCPP version 1.5.1: DO NOT EDIT THIS FILE
package org.nd4j.nativeblas; package org.nd4j.nativeblas;
@ -3470,12 +3470,6 @@ public static class NativeOps extends org.nd4j.nativeblas.NativeOps {
static { Loader.load(); } static { Loader.load(); }
/** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */
public NDArray(Pointer p) { super(p); } public NDArray(Pointer p) { super(p); }
/** Native array allocator. Access with {@link Pointer#position(long)}. */
public NDArray(long size) { super((Pointer)null); allocateArray(size); }
private native void allocateArray(long size);
@Override public NDArray position(long position) {
return (NDArray)super.position(position);
}
public NDArray() { super((Pointer)null); allocate(); } public NDArray() { super((Pointer)null); allocate(); }
private native void allocate(); private native void allocate();
@ -5415,12 +5409,6 @@ NDArray& NDArray::operator()(const Nd4jLong* idx) {
static { Loader.load(); } static { Loader.load(); }
/** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */
public VariablesSet(Pointer p) { super(p); } public VariablesSet(Pointer p) { super(p); }
/** Native array allocator. Access with {@link Pointer#position(long)}. */
public VariablesSet(long size) { super((Pointer)null); allocateArray(size); }
private native void allocateArray(long size);
@Override public VariablesSet position(long position) {
return (VariablesSet)super.position(position);
}
public VariablesSet(@Cast("Nd4jStatus") int status/*=ND4J_STATUS_OK*/) { super((Pointer)null); allocate(status); } public VariablesSet(@Cast("Nd4jStatus") int status/*=ND4J_STATUS_OK*/) { super((Pointer)null); allocate(status); }
private native void allocate(@Cast("Nd4jStatus") int status/*=ND4J_STATUS_OK*/); private native void allocate(@Cast("Nd4jStatus") int status/*=ND4J_STATUS_OK*/);

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

@ -1,4 +1,4 @@
// Targeted by JavaCPP version 1.5: DO NOT EDIT THIS FILE // Targeted by JavaCPP version 1.5.1: DO NOT EDIT THIS FILE
package org.nd4j.nativeblas; package org.nd4j.nativeblas;
@ -3470,12 +3470,6 @@ public static class NativeOps extends org.nd4j.nativeblas.NativeOps {
static { Loader.load(); } static { Loader.load(); }
/** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */
public NDArray(Pointer p) { super(p); } public NDArray(Pointer p) { super(p); }
/** Native array allocator. Access with {@link Pointer#position(long)}. */
public NDArray(long size) { super((Pointer)null); allocateArray(size); }
private native void allocateArray(long size);
@Override public NDArray position(long position) {
return (NDArray)super.position(position);
}
public NDArray() { super((Pointer)null); allocate(); } public NDArray() { super((Pointer)null); allocate(); }
private native void allocate(); private native void allocate();
@ -5415,12 +5409,6 @@ NDArray& NDArray::operator()(const Nd4jLong* idx) {
static { Loader.load(); } static { Loader.load(); }
/** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */
public VariablesSet(Pointer p) { super(p); } public VariablesSet(Pointer p) { super(p); }
/** Native array allocator. Access with {@link Pointer#position(long)}. */
public VariablesSet(long size) { super((Pointer)null); allocateArray(size); }
private native void allocateArray(long size);
@Override public VariablesSet position(long position) {
return (VariablesSet)super.position(position);
}
public VariablesSet(@Cast("Nd4jStatus") int status/*=ND4J_STATUS_OK*/) { super((Pointer)null); allocate(status); } public VariablesSet(@Cast("Nd4jStatus") int status/*=ND4J_STATUS_OK*/) { super((Pointer)null); allocate(status); }
private native void allocate(@Cast("Nd4jStatus") int status/*=ND4J_STATUS_OK*/); private native void allocate(@Cast("Nd4jStatus") int status/*=ND4J_STATUS_OK*/);

18
pom.xml
View File

@ -288,23 +288,23 @@
<javacpp.platform.extension/> <!-- -Djavacpp.platform.extension=-avx512 --> <javacpp.platform.extension/> <!-- -Djavacpp.platform.extension=-avx512 -->
<javacpp.platform.properties>${javacpp.platform}</javacpp.platform.properties> <javacpp.platform.properties>${javacpp.platform}</javacpp.platform.properties>
<javacpp.version>1.5</javacpp.version> <javacpp.version>1.5.1</javacpp.version>
<javacpp-presets.version>1.5</javacpp-presets.version> <javacpp-presets.version>1.5.1</javacpp-presets.version>
<javacv.version>1.5</javacv.version> <javacv.version>1.5.1</javacv.version>
<python.version>3.6</python.version> <python.version>3.7.3</python.version>
<cpython-platform.version>${python.version}-${javacpp-presets.version}</cpython-platform.version> <cpython-platform.version>${python.version}-${javacpp-presets.version}</cpython-platform.version>
<openblas.version>0.3.5</openblas.version> <openblas.version>0.3.6</openblas.version>
<mkl.version>2019.3</mkl.version> <mkl.version>2019.4</mkl.version>
<mkl-dnn.version>0.18.1</mkl-dnn.version> <mkl-dnn.version>0.20</mkl-dnn.version>
<mkl-dnn.javacpp.version>${mkl-dnn.version}-${javacpp.version}</mkl-dnn.javacpp.version> <mkl-dnn.javacpp.version>${mkl-dnn.version}-${javacpp.version}</mkl-dnn.javacpp.version>
<opencv.version>4.0.1</opencv.version> <opencv.version>4.1.0</opencv.version>
<ffmpeg.version>4.1.3</ffmpeg.version> <ffmpeg.version>4.1.3</ffmpeg.version>
<leptonica.version>1.78.0</leptonica.version> <leptonica.version>1.78.0</leptonica.version>
<hdf5.version>1.10.5</hdf5.version> <hdf5.version>1.10.5</hdf5.version>
<ale.version>0.6.0</ale.version> <ale.version>0.6.0</ale.version>
<tensorflow.version>1.13.1</tensorflow.version> <tensorflow.version>1.14.0</tensorflow.version>
<tensorflow.javacpp.version>${tensorflow.version}-${javacpp-presets.version}</tensorflow.javacpp.version> <tensorflow.javacpp.version>${tensorflow.version}-${javacpp-presets.version}</tensorflow.javacpp.version>
<commons-compress.version>1.16.1</commons-compress.version> <commons-compress.version>1.16.1</commons-compress.version>