Skip to content

Commit 27d6962

Browse files
authored
fix mac build (#11873)
* fix mac build * add notes * fix_mac_build * update
1 parent da158c2 commit 27d6962

File tree

2 files changed

+12
-9
lines changed

2 files changed

+12
-9
lines changed

CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ option(REPLACE_ENFORCE_GLOG "Replace PADDLE_ENFORCE with glog/CHECK for better d
6565
option(WITH_ANAKIN "Compile with Anakin library" OFF)
6666
option(WITH_GRPC "Use grpc as the default rpc framework" ${WITH_DISTRIBUTE})
6767
option(WITH_BRPC_RDMA "Use brpc rdma as the rpc protocal" OFF)
68+
option(WITH_SYSTEM_BLAS "Use system blas library" OFF)
6869

6970
# CMAKE_BUILD_TYPE
7071
if(NOT CMAKE_BUILD_TYPE)

cmake/cblas.cmake

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -83,18 +83,20 @@ else()
8383
set(REFERENCE_CBLAS_LIB_SEARCH_PATHS ${REFERENCE_CBLAS_ROOT}/lib)
8484
endif()
8585

86-
find_path(REFERENCE_CBLAS_INCLUDE_DIR NAMES cblas.h PATHS
86+
if(WITH_SYSTEM_BLAS)
87+
find_path(REFERENCE_CBLAS_INCLUDE_DIR NAMES cblas.h PATHS
8788
${REFERENCE_CBLAS_INCLUDE_SEARCH_PATHS})
88-
find_library(REFERENCE_CBLAS_LIBRARY NAMES cblas PATHS
89+
find_library(REFERENCE_CBLAS_LIBRARY NAMES cblas PATHS
8990
${REFERENCE_CBLAS_LIB_SEARCH_PATHS})
9091

91-
if(REFERENCE_CBLAS_INCLUDE_DIR AND REFERENCE_CBLAS_LIBRARY)
92-
set(CBLAS_FOUND ON)
93-
set(CBLAS_PROVIDER REFERENCE)
94-
set(CBLAS_INC_DIR ${REFERENCE_CBLAS_INCLUDE_DIR})
95-
set(CBLAS_LIBRARIES ${REFERENCE_CBLAS_LIBRARY})
96-
add_definitions(-DPADDLE_USE_REFERENCE_CBLAS)
97-
message(STATUS "Found reference-cblas (include: ${CBLAS_INC_DIR}, library: ${CBLAS_LIBRARIES})")
92+
if(REFERENCE_CBLAS_INCLUDE_DIR AND REFERENCE_CBLAS_LIBRARY)
93+
set(CBLAS_FOUND ON)
94+
set(CBLAS_PROVIDER REFERENCE)
95+
set(CBLAS_INC_DIR ${REFERENCE_CBLAS_INCLUDE_DIR})
96+
set(CBLAS_LIBRARIES ${REFERENCE_CBLAS_LIBRARY})
97+
add_definitions(-DPADDLE_USE_REFERENCE_CBLAS)
98+
message(STATUS "Found reference-cblas (include: ${CBLAS_INC_DIR}, library: ${CBLAS_LIBRARIES})")
99+
endif()
98100
endif()
99101

100102
if(IOS_USE_VECLIB_FOR_BLAS AND VECLIB_FOUND)

0 commit comments

Comments
 (0)