From 2b4d44ea6724c530635fdd114267421bcca36703 Mon Sep 17 00:00:00 2001 From: brian Date: Tue, 11 Oct 2022 07:59:22 +0200 Subject: [PATCH] More test fixes --- build.gradle | 19 ------------------- build_requirements.md | 18 +----------------- .../deeplearning4j/nn/layers/HelperUtils.java | 6 +++--- cavis-full/build.gradle | 9 +++------ 4 files changed, 7 insertions(+), 45 deletions(-) diff --git a/build.gradle b/build.gradle index 3a59a0cf4..ab3337562 100644 --- a/build.gradle +++ b/build.gradle @@ -55,7 +55,6 @@ configurations.all { } - allprojects { Project proj -> apply plugin: 'com.google.osdetector' @@ -162,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') -} \ No newline at end of file diff --git a/build_requirements.md b/build_requirements.md index 77d54050b..db6532203 100644 --- a/build_requirements.md +++ b/build_requirements.md @@ -129,20 +129,4 @@ echo "nameserver 8.8.8.8" | sudo tee -a /etc/resolv.conf # Buildparameter: # -P\\ - 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 \ No newline at end of file + CAVIS_AVX_EXTENSION = {avx2 | avx512}, default is avx2 \ No newline at end of file diff --git a/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/layers/HelperUtils.java b/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/layers/HelperUtils.java index dfff491e4..eb59a2c5f 100644 --- a/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/layers/HelperUtils.java +++ b/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/layers/HelperUtils.java @@ -64,7 +64,7 @@ public class HelperUtils { if("CUDA".equalsIgnoreCase(backend) && cudnnHelperClassName != null && !cudnnHelperClassName.isEmpty()) { if(DL4JClassLoading.loadClassByName(cudnnHelperClassName) != null) { log.debug("Attempting to initialize cudnn helper {}",cudnnHelperClassName); - helperRet = DL4JClassLoading.createNewInstance( + helperRet = (LayerHelper) DL4JClassLoading.createNewInstance( cudnnHelperClassName, (Class) layerHelperSuperClass, new Object[]{arguments}); @@ -76,7 +76,7 @@ public class HelperUtils { ClassLoader classLoader = DL4JClassLoading.getDl4jClassloader(); DL4JClassLoading.setDl4jClassloaderFromClass(layerHelperSuperClass); try { - helperRet = DL4JClassLoading.createNewInstance( + helperRet = (LayerHelper) DL4JClassLoading.createNewInstance( cudnnHelperClassName, (Class) layerHelperSuperClass, arguments); @@ -99,7 +99,7 @@ public class HelperUtils { } } else if("CPU".equalsIgnoreCase(backend) && oneDnnClassName != null && !oneDnnClassName.isEmpty()) { - helperRet = DL4JClassLoading.createNewInstance( + helperRet = DL4JClassLoading.createNewInstance( oneDnnClassName, arguments); log.trace("Created oneDNN helper: {}, layer {}", oneDnnClassName,layerName); diff --git a/cavis-full/build.gradle b/cavis-full/build.gradle index e25c3e7b2..68e847fdf 100644 --- a/cavis-full/build.gradle +++ b/cavis-full/build.gradle @@ -12,15 +12,12 @@ configurations.archives.artifacts.with { archives -> dependencies { //Todo clean this 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 'org.slf4j:slf4j-simple: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", 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' + //api group: "org.bytedeco", name: "javacpp", classifier: "linux-x64_86" + rootProject.getAllprojects().each { Project sproj -> if(!sproj.name.equals(name) && !sproj.name.equals("cavis-common-platform") && !sproj.name.equals("Cavis")