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

upgrade versions 

Signed-off-by: brian <brian@brutex.de>
master
Brian Rosenberger 2022-10-14 12:00:34 +02:00
parent e695f1c653
commit 4718195681
3 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
cavis-common-platform/build.gradle
View File

@ -5,18 +5,22 @@ plugins {
ext { ext {
scalaVersion = rootProject.ext.scalaVersion scalaVersion = rootProject.ext.scalaVersion
javacppPlatform = osdetector.classifier
} }
def javacpp = [version: "1.5.6", presetsVersion: "1.5.6"] def javacpp = [version: "1.5.7", presetsVersion: "1.5.7"]
def hdf5 = [version: "1.12.1"] def hdf5 = [version: "1.12.1"]
def jackson = [version: "2.13.4"] def jackson = [version: "2.13.4"]
def cuda = [version: "11.4"] def cuda = [version: "11.6"]
def cudnn = [version: "8.2"] def cudnn = [version: "8.3"]
def openblas = [version: "0.3.17"] def openblas = [version: "0.3.19"]
def numpy = [version: "1.22.2"]
def tensorflow = [version: "1.15.5"]
def cpython = [version: "3.10.2"]
def javacv = [version:"1.5.6"] def javacv = [version:"1.5.7"]
def opencv = [version: "4.5.3"] def opencv = [version: "4.5.5"]
def leptonica = [version: "1.81.1"] def leptonica = [version: "1.82.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"]
@ -111,17 +115,19 @@ dependencies {
api "org.bytedeco:leptonica-platform:${leptonica.version}-${javacpp.presetsVersion}" api "org.bytedeco:leptonica-platform:${leptonica.version}-${javacpp.presetsVersion}"
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}:windows-x86_64" api "org.bytedeco:hdf5:${hdf5.version}-${javacpp.presetsVersion}:${javacppPlatform}"
api "org.bytedeco:hdf5:${hdf5.version}-${javacpp.presetsVersion}:linux-x86_64" //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-dnn:0.21.5-${javacpp.presetsVersion}"
api "org.bytedeco:tensorflow:1.15.5-${javacpp.presetsVersion}" api "org.bytedeco:tensorflow:${tensorflow.version}-${javacpp.presetsVersion}"
api "org.bytedeco:cpython:3.9.6-${javacpp.presetsVersion}" api "org.bytedeco:cpython:${cpython.version}-${javacpp.presetsVersion}:${javacppPlatform}"
api "org.bytedeco:numpy:1.21.1-${javacpp.presetsVersion}" 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}"

4
cavis-datavec/cavis-datavec-python/build.gradle
View File

@ -22,8 +22,8 @@ apply from: "${project.rootProject.projectDir}/createTestBackends.gradle"
dependencies { dependencies {
implementation 'org.json:json:20190722' implementation 'org.json:json:20190722'
implementation "org.bytedeco:cpython-platform:3.9.6-1.5.6" implementation "org.bytedeco:cpython"
implementation "org.bytedeco:numpy-platform:1.21.1-1.5.6" implementation "org.bytedeco:numpy"
implementation 'com.google.code.findbugs:jsr305:3.0.2' implementation 'com.google.code.findbugs:jsr305:3.0.2'
implementation projects.cavisDatavec.cavisDatavecApi implementation projects.cavisDatavec.cavisDatavecApi
implementation projects.cavisDnn.cavisDnnApi implementation projects.cavisDnn.cavisDnnApi

5
cavis-full/build.gradle
View File

@ -16,8 +16,9 @@ dependencies {
api "com.fasterxml.jackson.datatype:jackson-datatype-joda:2.10.5" api "com.fasterxml.jackson.datatype:jackson-datatype-joda:2.10.5"
api 'org.slf4j:slf4j-simple:2.0.3' api 'org.slf4j:slf4j-simple:2.0.3'
api 'org.slf4j:slf4j-api:2.0.3' api 'org.slf4j:slf4j-api:2.0.3'
api group: "org.bytedeco", name: "javacpp", classifier: "linux-x64_86" //TODO for the two below.. either platform specific uber jars or a single big one with all platforms
api group: 'net.brutex.cavis-native', name: 'cavis-native-lib', version: '1.0.0-SNAPSHOT', classifier: "linux-x86_64-avx2-cpu" //api group: "org.bytedeco", name: "javacpp", classifier: "linux-x64_86"
//api group: 'net.brutex.cavis-native', name: 'cavis-native-lib', version: '1.0.0-SNAPSHOT', classifier: "linux-x86_64-avx2-cpu"
rootProject.getAllprojects().each { Project sproj -> rootProject.getAllprojects().each { Project sproj ->
if(!sproj.name.equals(name) && !sproj.name.equals("cavis-common-platform") if(!sproj.name.equals(name) && !sproj.name.equals("cavis-common-platform")