Skip to content

Commit

Permalink
[hotfix] fix misleadingly summary BLAS=MKL when there's no BLAS insta…
Browse files Browse the repository at this point in the history
…ll (#47803)

Summary: Pull Request resolved: #47803

Reviewed By: samestep

Differential Revision: D24907453

Pulled By: walterddr

fbshipit-source-id: a3e41041f6aa506b054eb0ffc61f8525ba02cbf1
  • Loading branch information
Rong Rong authored and facebook-github-bot committed Nov 13, 2020
1 parent 9734c04 commit 7391edb
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 1 deletion.
2 changes: 2 additions & 0 deletions cmake/Dependencies.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -1643,6 +1643,8 @@ if(NOT INTERN_BUILD_MOBILE)
if(LAPACK_FOUND)
set(USE_LAPACK 1)
list(APPEND Caffe2_PRIVATE_DEPENDENCY_LIBS ${LAPACK_LIBRARIES})
else()
set(USE_LAPACK 0)
endif()

if(NOT USE_CUDA)
Expand Down
9 changes: 8 additions & 1 deletion cmake/Summary.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ function(caffe2_print_configuration_summary)
message(STATUS " C++ compiler : ${CMAKE_CXX_COMPILER}")
message(STATUS " C++ compiler id : ${CMAKE_CXX_COMPILER_ID}")
message(STATUS " C++ compiler version : ${CMAKE_CXX_COMPILER_VERSION}")
message(STATUS " BLAS : ${BLAS}")
message(STATUS " CXX flags : ${CMAKE_CXX_FLAGS}")
message(STATUS " Build type : ${CMAKE_BUILD_TYPE}")
get_directory_property(tmp DIRECTORY ${PROJECT_SOURCE_DIR} COMPILE_DEFINITIONS)
Expand Down Expand Up @@ -51,6 +50,14 @@ function(caffe2_print_configuration_summary)

message(STATUS " INTERN_BUILD_MOBILE : ${INTERN_BUILD_MOBILE}")

message(STATUS " USE_BLAS : ${USE_BLAS}")
if(${USE_BLAS})
message(STATUS " BLAS : ${BLAS_INFO}")
endif()
message(STATUS " USE_LAPACK : ${USE_LAPACK}")
if(${USE_LAPACK})
message(STATUS " LAPACK : ${LAPACK_INFO}")
endif()
message(STATUS " USE_ASAN : ${USE_ASAN}")
message(STATUS " USE_CPP_CODE_COVERAGE : ${USE_CPP_CODE_COVERAGE}")
message(STATUS " USE_CUDA : ${USE_CUDA}")
Expand Down

0 comments on commit 7391edb

Please sign in to comment.