From d11bde60d0ec4f2d597cd5493aad4f8e44b5ecff Mon Sep 17 00:00:00 2001 From: Hank Anderson Date: Mon, 2 Feb 2015 15:00:44 -0600 Subject: [PATCH] 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. --- CMakeLists.txt | 5 ++++- driver/level3/CMakeLists.txt | 8 ++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 246ad3097..bf1563d0b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,7 +39,7 @@ set(SUBDIRS_ALL ${SUBDIRS} test ctest utest exports benchmark ../laswp ../bench) # all :: libs netlib tests shared -# libs: +# libs : 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.") endif () @@ -61,10 +61,13 @@ endforeach () # get obj vars into format that add_library likes: $ (see http://www.cmake.org/cmake/help/v3.0/command/add_library.html) set(TARGET_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 "$") endforeach () add_library(openblas ${TARGET_OBJS}) +# TODO: Why is the config saved here? Is this necessary with CMake? #Save the config files for installation # @cp Makefile.conf Makefile.conf_last # @cp config.h config_last.h diff --git a/driver/level3/CMakeLists.txt b/driver/level3/CMakeLists.txt index c6f008baa..57865d18b 100644 --- a/driver/level3/CMakeLists.txt +++ b/driver/level3/CMakeLists.txt @@ -31,13 +31,13 @@ foreach (GEMM_DEFINE ${GEMM_DEFINES}) 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}) -GenerateObjects("symm_k.c" "LOWER;RSIDE" "NN;DOUBLE") +GenerateObjects("symm_k.c" "LOWER;RSIDE" "NN") 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}) -GenerateObjects("syrk_kernel.c;syr2k_kernel.c" "LOWER" "DOUBLE") +GenerateObjects("syrk_kernel.c;syr2k_kernel.c" "LOWER" "") list(APPEND DBLAS_OBJS ${OBJ_LIST_OUT}) #if (SMP)