Added CBLAS define/naming convention to GenerateNamedObjects.

diff --git a/cmake/utils.cmake b/cmake/utils.cmake
index d02ee1a..f839245 100644 (file)
--- a/cmake/utils.cmake
+++ b/cmake/utils.cmake
@@ -94,7 +94,7 @@ endfunction ()
 # @param defines_in (optional) preprocessor definitions that will be applied to all objects
 # @param name_in (optional) if this is set this name will be used instead of the filename. Use a * to indicate where the float character should go, if no star the character will be prepended.
 #                           e.g. with DOUBLE set, "i*max" will generate the name "idmax", and "max" will be "dmax"
-function(GenerateNamedObjects sources_in float_type_in defines_in name_in)
+function(GenerateNamedObjects sources_in float_type_in defines_in name_in use_cblas)
   set(OBJ_LIST_OUT "")
   foreach (source_file ${sources_in})
 
@@ -114,10 +114,18 @@ function(GenerateNamedObjects sources_in float_type_in defines_in name_in)
     endif ()
 
     # now add the object and set the defines
-    add_library(${obj_name} OBJECT ${source_file})
-    set(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}\"")
+    set(obj_defines ${defines_in})
+
+    if (use_cblas)
+      set(obj_name "cblas_${obj_name}")
+      list(APPEND obj_defines "CBLAS")
+    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 ${defines_in})
     list(APPEND obj_defines ${float_type_in})
+
+    add_library(${obj_name} OBJECT ${source_file})
     set_target_properties(${obj_name} PROPERTIES COMPILE_DEFINITIONS "${obj_defines}")
 
     list(APPEND OBJ_LIST_OUT ${obj_name})

diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt
index e2f073d..90fca8b 100644 (file)
--- a/interface/CMakeLists.txt
+++ b/interface/CMakeLists.txt
@@ -27,68 +27,59 @@ set(BLAS3_SOURCES
   omatcopy.c imatcopy.c
 )
 
+# generate the BLAS objs once with and once without cblas
+set (CBLAS_FLAGS "")
 
 if (NOT DEFINED NO_FBLAS)
+  list(APPEND CBLAS_FLAGS 0)
+endif ()
+
+if (NOT DEFINED NO_CBLAS)
+  list(APPEND CBLAS_FLAGS 1)
+endif ()
 
-  GenerateNamedObjects("${BLAS1_SOURCES}" "DOUBLE" "" "")
+foreach (CBLAS_FLAG ${CBLAS_FLAGS})
+
+  GenerateNamedObjects("${BLAS1_SOURCES}" "DOUBLE" "" "" ${CBLAS_FLAG})
   list(APPEND DBLAS_OBJS ${OBJ_LIST_OUT})
-  GenerateNamedObjects("${BLAS2_SOURCES}" "DOUBLE" "" "")
+  GenerateNamedObjects("${BLAS2_SOURCES}" "DOUBLE" "" "" ${CBLAS_FLAG})
   list(APPEND DBLAS_OBJS ${OBJ_LIST_OUT})
-  GenerateNamedObjects("${BLAS3_SOURCES}" "DOUBLE" "" "")
+  GenerateNamedObjects("${BLAS3_SOURCES}" "DOUBLE" "" "" ${CBLAS_FLAG})
   list(APPEND DBLAS_OBJS ${OBJ_LIST_OUT})
 
   # trmm is trsm with a compiler flag set
-  GenerateNamedObjects("trsm.c" "DOUBLE" "TRMM" "trmm")
+  GenerateNamedObjects("trsm.c" "DOUBLE" "TRMM" "trmm" ${CBLAS_FLAG})
   list(APPEND DBLAS_OBJS ${OBJ_LIST_OUT})
 
   # max and imax are compiled 4 times
-  GenerateNamedObjects("max.c" "DOUBLE" "" "")
+  GenerateNamedObjects("max.c" "DOUBLE" "" "" ${CBLAS_FLAG})
   list(APPEND DBLAS_OBJS ${OBJ_LIST_OUT})
-  GenerateNamedObjects("max.c" "DOUBLE" "USE_ABS" "amax")
+  GenerateNamedObjects("max.c" "DOUBLE" "USE_ABS" "amax" ${CBLAS_FLAG})
   list(APPEND DBLAS_OBJS ${OBJ_LIST_OUT})
