diff --git a/cavis-native/cavis-native-jcublas/build.gradle b/cavis-native/cavis-native-jcublas/build.gradle index 641010f14..c6fdd72ef 100644 --- a/cavis-native/cavis-native-jcublas/build.gradle +++ b/cavis-native/cavis-native-jcublas/build.gradle @@ -20,7 +20,6 @@ dependencies { implementation group: "org.bytedeco", name: "javacpp", classifier: buildTarget implementation projects.cavisNative.cavisNativeCudaPresets - implementation projects.cavisNative.cavisNativeLib implementation(project(":cavis-native:cavis-native-lib")) { capabilities { requireCapability("${project.group}:cavis-native-lib-cuda-support:${project.version}") diff --git a/cavis-native/cavis-native-lib/build.gradle b/cavis-native/cavis-native-lib/build.gradle index b06278c1c..7d8cd3b3c 100644 --- a/cavis-native/cavis-native-lib/build.gradle +++ b/cavis-native/cavis-native-lib/build.gradle @@ -83,6 +83,7 @@ chipList.each {String thisChip -> srcDirs = ["${buildDir}/generated/sources/javacpp/${thisChip}/${javacppPlatform}${javacppPlatformExtension}/"] include "org/nd4j/nativeblas/Nd4j${thisChip.capitalize()}.java" } + compiledBy "javacpp${thisChip.capitalize()}SupportBuildCompiler" } } @@ -143,7 +144,7 @@ dependencies { cpuImplementation platform(project(':cavis-common-platform')) //cpuImplementation project(":cavis-dnn:cavis-dnn-api") //cpuImplementation project(":cavis-dnn:cavis-dnn-common") - //cpuImplementation project(":cavis-native:cavis-native-blas") + cpuImplementation project(":cavis-native:cavis-native-blas") //cpuImplementation project(":cavis-native:cavis-native-common") //cpuImplementation "commons-io:commons-io" //cpuImplementation "org.bytedeco:opencv" @@ -154,8 +155,12 @@ dependencies { //cpuImplementation "org.apache.commons:commons-math3" //cpuImplementation "com.google.flatbuffers:flatbuffers-java" //cpuImplementation 'javax.mail:javax.mail-api:1.6.2' - //cpuImplementation "org.bytedeco:javacpp" - //cpuImplementation "org.bytedeco:javacpp::${javacppPlatform}" + cpuImplementation "org.bytedeco:javacpp" + cpuImplementation "org.bytedeco:javacpp::${javacppPlatform}" + // https://mvnrepository.com/artifact/org.bytedeco/openblas + cpuImplementation 'org.bytedeco:openblas:0.3.23-1.5.9' + + cpuImplementation project(":cavis-native:cavis-native-cpu-presets") } } @@ -385,16 +390,19 @@ tasks.named("compileJava").configure {enabled false} chipList.each { String thisChip -> tasks.named("javacpp${thisChip.capitalize()}SupportBuildCompiler").configure { - dependsOn "compile${thisChip.capitalize()}Java" + dependsOn "javacpp${thisChip.capitalize()}SupportBuildParser" + } + tasks.named("javacpp${thisChip.capitalize()}SupportBuildParser").configure { + dependsOn "javacpp${thisChip.capitalize()}SupportBuildCommand" + } + //Compiles the c++ and cuda sources + tasks.named("javacpp${thisChip.capitalize()}SupportBuildCommand").configure { + } tasks.named("compile${thisChip.capitalize()}Java").configure { dependsOn "javacpp${thisChip.capitalize()}SupportBuildParser" } - tasks.named("javacpp${thisChip.capitalize()}SupportBuildParser").configure { - dependsOn "javacpp${thisChip.capitalize()}SupportBuildCommand" - } - tasks.named("${thisChip}Jar").configure { dependsOn "javacpp${thisChip.capitalize()}SupportBuildCompiler"