floraachy
/
OpenBLAS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added DLA sources from lapack-netlib. 

Can't use the lapack-netlib cmake files, since they are designed to
build a complete lapack/blas library. They have their own fortran
detection and flag setup and so on. Instead I'll just recreate the
makefiles I need.

Fixed a typo in the NAME defines.
This commit is contained in:
Hank Anderson 2015-02-10 11:01:01 -06:00
parent 3b20b62423
commit 96cf6779ca
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
CMakeLists.txt
View File

@ -66,6 +66,19 @@ foreach (DBLAS_OBJ ${DBLAS_OBJS})
set_target_properties(${DBLAS_OBJ} PROPERTIES COMPILE_DEFINITIONS "${PREV_DEFS};DOUBLE") set_target_properties(${DBLAS_OBJ} PROPERTIES COMPILE_DEFINITIONS "${PREV_DEFS};DOUBLE")
list(APPEND TARGET_OBJS "$<TARGET_OBJECTS:${DBLAS_OBJ}>") list(APPEND TARGET_OBJS "$<TARGET_OBJECTS:${DBLAS_OBJ}>")
endforeach () endforeach ()
# netlib:
# Can't just use lapack-netlib's CMake files, since they are set up to search for BLAS, build and install a binary. We just want to build a couple of lib files out of lapack and lapacke.
# N.B. if a source is added or removed you MUST re-run the cmake command manually; make will not do it.
file(GLOB DLA_SOURCES "${NETLIB_LAPACK_DIR}/SRC/d*.f")
add_library(DLA_OBJ OBJECT ${DLA_SOURCES})
set_target_properties(${DLA_OBJ} PROPERTIES COMPILE_FLAGS ${LAPACK_FFLAGS})
list(APPEND TARGET_OBJS "$<TARGET_OBJECTS:DLA_OBJ>")
# add objects to the openblas lib
add_library(openblas ${TARGET_OBJS}) add_library(openblas ${TARGET_OBJS})
# TODO: Why is the config saved here? Is this necessary with CMake? # TODO: Why is the config saved here? Is this necessary with CMake?

2
cmake/utils.cmake
View File

@ -128,7 +128,7 @@ function(GenerateNamedObjects sources_in float_type_in)
list(APPEND obj_defines "CBLAS") list(APPEND obj_defines "CBLAS")
endif () endif ()
list(APPEND obj_defines "ASMNAME=${FU}${obj_name};ASMFNAME=${FU}${obj_name}${BU};NAME=${obj_name}${BU};CNAME=${obj_name};CAR_NAME=\"${obj_name}${BU}\";CHAR_CNAME=\"${obj_name}\"") list(APPEND obj_defines "ASMNAME=${FU}${obj_name};ASMFNAME=${FU}${obj_name}${BU};NAME=${obj_name}${BU};CNAME=${obj_name};CHAR_NAME=\"${obj_name}${BU}\";CHAR_CNAME=\"${obj_name}\"")
list(APPEND obj_defines ${defines_in}) list(APPEND obj_defines ${defines_in})
list(APPEND obj_defines ${float_type_in}) list(APPEND obj_defines ${float_type_in})