-  GenerateNamedObjects("max.c" "DOUBLE" "USE_ABS;USE_MIN" "amin")
+  GenerateNamedObjects("max.c" "DOUBLE" "USE_ABS;USE_MIN" "amin" ${CBLAS_FLAG})
   list(APPEND DBLAS_OBJS ${OBJ_LIST_OUT})
-  GenerateNamedObjects("max.c" "DOUBLE" "USE_MIN" "min")
+  GenerateNamedObjects("max.c" "DOUBLE" "USE_MIN" "min" ${CBLAS_FLAG})
   list(APPEND DBLAS_OBJS ${OBJ_LIST_OUT})
 
-  GenerateNamedObjects("imax.c" "DOUBLE" "" "i*max")
+  GenerateNamedObjects("imax.c" "DOUBLE" "" "i*max" ${CBLAS_FLAG})
   list(APPEND DBLAS_OBJS ${OBJ_LIST_OUT})
-  GenerateNamedObjects("imax.c" "DOUBLE" "USE_ABS" "i*amax")
+  GenerateNamedObjects("imax.c" "DOUBLE" "USE_ABS" "i*amax" ${CBLAS_FLAG})
   list(APPEND DBLAS_OBJS ${OBJ_LIST_OUT})
-  GenerateNamedObjects("imax.c" "DOUBLE" "USE_ABS;USE_MIN" "i*amin")
+  GenerateNamedObjects("imax.c" "DOUBLE" "USE_ABS;USE_MIN" "i*amin" ${CBLAS_FLAG})
   list(APPEND DBLAS_OBJS ${OBJ_LIST_OUT})
-  GenerateNamedObjects("imax.c" "DOUBLE" "USE_MIN" "i*min")
+  GenerateNamedObjects("imax.c" "DOUBLE" "USE_MIN" "i*min" ${CBLAS_FLAG})
   list(APPEND DBLAS_OBJS ${OBJ_LIST_OUT})
 
-endif ()
-
-if (NOT DEFINED NO_CBLAS)
-
-  add_library(ISAMAX_OBJ OBJECT imax.c)
-  set_target_properties(ISAMAX_OBJ PROPERTIES COMPILE_DEFINITIONS "CBLAS;USE_ABS")
-
-  add_library(CDBLAS1_OBJS OBJECT ${BLAS1_SOURCES})
-  add_library(CDBLAS2_OBJS OBJECT ${BLAS2_SOURCES})
-  add_library(CDBLAS3_OBJS OBJECT ${BLAS3_SOURCES})
-
-  # trmm is trsm with a compiler flag set
-  add_library(CTRMM_OBJ OBJECT trsm.c)
-  set_target_properties(CTRMM_OBJ PROPERTIES COMPILE_DEFINITIONS "CBLAS;TRMM")
-
-  set_target_properties(CDBLAS1_OBJS PROPERTIES COMPILE_DEFINITIONS "CBLAS")
-  set_target_properties(CDBLAS2_OBJS PROPERTIES COMPILE_DEFINITIONS "CBLAS")
-  set_target_properties(CDBLAS3_OBJS PROPERTIES COMPILE_DEFINITIONS "CBLAS")
-
-  list(APPEND DBLAS_OBJS "CDBLAS1_OBJS;CDBLAS2_OBJS;CDBLAS3_OBJS;ISAMAX_OBJ;CTRMM_OBJ")
-endif ()
+endforeach ()
 
 if (NOT DEFINED NO_LAPACK)
-  add_library(DLAPACK_OBJS OBJECT
+  set(LAPACK_SOURCES
     lapack/getrf.c lapack/getrs.c lapack/potrf.c lapack/getf2.c
     lapack/potf2.c lapack/laswp.c lapack/gesv.c lapack/lauu2.c
     lapack/lauum.c lapack/trti2.c lapack/trtri.c
   )
-  list(APPEND DBLAS_OBJS "DLAPACK_OBJS")
+  GenerateNamedObjects("${LAPACK_SOURCES}" "DOUBLE" "" "" 0)
+  list(APPEND DBLAS_OBJS ${OBJ_LIST_OUT})
 endif ()
 
 set(DBLAS_OBJS ${DBLAS_OBJS} PARENT_SCOPE) # list append removes the scope from DBLAS_OBJS