[mlpack] 32/40: Preferentially find ATLAS libraries.
Barak A. Pearlmutter
barak+git at pearlmutter.net
Mon Feb 15 19:34:25 UTC 2016
This is an automated email from the git hooks/post-receive script.
bap pushed a commit to branch master
in repository mlpack.
commit 8628bce45b02ff2b3520b37f0defbc0c1cfeaf8d
Author: Ryan Curtin <ryan at ratml.org>
Date: Thu Feb 4 15:59:06 2016 -0500
Preferentially find ATLAS libraries.
---
CMake/ARMA_FindBLAS.cmake | 11 +++++++++--
CMake/ARMA_FindLAPACK.cmake | 13 ++++++++++---
2 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/CMake/ARMA_FindBLAS.cmake b/CMake/ARMA_FindBLAS.cmake
index e757ac1..7cf8aa9 100644
--- a/CMake/ARMA_FindBLAS.cmake
+++ b/CMake/ARMA_FindBLAS.cmake
@@ -6,6 +6,13 @@
# BLAS_LIBRARY, where to find the BLAS library.
SET(BLAS_NAMES ${BLAS_NAMES} blas)
+
+# Find the ATLAS version preferentially.
+FIND_LIBRARY(BLAS_LIBRARY
+ NAMES ${BLAS_NAMES}
+ PATHS /usr/lib64/atlas /usr/lib/atlas /usr/local/lib64/atlas /usr/local/lib/atlas
+ NO_DEFAULT_PATH)
+
FIND_LIBRARY(BLAS_LIBRARY
NAMES ${BLAS_NAMES}
PATHS /usr/lib64/atlas /usr/lib/atlas /usr/lib64 /usr/lib /usr/local/lib64 /usr/local/lib
@@ -21,11 +28,11 @@ ENDIF (BLAS_LIBRARY)
IF (BLAS_FOUND)
IF (NOT BLAS_FIND_QUIETLY)
- MESSAGE(STATUS "Found a BLAS library: ${BLAS_LIBRARIES}")
+ MESSAGE(STATUS "Found BLAS: ${BLAS_LIBRARIES}")
ENDIF (NOT BLAS_FIND_QUIETLY)
ELSE (BLAS_FOUND)
IF (BLAS_FIND_REQUIRED)
- MESSAGE(FATAL_ERROR "Could not find a BLAS library")
+ MESSAGE(FATAL_ERROR "Could not find BLAS")
ENDIF (BLAS_FIND_REQUIRED)
ENDIF (BLAS_FOUND)
diff --git a/CMake/ARMA_FindLAPACK.cmake b/CMake/ARMA_FindLAPACK.cmake
index b8e9342..fd0e92c 100644
--- a/CMake/ARMA_FindLAPACK.cmake
+++ b/CMake/ARMA_FindLAPACK.cmake
@@ -6,9 +6,16 @@
# LAPACK_LIBRARY, where to find the LAPACK library.
SET(LAPACK_NAMES ${LAPACK_NAMES} lapack)
+
+# Check ATLAS paths preferentially, using this necessary hack (I love CMake).
+FIND_LIBRARY(LAPACK_LIBRARY
+ NAMES ${LAPACK_NAMES}
+ PATHS /usr/lib64/atlas /usr/lib/atlas /usr/local/lib64/atlas /usr/local/lib/atlas
+ NO_DEFAULT_PATH)
+
FIND_LIBRARY(LAPACK_LIBRARY
NAMES ${LAPACK_NAMES}
- PATHS /usr/lib64/atlas /usr/lib/atlas /usr/lib64 /usr/lib /usr/local/lib64 /usr/local/lib
+ PATHS /usr/lib64 /usr/lib /usr/local/lib64 /usr/local/lib
)
IF (LAPACK_LIBRARY)
@@ -21,11 +28,11 @@ ENDIF (LAPACK_LIBRARY)
IF (LAPACK_FOUND)
IF (NOT LAPACK_FIND_QUIETLY)
- MESSAGE(STATUS "Found a LAPACK library: ${LAPACK_LIBRARIES}")
+ MESSAGE(STATUS "Found LAPACK: ${LAPACK_LIBRARIES}")
ENDIF (NOT LAPACK_FIND_QUIETLY)
ELSE (LAPACK_FOUND)
IF (LAPACK_FIND_REQUIRED)
- MESSAGE(FATAL_ERROR "Could not find a LAPACK library")
+ MESSAGE(FATAL_ERROR "Could not find LAPACK")
ENDIF (LAPACK_FIND_REQUIRED)
ENDIF (LAPACK_FOUND)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/mlpack.git
More information about the debian-science-commits
mailing list