Repository: systemml Updated Branches: refs/heads/master f393ebe31 -> 1a37cfad4
[MINOR] Fix native BLAS directory to lower case Closes #760. Project: http://git-wip-us.apache.org/repos/asf/systemml/repo Commit: http://git-wip-us.apache.org/repos/asf/systemml/commit/1a37cfad Tree: http://git-wip-us.apache.org/repos/asf/systemml/tree/1a37cfad Diff: http://git-wip-us.apache.org/repos/asf/systemml/diff/1a37cfad Branch: refs/heads/master Commit: 1a37cfad4104996a0f0ac61015ff908731713039 Parents: f393ebe Author: EdgarLGB <[email protected]> Authored: Tue May 8 19:23:27 2018 -0700 Committer: Matthias Boehm <[email protected]> Committed: Tue May 8 19:23:27 2018 -0700 ---------------------------------------------------------------------- src/main/java/org/apache/sysml/utils/NativeHelper.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/systemml/blob/1a37cfad/src/main/java/org/apache/sysml/utils/NativeHelper.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/utils/NativeHelper.java b/src/main/java/org/apache/sysml/utils/NativeHelper.java index 1a02e00..2cde065 100644 --- a/src/main/java/org/apache/sysml/utils/NativeHelper.java +++ b/src/main/java/org/apache/sysml/utils/NativeHelper.java @@ -78,7 +78,7 @@ public class NativeHelper { if(!isBLASLoaded()) { DMLConfig dmlConfig = ConfigurationManager.getDMLConfig(); String userSpecifiedBLAS = (dmlConfig == null) ? "auto" : dmlConfig.getTextValue(DMLConfig.NATIVE_BLAS).trim().toLowerCase(); - String customLibPath = (dmlConfig == null) ? "none" : dmlConfig.getTextValue(DMLConfig.NATIVE_BLAS_DIR).trim().toLowerCase(); + String customLibPath = (dmlConfig == null) ? "none" : dmlConfig.getTextValue(DMLConfig.NATIVE_BLAS_DIR).trim(); performLoading(customLibPath, userSpecifiedBLAS); } if(maxNumThreads == -1) @@ -179,6 +179,8 @@ public class NativeHelper { if(userSpecifiedBLAS.equalsIgnoreCase("auto")) { blas = new String[] { "mkl", "openblas" }; } + + if(checkAndLoadBLAS(customLibPath, blas) && loadLibraryHelper("libsystemml_" + blasType + "-Linux-x86_64.so")) { LOG.info("Using native blas: " + blasType + getNativeBLASPath()); CURRENT_NATIVE_BLAS_STATE = NativeBlasState.SUCCESSFULLY_LOADED_NATIVE_BLAS_AND_IN_USE;
