[Cmake-commits] CMake branch, master, updated. v3.10.0-rc5-349-g6e07850
Kitware Robot
kwrobot at kitware.com
Fri Nov 17 10:25:18 EST 2017
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, master has been updated
via 6e078505444faf3b140e9032ddfdd23d3d5e3fd6 (commit)
via 7dfeafaaaa15e0ff80e00cb875d4f037bf08b0aa (commit)
via f5bc78263e15f07fc1fed15d970d7ecf9e84f7cc (commit)
via cd2cdfe2537a43e9ab8700cc0d653f76630f1ed5 (commit)
via 23ab451a13aa0113de365d2f1a9f82598b160a27 (commit)
from d261704ef529b420ac04335364344a91b4c9d95f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6e078505444faf3b140e9032ddfdd23d3d5e3fd6
commit 6e078505444faf3b140e9032ddfdd23d3d5e3fd6
Merge: 7dfeafa f5bc782
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Nov 17 15:18:13 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri Nov 17 10:18:21 2017 -0500
Merge topic 'blas-lapack-flame'
f5bc7826 Find{BLAS,LAPACK}: Add support for FLAME blis and libflame
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1486
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7dfeafaaaa15e0ff80e00cb875d4f037bf08b0aa
commit 7dfeafaaaa15e0ff80e00cb875d4f037bf08b0aa
Merge: d261704 cd2cdfe
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Nov 17 15:15:18 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri Nov 17 10:15:25 2017 -0500
Merge topic 'FindRuby-through-2.4'
cd2cdfe2 FindRuby: Add support for versions 2.2, 2.3, and 2.4
23ab451a FindRuby: Fix match of '.' in version numbers
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1493
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f5bc78263e15f07fc1fed15d970d7ecf9e84f7cc
commit f5bc78263e15f07fc1fed15d970d7ecf9e84f7cc
Author: J M Dieterich <dieterich at ogolem.org>
AuthorDate: Wed Nov 15 12:00:41 2017 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Nov 16 11:43:15 2017 -0500
Find{BLAS,LAPACK}: Add support for FLAME blis and libflame
FLAME (github.com/flame) provides a variety of numerical libraries.
`blis` and `libflame` can be setup to expose BLAS/LAPACK interfaces.
Fixes: #17470
diff --git a/Help/release/dev/blas-lapack-flame.rst b/Help/release/dev/blas-lapack-flame.rst
new file mode 100644
index 0000000..fdc3a69
--- /dev/null
+++ b/Help/release/dev/blas-lapack-flame.rst
@@ -0,0 +1,5 @@
+blas-lapack-flame
+-----------------
+
+* The :module:`FindBLAS` and :module:`FindLAPACK` modules learned to support
+ `FLAME <https://github.com/flame>`__ ``blis`` and ``libflame``.
diff --git a/Modules/FindBLAS.cmake b/Modules/FindBLAS.cmake
index 2684617..bb8b308 100644
--- a/Modules/FindBLAS.cmake
+++ b/Modules/FindBLAS.cmake
@@ -36,6 +36,7 @@
#
# * Goto
# * OpenBLAS
+# * FLAME
# * ATLAS PhiPACK
# * CXML
# * DXML
@@ -190,6 +191,20 @@ if (BLA_VENDOR STREQUAL "OpenBLAS" OR BLA_VENDOR STREQUAL "All")
endif()
endif ()
+if (BLA_VENDOR STREQUAL "FLAME" OR BLA_VENDOR STREQUAL "All")
+ if(NOT BLAS_LIBRARIES)
+ # FLAME's blis library (https://github.com/flame/blis)
+ check_fortran_libraries(
+ BLAS_LIBRARIES
+ BLAS
+ sgemm
+ ""
+ "blis"
+ ""
+ )
+ endif()
+endif ()
+
if (BLA_VENDOR STREQUAL "ATLAS" OR BLA_VENDOR STREQUAL "All")
if(NOT BLAS_LIBRARIES)
# BLAS in ATLAS library? (http://math-atlas.sourceforge.net/)
diff --git a/Modules/FindLAPACK.cmake b/Modules/FindLAPACK.cmake
index a451e6c..a3c87f8 100644
--- a/Modules/FindLAPACK.cmake
+++ b/Modules/FindLAPACK.cmake
@@ -37,6 +37,7 @@
#
# * Intel(mkl)
# * OpenBLAS
+# * FLAME
# * ACML
# * Apple
# * NAS
@@ -201,6 +202,20 @@ if (BLA_VENDOR STREQUAL "OpenBLAS" OR BLA_VENDOR STREQUAL "All")
endif()
endif ()
+if (BLA_VENDOR STREQUAL "FLAME" OR BLA_VENDOR STREQUAL "All")
+ if(NOT LAPACK_LIBRARIES)
+ check_lapack_libraries(
+ LAPACK_LIBRARIES
+ LAPACK
+ cheev
+ ""
+ "flame"
+ "${BLAS_LIBRARIES}"
+ ""
+ )
+ endif()
+endif ()
+
#acml lapack
if (BLA_VENDOR MATCHES "ACML" OR BLA_VENDOR STREQUAL "All")
if (BLAS_LIBRARIES MATCHES ".+acml.+")
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cd2cdfe2537a43e9ab8700cc0d653f76630f1ed5
commit cd2cdfe2537a43e9ab8700cc0d653f76630f1ed5
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Nov 16 07:03:37 2017 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Nov 16 07:05:00 2017 -0500
FindRuby: Add support for versions 2.2, 2.3, and 2.4
Author: J. Peter Mugaas (jpmugaas on gitlab.kitware.com)
Fixes: #17475
diff --git a/Modules/FindRuby.cmake b/Modules/FindRuby.cmake
index 8ba1032..bd9f835 100644
--- a/Modules/FindRuby.cmake
+++ b/Modules/FindRuby.cmake
@@ -59,6 +59,9 @@ else()
endif()
if(NOT Ruby_FIND_VERSION_EXACT)
+ list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby2.4 ruby24)
+ list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby2.3 ruby23)
+ list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby2.2 ruby22)
list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby2.1 ruby21)
list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby2.0 ruby20)
list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby1.9 ruby19)
@@ -170,6 +173,21 @@ if(RUBY_EXECUTABLE AND NOT RUBY_VERSION_MAJOR)
set(RUBY_VERSION_MAJOR 2)
set(RUBY_VERSION_MINOR 1)
endif()
+ # check whether we found 2.2.x
+ if(${RUBY_EXECUTABLE} MATCHES "ruby2\\.?2")
+ set(RUBY_VERSION_MAJOR 2)
+ set(RUBY_VERSION_MINOR 2)
+ endif()
+ # check whether we found 2.3.x
+ if(${RUBY_EXECUTABLE} MATCHES "ruby2\\.?3")
+ set(RUBY_VERSION_MAJOR 2)
+ set(RUBY_VERSION_MINOR 3)
+ endif()
+ # check whether we found 2.4.x
+ if(${RUBY_EXECUTABLE} MATCHES "ruby2\\.?4")
+ set(RUBY_VERSION_MAJOR 2)
+ set(RUBY_VERSION_MINOR 4)
+ endif()
endif()
if(RUBY_VERSION_MAJOR)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=23ab451a13aa0113de365d2f1a9f82598b160a27
commit 23ab451a13aa0113de365d2f1a9f82598b160a27
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Nov 16 07:02:26 2017 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Nov 16 07:02:26 2017 -0500
FindRuby: Fix match of '.' in version numbers
Escape `.` so that it is matched literally and not treated as a
special match of any character by the regex.
diff --git a/Modules/FindRuby.cmake b/Modules/FindRuby.cmake
index a9f8d35..8ba1032 100644
--- a/Modules/FindRuby.cmake
+++ b/Modules/FindRuby.cmake
@@ -156,17 +156,17 @@ if(RUBY_EXECUTABLE AND NOT RUBY_VERSION_MAJOR)
set(RUBY_VERSION_MINOR 8)
set(RUBY_VERSION_PATCH 0)
# check whether we found 1.9.x
- if(${RUBY_EXECUTABLE} MATCHES "ruby1.?9")
+ if(${RUBY_EXECUTABLE} MATCHES "ruby1\\.?9")
set(RUBY_VERSION_MAJOR 1)
set(RUBY_VERSION_MINOR 9)
endif()
# check whether we found 2.0.x
- if(${RUBY_EXECUTABLE} MATCHES "ruby2.?0")
+ if(${RUBY_EXECUTABLE} MATCHES "ruby2\\.?0")
set(RUBY_VERSION_MAJOR 2)
set(RUBY_VERSION_MINOR 0)
endif()
# check whether we found 2.1.x
- if(${RUBY_EXECUTABLE} MATCHES "ruby2.?1")
+ if(${RUBY_EXECUTABLE} MATCHES "ruby2\\.?1")
set(RUBY_VERSION_MAJOR 2)
set(RUBY_VERSION_MINOR 1)
endif()
-----------------------------------------------------------------------
Summary of changes:
Help/release/dev/blas-lapack-flame.rst | 5 +++++
Modules/FindBLAS.cmake | 15 +++++++++++++++
Modules/FindLAPACK.cmake | 15 +++++++++++++++
Modules/FindRuby.cmake | 24 +++++++++++++++++++++---
4 files changed, 56 insertions(+), 3 deletions(-)
create mode 100644 Help/release/dev/blas-lapack-flame.rst
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list