diff --git a/build.gradle b/build.gradle index 902d0822a..ab3337562 100644 --- a/build.gradle +++ b/build.gradle @@ -63,6 +63,11 @@ allprojects { Project proj -> plugins.withType(JavaPlugin) { + sourceCompatibility = 11 + targetCompatibility = 1.8 + tasks.withType(JavaCompile) { + options.release = 8 + } dependencies { implementation platform(project(":cavis-common-platform")) diff --git a/build_requirements.md b/build_requirements.md index 50d83268a..db6532203 100644 --- a/build_requirements.md +++ b/build_requirements.md @@ -126,4 +126,7 @@ sudo sh cmake-3.20.4-linux-x86_64.sh --skip-license echo "supersede domain-name-servers 172.31.0.2, 8.8.8.8" | sudo tee -a /etc/dhcp/dhclient.conf echo "nameserver 8.8.8.8" | sudo tee -a /etc/resolv.conf - \ No newline at end of file + # Buildparameter: # + + -P\\ + CAVIS_AVX_EXTENSION = {avx2 | avx512}, default is avx2 \ No newline at end of file diff --git a/cavis-common-platform/build.gradle b/cavis-common-platform/build.gradle index a6202c6a8..7941b39ed 100644 --- a/cavis-common-platform/build.gradle +++ b/cavis-common-platform/build.gradle @@ -64,8 +64,8 @@ dependencies { api "org.projectlombok:lombok:1.18.24" /*Logging*/ - api 'org.slf4j:slf4j-api:1.7.30' - api 'org.slf4j:slf4j-simple:1.7.25' + api 'org.slf4j:slf4j-api:2.0.3' + api 'org.slf4j:slf4j-simple:2.0.3' api "org.apache.logging.log4j:log4j-core:2.17.0" api "ch.qos.logback:logback-classic:1.2.3" diff --git a/cavis-dnn/cavis-dnn-parallelwrapper/build.gradle b/cavis-dnn/cavis-dnn-parallelwrapper/build.gradle index c039ab783..735e02b78 100644 --- a/cavis-dnn/cavis-dnn-parallelwrapper/build.gradle +++ b/cavis-dnn/cavis-dnn-parallelwrapper/build.gradle @@ -25,6 +25,9 @@ dependencies { implementation 'org.slf4j:slf4j-api' implementation "com.google.guava:guava" + implementation "com.fasterxml.jackson.core:jackson-annotations" + implementation "com.fasterxml.jackson.core:jackson-core" + implementation projects.cavisNd4j.cavisNd4jParameterServer.cavisNd4jParameterServerCore implementation projects.cavisNd4j.cavisNd4jParameterServer.cavisNd4jParameterServerClient implementation projects.cavisDnn.cavisDnnCore @@ -36,7 +39,6 @@ dependencies { testImplementation projects.cavisUi.cavisUiStandalone - testImplementation projects.cavisDnn.cavisDnnCommonTests testImplementation projects.cavisUi.cavisUiModel testImplementation projects.cavisUi.cavisUiVertx diff --git a/cavis-full/build.gradle b/cavis-full/build.gradle index a986d6671..68e847fdf 100644 --- a/cavis-full/build.gradle +++ b/cavis-full/build.gradle @@ -12,8 +12,10 @@ configurations.archives.artifacts.with { archives -> dependencies { //Todo clean this api platform(project(":cavis-common-platform")) - api "org.bytedeco:javacpp" + api "org.bytedeco:javacpp:1.5.7" //for some reason we needed to apply version numbers here, they do not end up in POM otherwise api "com.fasterxml.jackson.datatype:jackson-datatype-joda:2.10.5" + api 'org.slf4j:slf4j-simple:2.0.3' + api 'org.slf4j:slf4j-api:2.0.3' //api group: "org.bytedeco", name: "javacpp", classifier: "linux-x64_86" rootProject.getAllprojects().each { Project sproj -> @@ -85,3 +87,5 @@ publishing { } } } + +