Update underlying library versions for javacpp 1.5.9

Signed-off-by: brian <brian@brutex.de>
CUDA12
Brian Rosenberger 2023-08-10 10:55:46 +02:00
parent 0e4be5c4d2
commit a6c4a16d9a
4 changed files with 25 additions and 48 deletions

View File

@ -8,19 +8,22 @@ ext {
javacppPlatform = osdetector.classifier javacppPlatform = osdetector.classifier
} }
def javacpp = [version: "1.5.7", presetsVersion: "1.5.7"] def javacpp = [version: "1.5.9", presetsVersion: "1.5.9"]
def hdf5 = [version: "1.12.1"] def hdf5 = [version: "1.14.1"]
def jackson = [version: "2.13.4"] def jackson = [version: "2.13.4"]
def cuda = [version: "11.6"] def cuda = [version: "12.1"]
def cudnn = [version: "8.3"] def cudnn = [version: "8.9"]
def openblas = [version: "0.3.19"] def openblas = [version: "0.3.23"]
def numpy = [version: "1.22.2"] def numpy = [version: "1.24.3"]
def tensorflow_lite = [version: "2.12.0"]
def tensorflow = [version: "1.15.5"] def tensorflow = [version: "1.15.5"]
def cpython = [version: "3.10.2"] def tensorrt = [version: "8.6.1.6"]
def cpython = [version: "3.11.3"]
def mkl = [version:"2023.1"]
def javacv = [version:"1.5.7"] def javacv = [version:"1.5.9"]
def opencv = [version: "4.5.5"] def opencv = [version: "4.7.0"]
def leptonica = [version: "1.82.0"] def leptonica = [version: "1.83.0"]
def junit = [version: "5.9.1"] def junit = [version: "5.9.1"]
def flatbuffers = [version: "1.10.0"] def flatbuffers = [version: "1.10.0"]
@ -41,7 +44,6 @@ dependencies {
api enforcedPlatform("io.netty:netty-bom:${netty.version}") api enforcedPlatform("io.netty:netty-bom:${netty.version}")
api enforcedPlatform("com.fasterxml.jackson:jackson-bom:${jackson.version}") api enforcedPlatform("com.fasterxml.jackson:jackson-bom:${jackson.version}")
//api enforcedPlatform("com.fasterxml.jackson.core:jackson-annotations:${jackson.version}")
api enforcedPlatform("com.squareup.okhttp3:okhttp-bom:${okhttp3.version}") api enforcedPlatform("com.squareup.okhttp3:okhttp-bom:${okhttp3.version}")
@ -49,9 +51,6 @@ dependencies {
api enforcedPlatform("io.netty:netty-bom:${netty.version}") api enforcedPlatform("io.netty:netty-bom:${netty.version}")
api enforcedPlatform("com.fasterxml.jackson:jackson-bom:${jackson.version}") api enforcedPlatform("com.fasterxml.jackson:jackson-bom:${jackson.version}")
api enforcedPlatform("com.squareup.okhttp3:okhttp-bom:${okhttp3.version}") api enforcedPlatform("com.squareup.okhttp3:okhttp-bom:${okhttp3.version}")
//api enforcedPlatform("com.fasterxml.jackson.core:jackson-annotations:${jackson.version}")
//api "com.squareup.okhttp3:okhttp:${okhttp3}.version"
//api "com.squareup.okhttp3:logging-interceptor:${okhttp3}.version"
api 'com.google.guava:guava:30.1-jre' api 'com.google.guava:guava:30.1-jre'
api "com.google.protobuf:protobuf-java:3.15.6" api "com.google.protobuf:protobuf-java:3.15.6"
@ -59,18 +58,6 @@ dependencies {
api "com.google.protobuf:protobuf-java-util:3.15.6" api "com.google.protobuf:protobuf-java-util:3.15.6"
api "com.google.flatbuffers:flatbuffers-java:${flatbuffers.version}" api "com.google.flatbuffers:flatbuffers-java:${flatbuffers.version}"
/*
api "com.fasterxml.jackson.core:jackson-core:${jackson.version}"
api "com.fasterxml.jackson.core:jackson-databind:${jackson.version}"
api "com.fasterxml.jackson.core:jackson-annotations:${jackson.version}"
api "com.fasterxml.jackson.dataformat:jackson-dataformat-xml:${jackson.version}"
*/
// api "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:${jackson.version}"
// api "com.fasterxml.jackson.datatype:jackson-datatype-joda:${jackson.version}"
// api "com.fasterxml.jackson.module:jackson-module-scala_${scalaVersion}"
api "org.projectlombok:lombok:1.18.28" api "org.projectlombok:lombok:1.18.28"
/*Logging*/ /*Logging*/
@ -81,7 +68,7 @@ dependencies {
api "ch.qos.logback:logback-classic:1.2.3" api "ch.qos.logback:logback-classic:1.2.3"
api 'ch.qos.logback:logback-core:1.2.3' api 'ch.qos.logback:logback-core:1.2.3'
/* commons */
api 'commons-io:commons-io:2.5' api 'commons-io:commons-io:2.5'
api 'commons-codec:commons-codec:1.11' api 'commons-codec:commons-codec:1.11'
api 'commons-net:commons-net:3.6' api 'commons-net:commons-net:3.6'
@ -122,18 +109,18 @@ dependencies {
api "org.bytedeco:hdf5-platform:${hdf5.version}-${javacpp.presetsVersion}" api "org.bytedeco:hdf5-platform:${hdf5.version}-${javacpp.presetsVersion}"
api "org.bytedeco:hdf5:${hdf5.version}-${javacpp.presetsVersion}" api "org.bytedeco:hdf5:${hdf5.version}-${javacpp.presetsVersion}"
api "org.bytedeco:hdf5:${hdf5.version}-${javacpp.presetsVersion}:${javacppPlatform}" api "org.bytedeco:hdf5:${hdf5.version}-${javacpp.presetsVersion}:${javacppPlatform}"
//api "org.bytedeco:hdf5:${hdf5.version}-${javacpp.presetsVersion}:linux-x86_64"
api "org.bytedeco:cuda:${cuda.version}-${cudnn.version}-${javacpp.presetsVersion}" api "org.bytedeco:cuda:${cuda.version}-${cudnn.version}-${javacpp.presetsVersion}"
api "org.bytedeco:cuda-platform-redist:${cuda.version}-${cudnn.version}-${javacpp.presetsVersion}" api "org.bytedeco:cuda-platform-redist:${cuda.version}-${cudnn.version}-${javacpp.presetsVersion}"
api "org.bytedeco:mkl-dnn:0.21.5-${javacpp.presetsVersion}" api "org.bytedeco:mkl:${mkl.version}-${javacpp.presetsVersion}"
api "org.bytedeco:tensorflow:${tensorflow.version}-${javacpp.presetsVersion}" api "org.bytedeco:tensorflow:${tensorflow.version}-1.5.8" //not available for javacpp 1.5.9 ?
api "org.bytedeco:tensorflow-platform:${tensorflow.version}-1.5.8"
api "org.bytedeco:tensorflow-lite:${tensorflow_lite.version}-${javacpp.presetsVersion}"
api "org.bytedeco:tensorflow-lite-platform:${tensorflow_lite.version}-${javacpp.presetsVersion}"
api "org.bytedeco:tensorrt:${tensorrt.version}-${javacpp.presetsVersion}"
api "org.bytedeco:tensorrt-platform:${tensorrt.version}-${javacpp.presetsVersion}"
api "org.bytedeco:cpython:${cpython.version}-${javacpp.presetsVersion}:${javacppPlatform}" api "org.bytedeco:cpython:${cpython.version}-${javacpp.presetsVersion}:${javacppPlatform}"
api "org.bytedeco:numpy:${numpy.version}-${javacpp.presetsVersion}:${javacppPlatform}" api "org.bytedeco:numpy:${numpy.version}-${javacpp.presetsVersion}:${javacppPlatform}"
//implementation "org.bytedeco:cpython-platform:3.9.6-1.5.6"
//implementation "org.bytedeco:numpy-platform:1.21.1-1.5.6"
/* Apache Spark */ /* Apache Spark */
api "org.apache.spark:spark-core_${scalaVersion}:${spark.version}" api "org.apache.spark:spark-core_${scalaVersion}:${spark.version}"
@ -167,16 +154,6 @@ dependencies {
} }
} }
/*
publishing {
publications {
myPlatform(MavenPublication) {
from components.javaPlatform
}
}
}
*/
tasks.withType(GenerateModuleMetadata).configureEach { tasks.withType(GenerateModuleMetadata).configureEach {
// The value 'enforced-platform' is provided in the validation // The value 'enforced-platform' is provided in the validation
// error message you got // error message you got

View File

@ -78,7 +78,7 @@ class dnnTest {
* DenseLayer.Builder().nIn(X_DIM*Y_DIM).nOut(X_DIM*Y_DIM*CHANNELS).activation(Activation.TANH) * DenseLayer.Builder().nIn(X_DIM*Y_DIM).nOut(X_DIM*Y_DIM*CHANNELS).activation(Activation.TANH)
*/ */
NeuralNetConfiguration network = NeuralNetConfiguration network =
NN.net() NN.nn()
.seed(42) .seed(42)
.updater(Adam.builder().learningRate(0.0002).beta1(0.5).build()) .updater(Adam.builder().learningRate(0.0002).beta1(0.5).build())
.gradientNormalization(GradientNormalization.RenormalizeL2PerLayer) .gradientNormalization(GradientNormalization.RenormalizeL2PerLayer)

View File

@ -52,8 +52,8 @@ buildscript {
classpath platform(project(":cavis-common-platform")) classpath platform(project(":cavis-common-platform"))
classpath group: "org.bytedeco", name: "openblas" classpath group: "org.bytedeco", name: "openblas"
classpath group: "org.bytedeco", name: "openblas", classifier: "${javacppPlatform}" classpath group: "org.bytedeco", name: "openblas", classifier: "${javacppPlatform}"
classpath group: "org.bytedeco", name:"mkl-dnn" classpath group: "org.bytedeco", name:"mkl"
classpath group: "org.bytedeco", name:"mkl-dnn", classifier: "${javacppPlatform}" classpath group: "org.bytedeco", name:"mkl", classifier: "${javacppPlatform}"
classpath group: "org.bytedeco", name: "javacpp" classpath group: "org.bytedeco", name: "javacpp"
classpath group: "org.bytedeco", name: "javacpp", classifier: "${javacppPlatform}" classpath group: "org.bytedeco", name: "javacpp", classifier: "${javacppPlatform}"
} }

View File

@ -28,7 +28,7 @@ dependencies {
implementation group: "org.bytedeco", name: "tensorflow" implementation group: "org.bytedeco", name: "tensorflow"
testRuntimeOnly group: "org.bytedeco", name: "tensorflow", classifier: buildTarget testRuntimeOnly group: "org.bytedeco", name: "tensorflow", classifier: buildTarget
if(buildTarget.contains("windows") || buildTarget.contains("linux")) { if(buildTarget.contains("windows") || buildTarget.contains("linux")) {
testRuntimeOnly group: "org.bytedeco", name: "tensorflow", classifier: "${buildTarget}-gpu" testRuntimeOnly group: "org.bytedeco", name: 'tensorflow', classifier: "${buildTarget}-gpu", version: ''
} }
implementation "commons-io:commons-io" implementation "commons-io:commons-io"
implementation "com.google.code.gson:gson" implementation "com.google.code.gson:gson"