From 6044c1c53a6cc3f46894fdd6f1be512877d0b5f5 Mon Sep 17 00:00:00 2001
From: brian <brian@brutex.de>
Date: Mon, 24 Oct 2022 17:32:35 +0200
Subject: [PATCH] Add jenkinsfile for pipeline build and dockerfile for build

Signed-off-by: brian <brian@brutex.de>
---
 cavis-full/build.gradle                    | 19 +++++++++++++------
 cavis-native/cavis-native-cpu/build.gradle |  2 +-
 cavis-native/cavis-native-lib/build.gradle |  1 +
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/cavis-full/build.gradle b/cavis-full/build.gradle
index 2433755d4..e722d42bf 100644
--- a/cavis-full/build.gradle
+++ b/cavis-full/build.gradle
@@ -10,11 +10,11 @@ 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 "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 "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", classifier: "linux-x86_64"
 
     rootProject.getAllprojects().each { Project sproj ->
         if (!sproj.name.equals(name) && !sproj.name.equals("cavis-common-platform")
@@ -22,20 +22,27 @@ dependencies {
                 && !sproj.name.equals("cavis-datavec")
                 && !sproj.name.equals("cavis-dnn")
                 && !sproj.name.equals("cavis-native")
-                && !sproj.name.equals("cavis-native-lib")
                 && !sproj.name.equals("cavis-nd4j")
                 && !sproj.name.equals("cavis-ui")
                 && !sproj.name.equals("cavis-zoo")) {
             api sproj
         }
     }
-
+/*
     api(projects.cavisNative.cavisNativeLib) {
             capabilities {
                 if(withCuda()) it.requireCapability(group: "net.brutex.cavis.cavis-native", name: "cavis-native-lib-cuda-support", version: project.version)
                 if(withCpu()) it.requireCapability(group: "net.brutex.cavis.cavis-native", name: "cavis-native-lib-cpu-support", version: project.version)
             }
     }
+*/
+
+    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-cpu/build.gradle b/cavis-native/cavis-native-cpu/build.gradle
index 39dfff5bf..cdb610ed8 100644
--- a/cavis-native/cavis-native-cpu/build.gradle
+++ b/cavis-native/cavis-native-cpu/build.gradle
@@ -14,6 +14,7 @@ dependencies {
     implementation projects.cavisDnn.cavisDnnApi
     implementation projects.cavisDnn.cavisDnnCommon
 
+
     implementation (projects.cavisNative.cavisNativeLib) {
         capabilities {
             it.requireCapability group: "net.brutex.cavis.cavis-native", name:"cavis-native-lib-cpu-support", version: project.version
@@ -28,5 +29,4 @@ dependencies {
     implementation "com.google.flatbuffers:flatbuffers-java"
     implementation "org.slf4j:slf4j-api"
     implementation "org.apache.commons:commons-math3"
-
 }
diff --git a/cavis-native/cavis-native-lib/build.gradle b/cavis-native/cavis-native-lib/build.gradle
index ac2aa987e..989bc7c25 100644
--- a/cavis-native/cavis-native-lib/build.gradle
+++ b/cavis-native/cavis-native-lib/build.gradle
@@ -99,6 +99,7 @@ java {
     chipList.each {thisChip ->
         registerFeature("${thisChip}Support") {
             usingSourceSet(sourceSets.findByName("${thisChip}Support"))
+            capability(project.group, "cavis-native-lib-${thisChip}-support", project.version)
             //withJavadocJar()
             //withSourcesJar()
         }