More test fixes
parent
4dfc637305
commit
d767abdeba
|
@ -11,3 +11,5 @@ RUN wget -nv https://github.com/Kitware/CMake/releases/download/v3.24.2/cmake-3.
|
||||||
rm cmake-3.24.2-linux-x86_64.sh
|
rm cmake-3.24.2-linux-x86_64.sh
|
||||||
|
|
||||||
|
|
||||||
|
RUN echo "nameserver 8.8.8.8" >> /etc/resolv.conf
|
||||||
|
|
||||||
|
|
24
build.gradle
24
build.gradle
|
@ -44,7 +44,6 @@ ext {
|
||||||
|
|
||||||
scalaVersion = "2.12"
|
scalaVersion = "2.12"
|
||||||
logger.quiet("Scala main version is set to {}", scalaVersion)
|
logger.quiet("Scala main version is set to {}", scalaVersion)
|
||||||
logger.quiet("Running java {}", JavaVersion.current())
|
|
||||||
}
|
}
|
||||||
|
|
||||||
configurations.all {
|
configurations.all {
|
||||||
|
@ -56,7 +55,6 @@ configurations.all {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
allprojects { Project proj ->
|
allprojects { Project proj ->
|
||||||
apply plugin: 'com.google.osdetector'
|
apply plugin: 'com.google.osdetector'
|
||||||
|
|
||||||
|
@ -65,8 +63,8 @@ allprojects { Project proj ->
|
||||||
|
|
||||||
|
|
||||||
plugins.withType(JavaPlugin) {
|
plugins.withType(JavaPlugin) {
|
||||||
sourceCompatibility = JavaVersion.VERSION_11
|
sourceCompatibility = 11
|
||||||
targetCompatibility = JavaVersion.VERSION_1_8
|
targetCompatibility = 1.8
|
||||||
tasks.withType(JavaCompile) {
|
tasks.withType(JavaCompile) {
|
||||||
options.release = 8
|
options.release = 8
|
||||||
}
|
}
|
||||||
|
@ -163,21 +161,3 @@ allprojects { Project proj ->
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
task aggregatedJavadocs(type: Javadoc, description: 'Generate javadocs from all child projects as if it was a single project', group: 'Documentation') {
|
|
||||||
subprojects.each { proj ->
|
|
||||||
proj.tasks.withType(Javadoc).each { javadocTask ->
|
|
||||||
logger.quiet("Adding javadoc for project " + proj.name)
|
|
||||||
source += javadocTask.source
|
|
||||||
classpath += javadocTask.classpath
|
|
||||||
excludes += javadocTask.excludes
|
|
||||||
includes += javadocTask.includes
|
|
||||||
}
|
|
||||||
}
|
|
||||||
destinationDir = file("$buildDir/docs/javadoc")
|
|
||||||
title = "$project.name $version API"
|
|
||||||
options.author true
|
|
||||||
options.links 'http://docs.oracle.com/javase/8/docs/api/'
|
|
||||||
options.addStringOption('Xdoclint:none', '-quiet')
|
|
||||||
}
|
|
|
@ -129,20 +129,4 @@ echo "nameserver 8.8.8.8" | sudo tee -a /etc/resolv.conf
|
||||||
# Buildparameter: #
|
# Buildparameter: #
|
||||||
|
|
||||||
-P\<xxx>\
|
-P\<xxx>\
|
||||||
CAVIS_AVX_EXTENSION = {avx2 | avx512}, default is avx2
|
CAVIS_AVX_EXTENSION = {avx2 | avx512}, default is avx2
|
||||||
|
|
||||||
# Zeppelin Spark dependencies #
|
|
||||||
3
|
|
||||||
|
|
||||||
|
|
||||||
To add the dependency to the language models, use the following format in the Dependencies section of the of the Spark Interpreter configuration (Interpreters -> Spark -> Edit -> Dependencies):
|
|
||||||
|
|
||||||
groupId:artifactId:packaging:classifier:version
|
|
||||||
|
|
||||||
In your case it should work with
|
|
||||||
|
|
||||||
edu.stanford.nlp:stanford-corenlp:jar:models:3.8.0
|
|
||||||
|
|
||||||
|
|
||||||
Native cpu code under linux needs libc6-dev
|
|
||||||
/lib/x86_64-linux-gnu/libm.so.6: version `GLIBC_2.29' not found
|
|
|
@ -64,7 +64,7 @@ public class HelperUtils {
|
||||||
if("CUDA".equalsIgnoreCase(backend) && cudnnHelperClassName != null && !cudnnHelperClassName.isEmpty()) {
|
if("CUDA".equalsIgnoreCase(backend) && cudnnHelperClassName != null && !cudnnHelperClassName.isEmpty()) {
|
||||||
if(DL4JClassLoading.loadClassByName(cudnnHelperClassName) != null) {
|
if(DL4JClassLoading.loadClassByName(cudnnHelperClassName) != null) {
|
||||||
log.debug("Attempting to initialize cudnn helper {}",cudnnHelperClassName);
|
log.debug("Attempting to initialize cudnn helper {}",cudnnHelperClassName);
|
||||||
helperRet = DL4JClassLoading.<LayerHelper>createNewInstance(
|
helperRet = (LayerHelper) DL4JClassLoading.<LayerHelper>createNewInstance(
|
||||||
cudnnHelperClassName,
|
cudnnHelperClassName,
|
||||||
(Class<? super LayerHelper>) layerHelperSuperClass,
|
(Class<? super LayerHelper>) layerHelperSuperClass,
|
||||||
new Object[]{arguments});
|
new Object[]{arguments});
|
||||||
|
@ -76,7 +76,7 @@ public class HelperUtils {
|
||||||
ClassLoader classLoader = DL4JClassLoading.getDl4jClassloader();
|
ClassLoader classLoader = DL4JClassLoading.getDl4jClassloader();
|
||||||
DL4JClassLoading.setDl4jClassloaderFromClass(layerHelperSuperClass);
|
DL4JClassLoading.setDl4jClassloaderFromClass(layerHelperSuperClass);
|
||||||
try {
|
try {
|
||||||
helperRet = DL4JClassLoading.<LayerHelper>createNewInstance(
|
helperRet = (LayerHelper) DL4JClassLoading.<LayerHelper>createNewInstance(
|
||||||
cudnnHelperClassName,
|
cudnnHelperClassName,
|
||||||
(Class<? super LayerHelper>) layerHelperSuperClass,
|
(Class<? super LayerHelper>) layerHelperSuperClass,
|
||||||
arguments);
|
arguments);
|
||||||
|
@ -99,7 +99,7 @@ public class HelperUtils {
|
||||||
}
|
}
|
||||||
|
|
||||||
} else if("CPU".equalsIgnoreCase(backend) && oneDnnClassName != null && !oneDnnClassName.isEmpty()) {
|
} else if("CPU".equalsIgnoreCase(backend) && oneDnnClassName != null && !oneDnnClassName.isEmpty()) {
|
||||||
helperRet = DL4JClassLoading.createNewInstance(
|
helperRet = DL4JClassLoading.<LayerHelper>createNewInstance(
|
||||||
oneDnnClassName,
|
oneDnnClassName,
|
||||||
arguments);
|
arguments);
|
||||||
log.trace("Created oneDNN helper: {}, layer {}", oneDnnClassName,layerName);
|
log.trace("Created oneDNN helper: {}, layer {}", oneDnnClassName,layerName);
|
||||||
|
|
|
@ -12,15 +12,12 @@ configurations.archives.artifacts.with { archives ->
|
||||||
dependencies {
|
dependencies {
|
||||||
//Todo clean this
|
//Todo clean this
|
||||||
api platform(project(":cavis-common-platform"))
|
api platform(project(":cavis-common-platform"))
|
||||||
//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 "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 "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'
|
||||||
//TODO for the two below.. either platform specific uber jars or a single big one with all platforms
|
//api group: "org.bytedeco", name: "javacpp", classifier: "linux-x64_86"
|
||||||
api group: "org.bytedeco", name: "javacpp", version: "1.5.7", classifier: "linux-x86_64"
|
|
||||||
//api group: "org.bytedeco", name: "javacpp", version: "1.5.7"
|
|
||||||
// api group: 'net.brutex.cavis-native', name: 'cavis-native-lib', version: '1.0.0-SNAPSHOT', classifier: "linux-x86_64-avx2-cpu"
|
|
||||||
//api group: 'net.brutex.cavis-native', name: 'cavis-native-lib', version: '1.0.0-SNAPSHOT'
|
|
||||||
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")
|
||||||
&& !sproj.name.equals("Cavis")
|
&& !sproj.name.equals("Cavis")
|
||||||
|
|
Loading…
Reference in New Issue