Merge branch 'develop' into develop

diff --cc common_param.h
index b6abc4e,81b479e..0fe5e6c
--- 1/common_param.h
--- 2/common_param.h
+++ b/common_param.h
@@@ -167,10 -167,10 +167,11 @@@ BLASLONG (*ismin_k) (BLASLONG, float *
    float  (*snrm2_k) (BLASLONG, float *, BLASLONG);
    float  (*sasum_k) (BLASLONG, float *, BLASLONG);
  #endif
- #ifdef BUILD_SINGLE
++
+ #if BUILD_SINGLE
    float  (*ssum_k)  (BLASLONG, float *, BLASLONG);
  #endif  
- #if defined(BUILD_SINGLE) || defined(BUILD_COMPLEX)
+ #if (BUILD_SINGLE) || (BUILD_DOUBLE) || (BUILD_COMPLEX)
    int    (*scopy_k) (BLASLONG, float *, BLASLONG, float *, BLASLONG);
    float  (*sdot_k)  (BLASLONG, float *, BLASLONG, float *, BLASLONG);
    //double (*dsdot_k) (BLASLONG, float *, BLASLONG, float *, BLASLONG);
@@@ -184,14 -188,14 +189,16 @@@
    int    (*sgemv_n) (BLASLONG, BLASLONG, BLASLONG, float, float *, BLASLONG, float *, BLASLONG, float *, BLASLONG, float *);
    int    (*sgemv_t) (BLASLONG, BLASLONG, BLASLONG, float, float *, BLASLONG, float *, BLASLONG, float *, BLASLONG, float *);
  #endif
- #ifdef BUILD_SINGLE  
 -#if BUILD_SINGLE  
++
++#if BUILD_SINGLE
    int    (*sger_k)  (BLASLONG, BLASLONG, BLASLONG, float, float *, BLASLONG, float *, BLASLONG, float *, BLASLONG, float *);
  
    int    (*ssymv_L) (BLASLONG, BLASLONG, float,  float  *, BLASLONG, float  *, BLASLONG, float  *, BLASLONG, float *);
    int    (*ssymv_U) (BLASLONG, BLASLONG, float,  float  *, BLASLONG, float  *, BLASLONG, float  *, BLASLONG, float *);
  #endif
  
- #if defined(BUILD_SINGLE) || defined(BUILD_COMPLEX)
++
+ #if (BUILD_SINGLE) || (BUILD_DOUBLE) || (BUILD_COMPLEX)
  #ifdef ARCH_X86_64
    void (*sgemm_direct) (BLASLONG, BLASLONG, BLASLONG, float *, BLASLONG , float *, BLASLONG , float * , BLASLONG);
    int  (*sgemm_direct_performant) (BLASLONG M, BLASLONG N, BLASLONG K);
@@@ -206,7 -210,7 +213,8 @@@
    int    (*sgemm_oncopy   )(BLASLONG, BLASLONG, float *, BLASLONG, float *);
    int    (*sgemm_otcopy   )(BLASLONG, BLASLONG, float *, BLASLONG, float *);
  #endif
- #ifdef BUILD_SINGLE  
++
+ #if (BUILD_SINGLE) || (BUILD_DOUBLE)  
    int    (*strsm_kernel_LN)(BLASLONG, BLASLONG, BLASLONG, float, float *, float *, float *, BLASLONG, BLASLONG);
    int    (*strsm_kernel_LT)(BLASLONG, BLASLONG, BLASLONG, float, float *, float *, float *, BLASLONG, BLASLONG);
    int    (*strsm_kernel_RN)(BLASLONG, BLASLONG, BLASLONG, float, float *, float *, float *, BLASLONG, BLASLONG);
@@@ -298,13 -304,13 +308,15 @@@ BLASLONG (*idmin_k) (BLASLONG, double *
    int    (*dgemv_n) (BLASLONG, BLASLONG, BLASLONG, double, double *, BLASLONG, double *, BLASLONG, double *, BLASLONG, double *);
    int    (*dgemv_t) (BLASLONG, BLASLONG, BLASLONG, double, double *, BLASLONG, double *, BLASLONG, double *, BLASLONG, double *);
  #endif
- #ifdef BUILD_DOUBLE
++
+ #if BUILD_DOUBLE
    int    (*dger_k)  (BLASLONG, BLASLONG, BLASLONG, double, double *, BLASLONG, double *, BLASLONG, double *, BLASLONG, double *);
  
    int    (*dsymv_L) (BLASLONG, BLASLONG, double,  double  *, BLASLONG, double  *, BLASLONG, double  *, BLASLONG, double *);
    int    (*dsymv_U) (BLASLONG, BLASLONG, double,  double  *, BLASLONG, double  *, BLASLONG, double  *, BLASLONG, double *);
  #endif
- #if defined(BUILD_DOUBLE) || defined(BUILD_COMPLEX16)
++
+ #if (BUILD_DOUBLE) || (BUILD_COMPLEX16)
    int    (*dgemm_kernel   )(BLASLONG, BLASLONG, BLASLONG, double, double *, double *, double *, BLASLONG);
    int    (*dgemm_beta     )(BLASLONG, BLASLONG, BLASLONG, double, double *, BLASLONG, double *, BLASLONG, double  *, BLASLONG);
  
@@@ -313,7 -319,7 +325,8 @@@
    int    (*dgemm_oncopy   )(BLASLONG, BLASLONG, double *, BLASLONG, double *);
    int    (*dgemm_otcopy   )(BLASLONG, BLASLONG, double *, BLASLONG, double *);
  #endif
- #ifdef BUILD_DOUBLE
++
+ #if BUILD_DOUBLE
    int    (*dtrsm_kernel_LN)(BLASLONG, BLASLONG, BLASLONG, double, double *, double *, double *, BLASLONG, BLASLONG);
    int    (*dtrsm_kernel_LT)(BLASLONG, BLASLONG, BLASLONG, double, double *, double *, double *, BLASLONG, BLASLONG);
    int    (*dtrsm_kernel_RN)(BLASLONG, BLASLONG, BLASLONG, double, double *, double *, double *, BLASLONG, BLASLONG);
@@@ -460,10 -466,9 +473,10 @@@ BLASLONG (*iqmin_k) (BLASLONG, xdouble 
  
  #endif
  
- #ifdef BUILD_COMPLEX
++
+ #if (BUILD_COMPLEX) || (BUILD_COMPLEX16)
    int cgemm_p, cgemm_q, cgemm_r;
    int cgemm_unroll_m, cgemm_unroll_n, cgemm_unroll_mn;
- 
    float (*camax_k) (BLASLONG, float *, BLASLONG);
    float (*camin_k) (BLASLONG, float *, BLASLONG);
  BLASLONG (*icamax_k)(BLASLONG, float *, BLASLONG);
@@@ -626,7 -644,7 +652,8 @@@ BLASLONG (*icamin_k)(BLASLONG, float *
    int    (*claswp_ncopy) (BLASLONG, BLASLONG, BLASLONG, float *, BLASLONG, blasint *, float *);
  #endif
  
- #ifdef BUILD_COMPLEX16
++
+ #if BUILD_COMPLEX16
    int zgemm_p, zgemm_q, zgemm_r;
    int zgemm_unroll_m, zgemm_unroll_n, zgemm_unroll_mn;
  
@@@ -964,27 -982,27 +991,28 @@@ BLASLONG (*ixamin_k)(BLASLONG, xdouble 
    void (*init)(void);
  
    int snum_opt, dnum_opt, qnum_opt;
- #ifdef BUILD_SINGLE
++
+ #if BUILD_SINGLE
    int    (*saxpby_k)     (BLASLONG, float, float*, BLASLONG,float, float*, BLASLONG);
  #endif
- #ifdef BUILD_DOUBLE
+ #if BUILD_DOUBLE
    int    (*daxpby_k)     (BLASLONG, double, double*, BLASLONG,double, double*, BLASLONG);
  #endif
- #ifdef BUILD_COMPLEX
+ #if BUILD_COMPLEX
    int    (*caxpby_k)     (BLASLONG, float, float,  float*, BLASLONG,float,float, float*, BLASLONG);
  #endif
- #ifdef BUILD_COMPLEX16
+ #if BUILD_COMPLEX16
    int    (*zaxpby_k)     (BLASLONG, double, double,  double*, BLASLONG,double,double, double*, BLASLONG);
  #endif
  
- #ifdef BUILD_SINGLE  
 -#if BUILD_SINGLE  
++#if BUILD_SINGLE
    int    (*somatcopy_k_cn)    (BLASLONG, BLASLONG, float, float*, BLASLONG, float*, BLASLONG);
    int    (*somatcopy_k_ct)    (BLASLONG, BLASLONG, float, float*, BLASLONG, float*, BLASLONG);
    int    (*somatcopy_k_rn)    (BLASLONG, BLASLONG, float, float*, BLASLONG, float*, BLASLONG);
    int    (*somatcopy_k_rt)    (BLASLONG, BLASLONG, float, float*, BLASLONG, float*, BLASLONG);
  #endif
  
- #ifdef BUILD_DOUBLE 
 -#if BUILD_DOUBLE 
++#if BUILD_DOUBLE
    int    (*domatcopy_k_cn)    (BLASLONG, BLASLONG, double, double*, BLASLONG, double*, BLASLONG);
    int    (*domatcopy_k_ct)    (BLASLONG, BLASLONG, double, double*, BLASLONG, double*, BLASLONG);
    int    (*domatcopy_k_rn)    (BLASLONG, BLASLONG, double, double*, BLASLONG, double*, BLASLONG);