From 1c89512ec0e08e1b86c075e09c1da47a970d10e5 Mon Sep 17 00:00:00 2001 From: Samuel Audet Date: Wed, 4 Mar 2020 17:11:01 +0900 Subject: [PATCH] Add Maven profiles for ARM builds to pom.xml files (#265) * Add Maven profiles for ARM builds to pom.xml files Signed-off-by: Samuel Audet * Remove mkl from dependencies when running on non intel/amd platforms * Downgrade openblas for now * Change back to 0.3.8 Co-authored-by: Adam Gibson <1144306+agibsonccc@users.noreply.github.com> --- .../nd4j-backend-impls/nd4j-native/pom.xml | 34 +- nd4j/nd4j-backends/nd4j-backend-impls/pom.xml | 385 +++++++++++++++--- pom.xml | 47 ++- 3 files changed, 378 insertions(+), 88 deletions(-) diff --git a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/pom.xml b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/pom.xml index f3418657e..379f69563 100644 --- a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/pom.xml +++ b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/pom.xml @@ -50,17 +50,7 @@ ${openblas.version}-${javacpp-presets.version} ${dependency.platform} - - org.bytedeco - mkl - ${mkl.version}-${javacpp-presets.version} - - - org.bytedeco - mkl - ${mkl.version}-${javacpp-presets.version} - ${dependency.platform2} - + - android-arm - android-arm64 - android-x86 - android-x86_64 - ios-arm - ios-arm64 - ios-x86 - ios-x86_64 - linux-armhf - linux-arm64 - linux-ppc64le - linux-x86 - linux-x86_64 - macosx-x86_64 - windows-x86 - windows-x86_64 + android-arm${javacpp.platform.extension} + android-arm64${javacpp.platform.extension} + android-x86${javacpp.platform.extension} + android-x86_64${javacpp.platform.extension} + ios-arm${javacpp.platform.extension} + ios-arm64${javacpp.platform.extension} + ios-x86${javacpp.platform.extension} + ios-x86_64${javacpp.platform.extension} + linux-armhf${javacpp.platform.extension} + linux-arm64${javacpp.platform.extension} + linux-ppc64le${javacpp.platform.extension} + linux-x86${javacpp.platform.extension} + linux-x86_64${javacpp.platform.extension} + macosx-x86_64${javacpp.platform.extension} + windows-x86${javacpp.platform.extension} + windows-x86_64${javacpp.platform.extension} @@ -234,22 +234,22 @@ - ${javacpp.platform} - ${javacpp.platform} - ${javacpp.platform} - ${javacpp.platform} - ${javacpp.platform} - ${javacpp.platform} - ${javacpp.platform} - ${javacpp.platform} - ${javacpp.platform} - ${javacpp.platform} - ${javacpp.platform} - ${javacpp.platform} - ${javacpp.platform} - ${javacpp.platform} - ${javacpp.platform} - ${javacpp.platform} + ${javacpp.platform}${javacpp.platform.extension} + ${javacpp.platform}${javacpp.platform.extension} + ${javacpp.platform}${javacpp.platform.extension} + ${javacpp.platform}${javacpp.platform.extension} + ${javacpp.platform}${javacpp.platform.extension} + ${javacpp.platform}${javacpp.platform.extension} + ${javacpp.platform}${javacpp.platform.extension} + ${javacpp.platform}${javacpp.platform.extension} + ${javacpp.platform}${javacpp.platform.extension} + ${javacpp.platform}${javacpp.platform.extension} + ${javacpp.platform}${javacpp.platform.extension} + ${javacpp.platform}${javacpp.platform.extension} + ${javacpp.platform}${javacpp.platform.extension} + ${javacpp.platform}${javacpp.platform.extension} + ${javacpp.platform}${javacpp.platform.extension} + ${javacpp.platform}${javacpp.platform.extension} ${javacpp.platform}${javacpp.platform.extension} ${javacpp.platform} ${javacpp.platform} @@ -264,29 +264,60 @@ - ${os.name}-${os.arch} - ${os.name}-${os.arch} - ${os.name}-${os.arch} - ${os.name}-${os.arch} - ${os.name}-${os.arch} - ${os.name}-${os.arch} - ${os.name}-${os.arch} - ${os.name}-${os.arch} - ${os.name}-${os.arch} - ${os.name}-${os.arch} - ${os.name}-${os.arch} - ${os.name}-${os.arch} - ${os.name}-${os.arch} - ${os.name}-${os.arch} - ${os.name}-${os.arch} - ${os.name}-${os.arch} - ${os.name}-${os.arch} + ${os.name}-${os.arch}${javacpp.platform.extension} + ${os.name}-${os.arch}${javacpp.platform.extension} + ${os.name}-${os.arch}${javacpp.platform.extension} + ${os.name}-${os.arch}${javacpp.platform.extension} + ${os.name}-${os.arch}${javacpp.platform.extension} + ${os.name}-${os.arch}${javacpp.platform.extension} + ${os.name}-${os.arch}${javacpp.platform.extension} + ${os.name}-${os.arch}${javacpp.platform.extension} + ${os.name}-${os.arch}${javacpp.platform.extension} + ${os.name}-${os.arch}${javacpp.platform.extension} + ${os.name}-${os.arch}${javacpp.platform.extension} + ${os.name}-${os.arch}${javacpp.platform.extension} + ${os.name}-${os.arch}${javacpp.platform.extension} + ${os.name}-${os.arch}${javacpp.platform.extension} + ${os.name}-${os.arch}${javacpp.platform.extension} + ${os.name}-${os.arch}${javacpp.platform.extension} + ${os.name}-${os.arch}${javacpp.platform.extension} ${os.name}-${os.arch}${javacpp.platform.extension} ${os.name}-${os.arch} ${os.name}-${os.arch} + + javacpp.platform.custom-true + + + javacpp.platform.custom + + + + + + + + + + + + + + + + + + + + + + + + + + javacpp-platform-none @@ -487,7 +518,7 @@ + mvn -Djavacpp.platform.custom -Djavacpp.platform.host -Djavacpp.platform.linux-x86_64 -Djavacpp.platform.windows-x86_64 ... --> javacpp.platform.android-arm-true @@ -496,7 +527,7 @@ - android-arm + android-arm${javacpp.platform.extension} @@ -508,7 +539,7 @@ - android-arm64 + android-arm64${javacpp.platform.extension} @@ -520,7 +551,7 @@ - android-x86 + android-x86${javacpp.platform.extension} @@ -532,7 +563,7 @@ - android-x86_64 + android-x86_64${javacpp.platform.extension} @@ -544,7 +575,7 @@ - ios-arm + ios-arm${javacpp.platform.extension} @@ -556,7 +587,7 @@ - ios-arm64 + ios-arm64${javacpp.platform.extension} @@ -568,7 +599,7 @@ - ios-x86 + ios-x86${javacpp.platform.extension} @@ -580,7 +611,7 @@ - ios-x86_64 + ios-x86_64${javacpp.platform.extension} @@ -592,7 +623,7 @@ - linux-armhf + linux-armhf${javacpp.platform.extension} @@ -604,7 +635,7 @@ - linux-arm64 + linux-arm64${javacpp.platform.extension} @@ -616,7 +647,7 @@ - linux-ppc64le + linux-ppc64le${javacpp.platform.extension} @@ -628,7 +659,7 @@ - linux-x86 + linux-x86${javacpp.platform.extension} @@ -640,7 +671,7 @@ - linux-x86_64 + linux-x86_64${javacpp.platform.extension} @@ -652,7 +683,7 @@ - macosx-x86_64 + macosx-x86_64${javacpp.platform.extension} @@ -664,7 +695,7 @@ - windows-x86 + windows-x86${javacpp.platform.extension} @@ -676,7 +707,229 @@ - windows-x86_64 + windows-x86_64${javacpp.platform.extension} + + + + + javacpp.platform.custom-linux-arm + + + javacpp.platform.host + + + linuxarm + + + + linux-armhf${javacpp.platform.extension} + + + + + javacpp.platform.custom-linux-armhf + + + javacpp.platform.host + + + linuxarmhf + + + + linux-armhf${javacpp.platform.extension} + + + + + javacpp.platform.custom-linux-aarch64 + + + javacpp.platform.host + + + linuxaarch64 + + + + linux-arm64${javacpp.platform.extension} + + + + + javacpp.platform.custom-linux-armv8 + + + javacpp.platform.host + + + linuxarmv8 + + + + linux-arm64${javacpp.platform.extension} + + + + + javacpp.platform.custom-linux-arm64 + + + javacpp.platform.host + + + linuxarm64 + + + + linux-arm64${javacpp.platform.extension} + + + + + javacpp.platform.custom-linux-ppc64le + + + javacpp.platform.host + + + linuxppc64le + + + + linux-ppc64le${javacpp.platform.extension} + + + + + javacpp.platform.custom-linux-amd64 + + + javacpp.platform.host + + + linuxamd64 + + + + linux-x86_64${javacpp.platform.extension} + + + + + javacpp.platform.custom-linux-x86-64 + + + javacpp.platform.host + + + linuxx86-64 + + + + linux-x86_64${javacpp.platform.extension} + + + + + javacpp.platform.custom-linux-x86_64 + + + javacpp.platform.host + + + linuxx86_64 + + + + linux-x86_64${javacpp.platform.extension} + + + + + javacpp.platform.custom-macosx-amd64 + + + javacpp.platform.host + + + mac os xamd64 + + + + macosx-x86_64${javacpp.platform.extension} + + + + + javacpp.platform.custom-macosx-x86-64 + + + javacpp.platform.host + + + mac os xx86-64 + + + + macosx-x86_64${javacpp.platform.extension} + + + + + javacpp.platform.custom-macosx-x86_64 + + + javacpp.platform.host + + + mac os xx86_64 + + + + macosx-x86_64${javacpp.platform.extension} + + + + + javacpp.platform.custom-windows-amd64 + + + javacpp.platform.host + + windowsamd64 + + + + windows-x86_64${javacpp.platform.extension} + + + + + javacpp.platform.custom-windows-x86-64 + + + javacpp.platform.host + + windowsx86-64 + + + + windows-x86_64${javacpp.platform.extension} + + + + + javacpp.platform.custom-windows-x86_64 + + + javacpp.platform.host + + windowsx86_64 + + + + windows-x86_64${javacpp.platform.extension} diff --git a/pom.xml b/pom.xml index 50ab7af14..d4bf988af 100644 --- a/pom.xml +++ b/pom.xml @@ -743,6 +743,7 @@ + linux linux @@ -754,6 +755,7 @@ + darwin macosx @@ -765,9 +767,43 @@ + windows windows + + arm + + + arm + + + + armhf + + + + aarch64 + + + aarch64 + + + + arm64 + + + + armv8 + + + armv8 + + + + arm64 + + i386 @@ -845,17 +881,6 @@ x86_64 - - arm - - - arm - - - - arm - -