More robust BLAS detection

cyyever · cyyever · commit 128c944d22f8 · 2025-05-01T11:20:17.000+08:00
diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake
@@ -158,8 +158,6 @@ if(NOT INTERN_BUILD_MOBILE)
   set(BLAS "MKL" CACHE STRING "Selected BLAS library")
 else()
   set(BLAS "Eigen" CACHE STRING "Selected BLAS library")
-  set(AT_MKLDNN_ENABLED 0)
-  set(AT_MKL_ENABLED 0)
 endif()
 set_property(CACHE BLAS PROPERTY STRINGS "ATLAS;BLIS;Eigen;FLAME;Generic;MKL;OpenBLAS;vecLib;APL")
 message(STATUS "Trying to find preferred BLAS backend of choice: " ${BLAS})
@@ -206,6 +204,7 @@ elseif(BLAS STREQUAL "MKL")
   else()
     message(WARNING "MKL could not be found. Defaulting to Eigen")
     set(CAFFE2_USE_MKL OFF)
+    set(BLAS "Eigen")
   endif()
 elseif(BLAS STREQUAL "NVPL")
   find_package(NVPL_BLAS REQUIRED)
@@ -255,6 +254,9 @@ if(NOT INTERN_BUILD_MOBILE)
     find_package(BLAS)
     if(NOT BLAS_FOUND)
       set(USE_BLAS 0)
+    else()
+      message(WARNING "Found BLAS libraries ${BLAS_LIBRARIES}")
+      list(APPEND Caffe2_DEPENDENCY_LIBS BLAS::BLAS)
     endif()
   endif()
 
@@ -267,8 +269,7 @@ if(NOT INTERN_BUILD_MOBILE)
 elseif(INTERN_USE_EIGEN_BLAS)
   # Eigen BLAS for Mobile
   set(USE_BLAS 1)
-  include(${CMAKE_CURRENT_LIST_DIR}/External/EigenBLAS.cmake)
-  list(APPEND Caffe2_DEPENDENCY_LIBS eigen_blas)
+  set(BLAS "Eigen")
 endif()
 
 # --- [ PocketFFT
@@ -838,23 +839,25 @@ elseif(NOT TARGET fp16 AND USE_SYSTEM_FP16)
 endif()
 list(APPEND Caffe2_DEPENDENCY_LIBS fp16)
 
-# ---[ EIGEN
-# Due to license considerations, we will only use the MPL2 parts of Eigen.
-set(EIGEN_MPL2_ONLY 1)
-if(USE_SYSTEM_EIGEN_INSTALL)
-  find_package(Eigen3)
-  if(EIGEN3_FOUND)
-    message(STATUS "Found system Eigen at " ${EIGEN3_INCLUDE_DIR})
+if(BLAS STREQUAL "Eigen")
+  # Due to license considerations, we will only use the MPL2 parts of Eigen.
+  set(EIGEN_MPL2_ONLY 1)
+  add_compile_definitions(EIGEN_MPL2_ONLY)
+  if(USE_SYSTEM_EIGEN_INSTALL)
+    find_package(Eigen3)
+    if(EIGEN3_FOUND)
+      message(STATUS "Found system Eigen at " ${EIGEN3_INCLUDE_DIR})
+    else()
+      message(STATUS "Did not find system Eigen. Using third party subdirectory.")
+      set(EIGEN3_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/../third_party/eigen)
+      caffe2_update_option(USE_SYSTEM_EIGEN_INSTALL OFF)
+    endif()
   else()
-    message(STATUS "Did not find system Eigen. Using third party subdirectory.")
+    message(STATUS "Using third party subdirectory Eigen.")
     set(EIGEN3_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/../third_party/eigen)
-    caffe2_update_option(USE_SYSTEM_EIGEN_INSTALL OFF)
   endif()
-else()
-  message(STATUS "Using third party subdirectory Eigen.")
-  set(EIGEN3_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/../third_party/eigen)
+  include_directories(SYSTEM ${EIGEN3_INCLUDE_DIR})
 endif()
-include_directories(SYSTEM ${EIGEN3_INCLUDE_DIR})
 
 
 # ---[ Python Interpreter
