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

DOUBLE define for DBLAS objects is now set in main CMakeLists.txt. 

Since the objects are the same, could generate SINGLE/COMPLEX/etc here
without having to rewrite all the object enumeration code again.
This commit is contained in:
Hank Anderson 2015-02-02 15:00:44 -06:00
parent 9e154aba58
commit d11bde60d0
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -39,7 +39,7 @@ set(SUBDIRS_ALL ${SUBDIRS} test ctest utest exports benchmark ../laswp ../bench)
# all :: libs netlib tests shared # all :: libs netlib tests shared
# libs: # libs :
if (NOT DEFINED CORE OR "${CORE}" STREQUAL "UNKNOWN") if (NOT DEFINED CORE OR "${CORE}" STREQUAL "UNKNOWN")
message(FATAL_ERROR "Detecting CPU failed. Please set TARGET explicitly, e.g. make TARGET=your_cpu_target. Please read README for details.") message(FATAL_ERROR "Detecting CPU failed. Please set TARGET explicitly, e.g. make TARGET=your_cpu_target. Please read README for details.")
endif () endif ()
@ -61,10 +61,13 @@ endforeach ()
# get obj vars into format that add_library likes: $<TARGET_OBJS:objlib> (see http://www.cmake.org/cmake/help/v3.0/command/add_library.html) # get obj vars into format that add_library likes: $<TARGET_OBJS:objlib> (see http://www.cmake.org/cmake/help/v3.0/command/add_library.html)
set(TARGET_OBJS "") set(TARGET_OBJS "")
foreach (DBLAS_OBJ ${DBLAS_OBJS}) foreach (DBLAS_OBJ ${DBLAS_OBJS})
get_target_property(PREV_DEFS ${DBLAS_OBJ} COMPILE_DEFINITIONS)
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 ()
add_library(openblas ${TARGET_OBJS}) add_library(openblas ${TARGET_OBJS})
# TODO: Why is the config saved here? Is this necessary with CMake?
#Save the config files for installation #Save the config files for installation
# @cp Makefile.conf Makefile.conf_last # @cp Makefile.conf Makefile.conf_last
# @cp config.h config_last.h # @cp config.h config_last.h

8
driver/level3/CMakeLists.txt
View File

@ -31,13 +31,13 @@ foreach (GEMM_DEFINE ${GEMM_DEFINES})
endforeach () endforeach ()
GenerateObjects("trmm_L.c;trmm_R.c;trsm_L.c;trsm_R.c" "TRANS;UPPER;UNIT" "DOUBLE") GenerateObjects("trmm_L.c;trmm_R.c;trsm_L.c;trsm_R.c" "TRANS;UPPER;UNIT" "")
list(APPEND DBLAS_OBJS ${OBJ_LIST_OUT}) list(APPEND DBLAS_OBJS ${OBJ_LIST_OUT})
GenerateObjects("symm_k.c" "LOWER;RSIDE" "NN;DOUBLE") GenerateObjects("symm_k.c" "LOWER;RSIDE" "NN")
list(APPEND DBLAS_OBJS ${OBJ_LIST_OUT}) list(APPEND DBLAS_OBJS ${OBJ_LIST_OUT})
GenerateObjects("syrk_k.c;syr2k_k.c" "LOWER;TRANS" "DOUBLE") GenerateObjects("syrk_k.c;syr2k_k.c" "LOWER;TRANS" "")
list(APPEND DBLAS_OBJS ${OBJ_LIST_OUT}) list(APPEND DBLAS_OBJS ${OBJ_LIST_OUT})
GenerateObjects("syrk_kernel.c;syr2k_kernel.c" "LOWER" "DOUBLE") GenerateObjects("syrk_kernel.c;syr2k_kernel.c" "LOWER" "")
list(APPEND DBLAS_OBJS ${OBJ_LIST_OUT}) list(APPEND DBLAS_OBJS ${OBJ_LIST_OUT})
#if (SMP) #if (SMP)