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

fix preload 

Signed-off-by: raver119 <raver119@gmail.com>
master
raver119 2019-11-14 20:00:24 +03:00
parent 6de00bf75f
commit cab90d3dc7
2 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/src/main/java/org/nd4j/linalg/cpu/nativecpu/CpuNDArrayFactory.java
View File

@ -84,13 +84,6 @@ public class CpuNDArrayFactory extends BaseNativeNDArrayFactory {
@Override @Override
public void createBlas() { public void createBlas() {
String lib = System.getProperty(ND4JSystemProperties.ND4J_CPU_LOAD_OPENBLAS,
System.getProperty(ND4JSystemProperties.ND4J_CPU_LOAD_OPENBLAS_NOLAPACK, "")).toLowerCase();
if (lib.trim().length() == 0) {
// try to load by default the LAPACK-less version of MKL bundled with MKL-DNN
System.setProperty(ND4JSystemProperties.ND4J_CPU_LOAD_OPENBLAS_NOLAPACK, "mklml");
}
// we'll check hardware support first // we'll check hardware support first
if (!nativeOps.isMinimalRequirementsMet()) { if (!nativeOps.isMinimalRequirementsMet()) {
// this means cpu binary was built for some arch support, we don't have on this box // this means cpu binary was built for some arch support, we don't have on this box

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

@ -130,18 +130,12 @@ import java.util.Scanner;
compiler = {"cpp11", "nowarnings"}, library = "jnind4jcpu", link = "nd4jcpu", compiler = {"cpp11", "nowarnings"}, library = "jnind4jcpu", link = "nd4jcpu",
preloadresource = {"org/bytedeco/openblas/"}, preloadresource = {"org/bytedeco/openblas/"},
preload = {"openblas", "openblas_nolapack", "libnd4jcpu"}), preload = {"openblas", "openblas_nolapack", "libnd4jcpu"}),
@Platform(value = "linux", preload = {"gomp@.1"}, @Platform(value = "linux", preload = {"gomp@.1"}, preloadpath = {"/lib64/", "/lib/", "/usr/lib64/", "/usr/lib/"}),
preloadpath = {"/lib64/", "/lib/", "/usr/lib64/", "/usr/lib/"}), @Platform(value = {"linux-arm", "linux-ppc"}, preload = {"gomp@.1", "gcc_s@.1", "quadmath@.0", "gfortran@.5", "gfortran@.4", "gfortran@.3", "openblas@.0", "libnd4jcpu"}),
@Platform(value = {"linux-arm", "linux-ppc"},
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-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-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/", @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/"}),
"/usr/lib/powerpc64-linux-gnu/", "/usr/lib/powerpc64le-linux-gnu/"}), @Platform(value = "windows", preload = {"libwinpthread-1", "libgcc_s_seh-1", "libgomp-1", "libstdc++-6", "msvcr120", "libnd4jcpu"}),
@Platform(value = "macosx", preload = {"gcc_s@.1", "gomp@.1", "stdc++@.6"},
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",
"msvcr120", "libnd4jcpu"}),
@Platform(extension = {"-avx512", "-avx2"}) }) @Platform(extension = {"-avx512", "-avx2"}) })
public class Nd4jCpuPresets implements InfoMapper, BuildEnabled { public class Nd4jCpuPresets implements InfoMapper, BuildEnabled {