Brutex
/
cavis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ND4J: Fix incorrectly bundled libraries on Linux ARM 

Signed-off-by: Samuel Audet <samuel.audet@gmail.com>
master
Samuel Audet 2019-08-23 12:20:05 +09:00
parent dbea687903
commit c4e7d032cb
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/src/main/java/org/nd4j/nativeblas/Nd4jCpuPresets.java
View File

@ -129,11 +129,13 @@ import java.util.Scanner;
preloadresource = {"org/bytedeco/mkldnn/", "org/bytedeco/openblas/"}, preloadresource = {"org/bytedeco/mkldnn/", "org/bytedeco/openblas/"},
preload = {"openblas", "openblas_nolapack", "libnd4jcpu"}), preload = {"openblas", "openblas_nolapack", "libnd4jcpu"}),
@Platform(value = "linux", preload = {"gomp@.1", "iomp5", "mklml_intel", "mkldnn@.0"}, @Platform(value = "linux", preload = {"gomp@.1", "iomp5", "mklml_intel", "mkldnn@.0"},
preloadpath = {"/lib64/", "/lib/", "/usr/lib64/", "/usr/lib/", preloadpath = {"/lib64/", "/lib/", "/usr/lib64/", "/usr/lib/"}),
"/usr/lib/powerpc64-linux-gnu/",
"/usr/lib/powerpc64le-linux-gnu/"}),
@Platform(value = {"linux-arm", "linux-ppc"}, @Platform(value = {"linux-arm", "linux-ppc"},
preload = {"gomp@.1", "gcc_s@.1", "quadmath@.0", "gfortran@.3", "openblas@.0", "libnd4jcpu"}), preload = {"gomp@.1", "gcc_s@.1", "quadmath@.0", "gfortran@.5", "gfortran@.4", "gfortran@.3", "openblas@.0", "libnd4jcpu"}),
@Platform(value = "linux-armhf", preloadpath = {"/usr/arm-linux-gnueabihf/lib/", "/usr/lib/arm-linux-gnueabihf/"}),
@Platform(value = "linux-arm64", preloadpath = {"/usr/aarch64-linux-gnu/lib/", "/usr/lib/aarch64-linux-gnu/"}),
@Platform(value = "linux-ppc64", preloadpath = {"/usr/powerpc64-linux-gnu/lib/", "/usr/powerpc64le-linux-gnu/lib/",
"/usr/lib/powerpc64-linux-gnu/", "/usr/lib/powerpc64le-linux-gnu/"}),
@Platform(value = "macosx", preload = {"gcc_s@.1", "gomp@.1", "stdc++@.6", "iomp5", "mklml", "mkldnn@.0"}, @Platform(value = "macosx", preload = {"gcc_s@.1", "gomp@.1", "stdc++@.6", "iomp5", "mklml", "mkldnn@.0"},
preloadpath = {"/usr/local/lib/gcc/8/", "/usr/local/lib/gcc/7/", "/usr/local/lib/gcc/6/", "/usr/local/lib/gcc/5/"}), preloadpath = {"/usr/local/lib/gcc/8/", "/usr/local/lib/gcc/7/", "/usr/local/lib/gcc/6/", "/usr/local/lib/gcc/5/"}),
@Platform(value = "windows", preload = {"libwinpthread-1", "libgcc_s_seh-1", "libgomp-1", "libstdc++-6", @Platform(value = "windows", preload = {"libwinpthread-1", "libgcc_s_seh-1", "libgomp-1", "libstdc++-6",