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

Compare commits

base: Brutex:090c5ab2ebd7291ed6a26320596eb67745fb5ac5
Branches Tags
Brutex:CUDA12
Brutex:master
Brutex:enhance-build-infrastructure
...
compare: Brutex:be7cd6b9303abc8642b3a959ff3c819ac843bbc5
Branches Tags
Brutex:CUDA12
Brutex:master
Brutex:enhance-build-infrastructure

3 Commits
090c5ab2eb ... be7cd6b930

Author SHA1 Message Date
Brian Rosenberger be7cd6b930 Allo docker container to use GPU 
Signed-off-by: brian <brian@brutex.de>
 2023-08-15 20:25:35 +02:00
Brian Rosenberger 99aed71ffa Merge remote-tracking branch 'brutex-origin/master' 
# Conflicts:
#	cavis-common-platform/build.gradle
 2023-08-15 16:59:12 +02:00
Brian Rosenberger 2df8ea06e0 Allo docker container to use GPU 
Signed-off-by: brian <brian@brutex.de>
 2023-08-15 16:58:55 +02:00
4 changed files with 50 additions and 24 deletions
Show Stats Expand all files Collapse all files

1
.docker/Dockerfile
View File

@ -10,6 +10,7 @@ RUN wget -nv https://github.com/Kitware/CMake/releases/download/v3.24.2/cmake-3.
mkdir /opt/cmake && sh ./cmake-3.24.2-linux-x86_64.sh --skip-license --prefix=/opt/cmake && ln -s /opt/cmake/bin/cmake /usr/bin/cmake && \
rm cmake-3.24.2-linux-x86_64.sh
RUN echo "/usr/local/cuda/compat/" >> /etc/ld.so.conf.d/cuda-driver.conf
RUN echo "nameserver 8.8.8.8" >> /etc/resolv.conf

2
.jenkins/linux-x86_64-docker-cuda-build.jenkinsfile
View File

@ -26,7 +26,7 @@ pipeline {
dir '.docker'
label 'linux && docker && cuda'
//additionalBuildArgs '--build-arg version=1.0.2'
//args '--gpus all' --needed for test only, you can build without GPU
args '--gpus all' //needed for test only, you can build without GPU
}
}

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

@ -8,22 +8,19 @@ ext {
javacppPlatform = osdetector.classifier
}
def javacpp = [version: "1.5.9", presetsVersion: "1.5.9"]
def hdf5 = [version: "1.14.1"]
def javacpp = [version: "1.5.7", presetsVersion: "1.5.7"]
def hdf5 = [version: "1.12.1"]
def jackson = [version: "2.13.4"]
def cuda = [version: "12.1"]
def cudnn = [version: "8.9"]
def openblas = [version: "0.3.23"]
def numpy = [version: "1.24.3"]
def tensorflow_lite = [version: "2.12.0"]
def cuda = [version: "11.6"]
def cudnn = [version: "8.3"]
def openblas = [version: "0.3.19"]
def numpy = [version: "1.22.2"]
def tensorflow = [version: "1.15.5"]
def tensorrt = [version: "8.6.1.6"]
def cpython = [version: "3.11.3"]
def mkl = [version:"2023.1"]
def cpython = [version: "3.10.2"]
def javacv = [version:"1.5.9"]
def opencv = [version: "4.7.0"]
def leptonica = [version: "1.83.0"]
def javacv = [version:"1.5.7"]
def opencv = [version: "4.5.5"]
def leptonica = [version: "1.83.0"] //fix, only in javacpp 1.5.9
def junit = [version: "5.9.1"]
def flatbuffers = [version: "1.10.0"]
@ -44,6 +41,7 @@ dependencies {
api enforcedPlatform("io.netty:netty-bom:${netty.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}")
@ -51,6 +49,9 @@ dependencies {
api enforcedPlatform("io.netty:netty-bom:${netty.version}")
api enforcedPlatform("com.fasterxml.jackson:jackson-bom:${jackson.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.protobuf:protobuf-java:3.15.6"
@ -58,6 +59,18 @@ dependencies {
api "com.google.protobuf:protobuf-java-util:3.15.6"
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"
/*Logging*/
@ -68,7 +81,7 @@ dependencies {
api "ch.qos.logback:logback-classic:1.2.3"
api 'ch.qos.logback:logback-core:1.2.3'
/* commons */
api 'commons-io:commons-io:2.5'
api 'commons-codec:commons-codec:1.11'
api 'commons-net:commons-net:3.6'
@ -105,22 +118,24 @@ dependencies {
api "org.bytedeco:javacv:${javacv.version}"
api "org.bytedeco:opencv:${opencv.version}-${javacpp.presetsVersion}"
api "org.bytedeco:openblas:${openblas.version}-${javacpp.presetsVersion}"
api "org.bytedeco:leptonica-platform:${leptonica.version}-${javacpp.presetsVersion}"
api "org.bytedeco:leptonica-platform:${leptonica.version}-1.5.9"
api "org.bytedeco:leptonica:${leptonica.version}-1.5.9"
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}:${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-platform-redist:${cuda.version}-${cudnn.version}-${javacpp.presetsVersion}"
api "org.bytedeco:mkl:${mkl.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:mkl-dnn:0.21.5-${javacpp.presetsVersion}"
api "org.bytedeco:mkl:2022.0-${javacpp.presetsVersion}"
api "org.bytedeco:tensorflow:${tensorflow.version}-${javacpp.presetsVersion}"
api "org.bytedeco:cpython:${cpython.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 */
api "org.apache.spark:spark-core_${scalaVersion}:${spark.version}"
@ -154,6 +169,16 @@ dependencies {
}
}
/*
publishing {
publications {
myPlatform(MavenPublication) {
from components.javaPlatform
}
}
}
*/
tasks.withType(GenerateModuleMetadata).configureEach {
// The value 'enforced-platform' is provided in the validation
// error message you got

2
cavis-native/cavis-native-lib/build.gradle
View File

@ -64,7 +64,7 @@ buildscript {
plugins {
id 'java-library'
id 'org.bytedeco.gradle-javacpp-build' version "1.5.9"
id 'org.bytedeco.gradle-javacpp-build' version "1.5.7"
id 'maven-publish'
id 'signing'
}