From 6af05fc8a5be55e611067381036b4b8ba9b1c491 Mon Sep 17 00:00:00 2001 From: brian Date: Mon, 24 Oct 2022 18:04:38 +0200 Subject: [PATCH] Add jenkinsfile for pipeline build and dockerfile for build Signed-off-by: brian --- cavis-full/build.gradle | 5 ++++- cavis-native/cavis-native-lib/build.gradle | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/cavis-full/build.gradle b/cavis-full/build.gradle index e722d42bf..c360cfe56 100644 --- a/cavis-full/build.gradle +++ b/cavis-full/build.gradle @@ -36,14 +36,17 @@ dependencies { } } */ + if(withCpu()) api project(path: ":cavis-native:cavi-native-lib", configuration: "cpuSupportCompileClasspath") + if(withCuda()) api project(path: ":cavis-native:cavi-native-lib", configuration: "cudaSupportCompileClasspath") + /* api (project(':cavis-native:cavis-native-lib')) { capabilities { if(withCpu()) requireCapability("net.brutex.cavis.cavis-native:cavis-native-lib-cpu-support") //if(withCuda()) requireCapability("net.brutex.cavis.cavis-native:cavis-native-lib-cuda-support") } } - +*/ } diff --git a/cavis-native/cavis-native-lib/build.gradle b/cavis-native/cavis-native-lib/build.gradle index 989bc7c25..a83faf398 100644 --- a/cavis-native/cavis-native-lib/build.gradle +++ b/cavis-native/cavis-native-lib/build.gradle @@ -315,7 +315,6 @@ chipList.each { thisChip -> classOrPackageNames = ["org.nd4j.nativeblas.${thisChip}.Nd4j${thisChip.capitalize()}Presets"] outputDirectory = file("${buildDir}/generated/sources/javacpp/${thisChip}/${javacppPlatform}${javacppPlatformExtension}/") - classPath = sourceSets.getByName("${thisChip}Support").getRuntimeClasspath() classPath += ["${buildDir}/classes/java/${thisChip}Support/"] }