Fix BLAS++ and LAPACK++ build #903
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,5 @@ | ||
| cmake_minimum_required(VERSION 3.11) | ||
| # VERSION 3.11: FetchContent | ||
|
|
||
| project(LAPACK) | ||
|
|
||
|
|
@@ -10,6 +11,19 @@ set( | |
| ${LAPACK_MAJOR_VERSION}.${LAPACK_MINOR_VERSION}.${LAPACK_PATCH_VERSION} | ||
| ) | ||
|
|
||
| # Dependencies on other projects | ||
| include(FetchContent) | ||
| FetchContent_Declare( | ||
| blaspp | ||
| GIT_REPOSITORY https://github.com/icl-utk-edu/blaspp | ||
| GIT_TAG 3c47832f5162b5215b2164c21c4132544c65563d # v2023.11.05 | ||
| ) | ||
| FetchContent_Declare( | ||
| lapackpp | ||
| GIT_REPOSITORY https://github.com/icl-utk-edu/lapackpp | ||
| GIT_TAG e3aa0156b873d1e1349d083d7e5b66cfbdf9fb08 # v2023.11.05 | ||
| ) | ||
|
|
||
| # Allow setting a prefix for the library names | ||
| set(CMAKE_STATIC_LIBRARY_PREFIX "lib${LIBRARY_PREFIX}") | ||
| set(CMAKE_SHARED_LIBRARY_PREFIX "lib${LIBRARY_PREFIX}") | ||
|
|
@@ -402,48 +416,113 @@ endif() | |
| option(BLAS++ "Build BLAS++" OFF) | ||
| option(LAPACK++ "Build LAPACK++" OFF) | ||
|
|
||
| if (BLAS++ OR LAPACK++) | ||
| message( STATUS "BLAS++ enabled; for support, email [email protected]" ) | ||
|
|
||
| # Check if population has already been performed | ||
| FetchContent_GetProperties(blaspp) | ||
| if(NOT blaspp_POPULATED) | ||
| # Fetch the content using previously declared details | ||
| FetchContent_Populate(blaspp) | ||
| endif() | ||
|
|
||
| # Determine Fortran runtime library. | ||
| # todo: CMake ought to know this already -- how to access? | ||
| set( Fortran_LIB "" ) | ||
| if (NOT BUILD_SHARED_LIBS) | ||
| if (CMAKE_Fortran_COMPILER_ID MATCHES GNU) | ||
| set( Fortran_LIB ";-lgfortran" ) | ||
| else() | ||
| # TODO: This is incomplete. Fill in the other cases. | ||
| endif() | ||
| endif() | ||
| message( DEBUG "Fortran_LIB '${Fortran_LIB}'" ) | ||
|
There was a problem hiding this comment. Is this when using Reference BLAS, is that why it checks When I tried to compile, linking with BTW, setting it to empty in the |
||
|
|
||
| if (NOT BLAS_FOUND) | ||
| # Link with Reference BLAS. | ||
| set( BLAS_LIBS "$<TARGET_FILE:${BLASLIB}>${Fortran_LIB}" ) | ||
| else() | ||
| # Link with optimized BLAS. | ||
| set( BLAS_LIBS "${BLAS_LIBRARIES}" ) | ||
| endif() | ||
| message( DEBUG "BLAS_LIBS '${BLAS_LIBS}'" ) | ||
|
|
||
| if (NOT LATESTLAPACK_FOUND) | ||
| # Link with Reference LAPACK. | ||
| set( LAPACK_LIBS "$<TARGET_FILE:${LAPACKLIB}>${Fortran_LIB}" ) | ||
| else() | ||
| # Link with optimized BLAS. | ||
| set( LAPACK_LIBS "${LAPACK_LIBRARIES}" ) | ||
| endif() | ||
| message( DEBUG "LAPACK_LIBS '${LAPACK_LIBS}'" ) | ||
|
|
||
| # Adds target blaspp | ||
| add_custom_target( blaspp ALL DEPENDS blaspp-cmd ) | ||
| add_custom_command( OUTPUT blaspp-cmd | ||
| WORKING_DIRECTORY "${blaspp_SOURCE_DIR}" | ||
| COMMENT "Building BLAS++" ) | ||
|
|
||
| # Set up information about the BLAS and LAPACK libraries | ||
| add_custom_command( OUTPUT blaspp-cmd APPEND | ||
| COMMAND ${CMAKE_COMMAND} | ||
| -B "${blaspp_BINARY_DIR}" | ||
| -D CMAKE_INSTALL_PREFIX="${LAPACK_BINARY_DIR}" | ||
| -D BLAS_LIBRARIES="${BLAS_LIBS}" | ||
| -D LAPACK_LIBRARIES="${LAPACK_LIBS}" | ||
| -D build_tests=OFF | ||
| -D CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} | ||
| -D BUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} | ||
|
|
||
| COMMAND ${CMAKE_COMMAND} | ||
| --build "${blaspp_BINARY_DIR}" | ||
| --config ${CMAKE_BUILD_TYPE} | ||
| --target install | ||
| ) | ||
|
|
||
| # Set up dependencies | ||
| if(NOT BLAS_FOUND) | ||
| add_dependencies(blaspp ${BLASLIB}) | ||
| endif() | ||
| if(NOT LATESTLAPACK_FOUND) | ||
| add_dependencies(blaspp ${LAPACKLIB}) | ||
| endif() | ||
| endif() | ||
|
|
||
| if (LAPACK++) | ||
| message( STATUS "LAPACK++ enabled; for support, email [email protected]" ) | ||
|
|
||
| # Check if population has already been performed | ||
| FetchContent_GetProperties(lapackpp) | ||
| if(NOT lapackpp_POPULATED) | ||
| # Fetch the content using previously declared details | ||
| FetchContent_Populate(lapackpp) | ||
| endif() | ||
|
|
||
| # Adds target lapackpp | ||
| add_custom_target( lapackpp ALL DEPENDS lapackpp-cmd ) | ||
| add_custom_command( OUTPUT lapackpp-cmd | ||
| WORKING_DIRECTORY "${lapackpp_SOURCE_DIR}" | ||
| COMMENT "Building LAPACK++" ) | ||
|
|
||
| # Setup remaining configuration options and installation | ||
| add_custom_command( OUTPUT lapackpp-cmd APPEND | ||
| COMMAND ${CMAKE_COMMAND} | ||
| -B "${lapackpp_BINARY_DIR}" | ||
| -D CMAKE_INSTALL_PREFIX="${LAPACK_BINARY_DIR}" | ||
| -D blaspp_DIR="${PROJECT_BINARY_DIR}/lib/cmake/blaspp" | ||
| -D LAPACK_LIBRARIES="${LAPACK_LIBS}" | ||
| -D build_tests=OFF | ||
| -D CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} | ||
| -D BUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} | ||
|
|
||
| COMMAND ${CMAKE_COMMAND} | ||
| --build "${lapackpp_BINARY_DIR}" | ||
| --config ${CMAKE_BUILD_TYPE} | ||
| --target install | ||
| ) | ||
|
|
||
| # Set up dependencies | ||
| add_dependencies(lapackpp blaspp) | ||
| endif() | ||
|
|
||
| # -------------------------------------------------- | ||
|
|
@@ -551,47 +630,26 @@ install(FILES | |
| DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${LAPACKLIB}-${LAPACK_VERSION} | ||
| COMPONENT Development | ||
| ) | ||
|
|
||
| if (LAPACK++) | ||
| install( | ||
| DIRECTORY "${LAPACK_BINARY_DIR}/lib/" | ||
| DESTINATION ${CMAKE_INSTALL_LIBDIR} | ||
|
There was a problem hiding this comment. Same issue as below; use |
||
| FILES_MATCHING REGEX "lapackpp" | ||
| ) | ||
| endif() | ||
|
|
||
| if (BLAS++) | ||
|
There was a problem hiding this comment. LAPACK++ requires BLAS++, so as above, I think this should be There was a problem hiding this comment. With |
||
| install( | ||
| DIRECTORY "${LAPACK_BINARY_DIR}/lib/" | ||
| DESTINATION ${CMAKE_INSTALL_LIBDIR} | ||
|
There was a problem hiding this comment. On Linux, it put them in On macOS, it put them in |
||
| FILES_MATCHING REGEX "blaspp" | ||
| ) | ||
| endif() | ||
|
|
||
| if (BLAS++ OR LAPACK++) | ||
| install( | ||
| DIRECTORY "${LAPACK_BINARY_DIR}/include/" | ||
| DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" | ||
| FILES_MATCHING REGEX "\\.(h|hh)$" | ||
| ) | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
May want blaspp 91dd418fa910498cc03dee397826099914cc3185
and lapackpp 88088c33cd9467475e8f139f42d158620f11e64d
which have the fixes for Fortran strlen.
We will likely do a SLATE / BLAS++ / LAPACK++ bug fix release this month, but perhaps for that just update LAPACK right before the SC23 release.