From deba1e0df97087ed0b905f9906adcc0342d1e7ee Mon Sep 17 00:00:00 2001 From: Samuel Audet Date: Mon, 15 Jul 2019 03:07:33 +0900 Subject: [PATCH] Update dependencies to just released JavaCPP and JavaCV 1.5.1 (#8004) Signed-off-by: Samuel Audet --- change-cuda-versions.sh | 4 ++-- deeplearning4j/deeplearning4j-cuda/pom.xml | 4 ++-- libnd4j/pom.xml | 2 +- .../nd4j-cuda-platform/pom.xml | 4 ++-- .../nd4j-backend-impls/nd4j-cuda/pom.xml | 4 ++-- .../java/org/nd4j/nativeblas/Nd4jCuda.java | 14 +------------- .../main/java/org/nd4j/nativeblas/Nd4jCpu.java | 14 +------------- pom.xml | 18 +++++++++--------- 8 files changed, 20 insertions(+), 44 deletions(-) diff --git a/change-cuda-versions.sh b/change-cuda-versions.sh index 454b10e41..1c301ff22 100755 --- a/change-cuda-versions.sh +++ b/change-cuda-versions.sh @@ -48,8 +48,8 @@ check_cuda_version "$VERSION" case $VERSION in 10.1) - VERSION2="7.5" - VERSION3="1.5" + VERSION2="7.6" + VERSION3="1.5.1" ;; 10.0) VERSION2="7.4" diff --git a/deeplearning4j/deeplearning4j-cuda/pom.xml b/deeplearning4j/deeplearning4j-cuda/pom.xml index 53c44ab43..da8fffe7b 100644 --- a/deeplearning4j/deeplearning4j-cuda/pom.xml +++ b/deeplearning4j/deeplearning4j-cuda/pom.xml @@ -27,8 +27,8 @@ 10.1 - 7.5 - 1.5 + 7.6 + 1.5.1 diff --git a/libnd4j/pom.xml b/libnd4j/pom.xml index 3574fc109..83f29b17f 100644 --- a/libnd4j/pom.xml +++ b/libnd4j/pom.xml @@ -65,7 +65,7 @@ 10.1 - 7.5 + 7.6 release cpu ${javacpp.platform} 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 a996ce1b9..93ca5dba7 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 @@ -28,8 +28,8 @@ 10.1 - 7.5 - 1.5 + 7.6 + 1.5.1 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 585f5c13c..d491f6d37 100644 --- a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/pom.xml +++ b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/pom.xml @@ -28,8 +28,8 @@ 10.1 - 7.5 - 1.5 + 7.6 + 1.5.1 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 c57f02d31..911b33414 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 @@ -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; @@ -3470,12 +3470,6 @@ public static class NativeOps extends org.nd4j.nativeblas.NativeOps { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ 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(); } private native void allocate(); @@ -5415,12 +5409,6 @@ NDArray& NDArray::operator()(const Nd4jLong* idx) { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ 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); } private native void allocate(@Cast("Nd4jStatus") int status/*=ND4J_STATUS_OK*/); 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 482a4da6a..ad68aad50 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 @@ -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; @@ -3470,12 +3470,6 @@ public static class NativeOps extends org.nd4j.nativeblas.NativeOps { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ 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(); } private native void allocate(); @@ -5415,12 +5409,6 @@ NDArray& NDArray::operator()(const Nd4jLong* idx) { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ 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); } private native void allocate(@Cast("Nd4jStatus") int status/*=ND4J_STATUS_OK*/); diff --git a/pom.xml b/pom.xml index f5ee4a254..8d969f9c4 100644 --- a/pom.xml +++ b/pom.xml @@ -288,23 +288,23 @@ ${javacpp.platform} - 1.5 - 1.5 - 1.5 + 1.5.1 + 1.5.1 + 1.5.1 - 3.6 + 3.7.3 ${python.version}-${javacpp-presets.version} - 0.3.5 - 2019.3 - 0.18.1 + 0.3.6 + 2019.4 + 0.20 ${mkl-dnn.version}-${javacpp.version} - 4.0.1 + 4.1.0 4.1.3 1.78.0 1.10.5 0.6.0 - 1.13.1 + 1.14.0 ${tensorflow.version}-${javacpp-presets.version} 1.16.1