From e4c54c81463c2a19c9bb6b1f0f1be3fa9d018a45 Mon Sep 17 00:00:00 2001 From: Devin Matthews Date: Wed, 20 Apr 2016 15:56:46 -0500 Subject: [PATCH] Change integer type in CBLAS function signatures to f77_int, and add proper const-correctness to BLAS layer. --- config/haswell/bli_config.h | 2 +- frame/compat/bla_amax.c | 6 +- frame/compat/bla_amax.h | 4 +- frame/compat/bla_asum.c | 6 +- frame/compat/bla_asum.h | 4 +- frame/compat/bla_axpy.c | 14 +- frame/compat/bla_axpy.h | 8 +- frame/compat/bla_copy.c | 10 +- frame/compat/bla_copy.h | 6 +- frame/compat/bla_dot.c | 26 +- frame/compat/bla_dot.h | 18 +- frame/compat/bla_gemm.c | 30 +- frame/compat/bla_gemm.h | 20 +- frame/compat/bla_gemv.c | 26 +- frame/compat/bla_gemv.h | 16 +- frame/compat/bla_ger.c | 20 +- frame/compat/bla_ger.h | 12 +- frame/compat/bla_hemm.c | 28 +- frame/compat/bla_hemm.h | 18 +- frame/compat/bla_hemv.c | 24 +- frame/compat/bla_hemv.h | 14 +- frame/compat/bla_her.c | 16 +- frame/compat/bla_her.h | 10 +- frame/compat/bla_her2.c | 20 +- frame/compat/bla_her2.h | 12 +- frame/compat/bla_her2k.c | 28 +- frame/compat/bla_her2k.h | 18 +- frame/compat/bla_herk.c | 24 +- frame/compat/bla_herk.h | 16 +- frame/compat/bla_nrm2.c | 6 +- frame/compat/bla_nrm2.h | 4 +- frame/compat/bla_scal.c | 10 +- frame/compat/bla_scal.h | 6 +- frame/compat/bla_swap.c | 10 +- frame/compat/bla_swap.h | 6 +- frame/compat/bla_symm.c | 28 +- frame/compat/bla_symm.h | 18 +- frame/compat/bla_symv.c | 24 +- frame/compat/bla_symv.h | 14 +- frame/compat/bla_syr.c | 16 +- frame/compat/bla_syr.h | 10 +- frame/compat/bla_syr2.c | 20 +- frame/compat/bla_syr2.h | 12 +- frame/compat/bla_syr2k.c | 28 +- frame/compat/bla_syr2k.h | 18 +- frame/compat/bla_syrk.c | 24 +- frame/compat/bla_syrk.h | 16 +- frame/compat/bla_trmm.c | 24 +- frame/compat/bla_trmm.h | 18 +- frame/compat/bla_trmv.c | 16 +- frame/compat/bla_trmv.h | 12 +- frame/compat/bla_trsm.c | 24 +- frame/compat/bla_trsm.h | 18 +- frame/compat/bla_trsv.c | 16 +- frame/compat/bla_trsv.h | 12 +- frame/compat/bli_blas.h | 14 + frame/compat/cblas/bli_cblas.h | 18 +- frame/compat/cblas/f77_sub/f77_amax_sub.c | 4 +- frame/compat/cblas/f77_sub/f77_amax_sub.h | 4 +- frame/compat/cblas/f77_sub/f77_asum_sub.c | 4 +- frame/compat/cblas/f77_sub/f77_asum_sub.h | 4 +- frame/compat/cblas/f77_sub/f77_dot_sub.c | 25 +- frame/compat/cblas/f77_sub/f77_dot_sub.h | 19 +- frame/compat/cblas/f77_sub/f77_nrm2_sub.c | 4 +- frame/compat/cblas/f77_sub/f77_nrm2_sub.h | 4 +- frame/compat/cblas/src/cblas.h | 912 +++++++++++----------- frame/compat/cblas/src/cblas_caxpy.c | 12 +- frame/compat/cblas/src/cblas_ccopy.c | 12 +- frame/compat/cblas/src/cblas_cdotc_sub.c | 12 +- frame/compat/cblas/src/cblas_cdotu_sub.c | 12 +- frame/compat/cblas/src/cblas_cgbmv.c | 34 +- frame/compat/cblas/src/cblas_cgemm.c | 24 +- frame/compat/cblas/src/cblas_cgemv.c | 30 +- frame/compat/cblas/src/cblas_cgerc.c | 20 +- frame/compat/cblas/src/cblas_cgeru.c | 16 +- frame/compat/cblas/src/cblas_chbmv.c | 28 +- frame/compat/cblas/src/cblas_chemm.c | 24 +- frame/compat/cblas/src/cblas_chemv.c | 28 +- frame/compat/cblas/src/cblas_cher.c | 20 +- frame/compat/cblas/src/cblas_cher2.c | 28 +- frame/compat/cblas/src/cblas_cher2k.c | 20 +- frame/compat/cblas/src/cblas_cherk.c | 22 +- frame/compat/cblas/src/cblas_chpmv.c | 26 +- frame/compat/cblas/src/cblas_chpr.c | 20 +- frame/compat/cblas/src/cblas_chpr2.c | 24 +- frame/compat/cblas/src/cblas_cscal.c | 12 +- frame/compat/cblas/src/cblas_csscal.c | 12 +- frame/compat/cblas/src/cblas_cswap.c | 12 +- frame/compat/cblas/src/cblas_csymm.c | 24 +- frame/compat/cblas/src/cblas_csyr2k.c | 22 +- frame/compat/cblas/src/cblas_csyrk.c | 22 +- frame/compat/cblas/src/cblas_ctbmv.c | 18 +- frame/compat/cblas/src/cblas_ctbsv.c | 18 +- frame/compat/cblas/src/cblas_ctpmv.c | 16 +- frame/compat/cblas/src/cblas_ctpsv.c | 16 +- frame/compat/cblas/src/cblas_ctrmm.c | 20 +- frame/compat/cblas/src/cblas_ctrmv.c | 18 +- frame/compat/cblas/src/cblas_ctrsm.c | 20 +- frame/compat/cblas/src/cblas_ctrsv.c | 18 +- frame/compat/cblas/src/cblas_dasum.c | 8 +- frame/compat/cblas/src/cblas_daxpy.c | 10 +- frame/compat/cblas/src/cblas_dcopy.c | 10 +- frame/compat/cblas/src/cblas_ddot.c | 10 +- frame/compat/cblas/src/cblas_dgbmv.c | 18 +- frame/compat/cblas/src/cblas_dgemm.c | 16 +- frame/compat/cblas/src/cblas_dgemv.c | 16 +- frame/compat/cblas/src/cblas_dger.c | 12 +- frame/compat/cblas/src/cblas_dnrm2.c | 8 +- frame/compat/cblas/src/cblas_drot.c | 10 +- frame/compat/cblas/src/cblas_drotg.c | 6 +- frame/compat/cblas/src/cblas_drotm.c | 10 +- frame/compat/cblas/src/cblas_drotmg.c | 6 +- frame/compat/cblas/src/cblas_dsbmv.c | 16 +- frame/compat/cblas/src/cblas_dscal.c | 10 +- frame/compat/cblas/src/cblas_dsdot.c | 10 +- frame/compat/cblas/src/cblas_dspmv.c | 16 +- frame/compat/cblas/src/cblas_dspr.c | 12 +- frame/compat/cblas/src/cblas_dspr2.c | 12 +- frame/compat/cblas/src/cblas_dswap.c | 10 +- frame/compat/cblas/src/cblas_dsymm.c | 16 +- frame/compat/cblas/src/cblas_dsymv.c | 16 +- frame/compat/cblas/src/cblas_dsyr.c | 12 +- frame/compat/cblas/src/cblas_dsyr2.c | 14 +- frame/compat/cblas/src/cblas_dsyr2k.c | 16 +- frame/compat/cblas/src/cblas_dsyrk.c | 14 +- frame/compat/cblas/src/cblas_dtbmv.c | 14 +- frame/compat/cblas/src/cblas_dtbsv.c | 14 +- frame/compat/cblas/src/cblas_dtpmv.c | 12 +- frame/compat/cblas/src/cblas_dtpsv.c | 12 +- frame/compat/cblas/src/cblas_dtrmm.c | 16 +- frame/compat/cblas/src/cblas_dtrmv.c | 14 +- frame/compat/cblas/src/cblas_dtrsm.c | 16 +- frame/compat/cblas/src/cblas_dtrsv.c | 14 +- frame/compat/cblas/src/cblas_dzasum.c | 8 +- frame/compat/cblas/src/cblas_dznrm2.c | 8 +- frame/compat/cblas/src/cblas_f77.h | 834 ++++---------------- frame/compat/cblas/src/cblas_globals.c | 6 +- frame/compat/cblas/src/cblas_icamax.c | 10 +- frame/compat/cblas/src/cblas_idamax.c | 8 +- frame/compat/cblas/src/cblas_isamax.c | 8 +- frame/compat/cblas/src/cblas_izamax.c | 10 +- frame/compat/cblas/src/cblas_sasum.c | 8 +- frame/compat/cblas/src/cblas_saxpy.c | 10 +- frame/compat/cblas/src/cblas_scasum.c | 8 +- frame/compat/cblas/src/cblas_scnrm2.c | 8 +- frame/compat/cblas/src/cblas_scopy.c | 10 +- frame/compat/cblas/src/cblas_sdot.c | 10 +- frame/compat/cblas/src/cblas_sdsdot.c | 10 +- frame/compat/cblas/src/cblas_sgbmv.c | 18 +- frame/compat/cblas/src/cblas_sgemm.c | 16 +- frame/compat/cblas/src/cblas_sgemv.c | 16 +- frame/compat/cblas/src/cblas_sger.c | 12 +- frame/compat/cblas/src/cblas_snrm2.c | 8 +- frame/compat/cblas/src/cblas_srot.c | 10 +- frame/compat/cblas/src/cblas_srotg.c | 6 +- frame/compat/cblas/src/cblas_srotm.c | 10 +- frame/compat/cblas/src/cblas_srotmg.c | 6 +- frame/compat/cblas/src/cblas_ssbmv.c | 14 +- frame/compat/cblas/src/cblas_sscal.c | 10 +- frame/compat/cblas/src/cblas_sspmv.c | 16 +- frame/compat/cblas/src/cblas_sspr.c | 12 +- frame/compat/cblas/src/cblas_sspr2.c | 12 +- frame/compat/cblas/src/cblas_sswap.c | 10 +- frame/compat/cblas/src/cblas_ssymm.c | 16 +- frame/compat/cblas/src/cblas_ssymv.c | 16 +- frame/compat/cblas/src/cblas_ssyr.c | 12 +- frame/compat/cblas/src/cblas_ssyr2.c | 14 +- frame/compat/cblas/src/cblas_ssyr2k.c | 16 +- frame/compat/cblas/src/cblas_ssyrk.c | 14 +- frame/compat/cblas/src/cblas_stbmv.c | 14 +- frame/compat/cblas/src/cblas_stbsv.c | 14 +- frame/compat/cblas/src/cblas_stpmv.c | 12 +- frame/compat/cblas/src/cblas_stpsv.c | 12 +- frame/compat/cblas/src/cblas_strmm.c | 16 +- frame/compat/cblas/src/cblas_strmv.c | 14 +- frame/compat/cblas/src/cblas_strsm.c | 16 +- frame/compat/cblas/src/cblas_strsv.c | 14 +- frame/compat/cblas/src/cblas_xerbla.c | 10 +- frame/compat/cblas/src/cblas_zaxpy.c | 12 +- frame/compat/cblas/src/cblas_zcopy.c | 12 +- frame/compat/cblas/src/cblas_zdotc_sub.c | 12 +- frame/compat/cblas/src/cblas_zdotu_sub.c | 12 +- frame/compat/cblas/src/cblas_zdscal.c | 12 +- frame/compat/cblas/src/cblas_zgbmv.c | 34 +- frame/compat/cblas/src/cblas_zgemm.c | 24 +- frame/compat/cblas/src/cblas_zgemv.c | 32 +- frame/compat/cblas/src/cblas_zgerc.c | 20 +- frame/compat/cblas/src/cblas_zgeru.c | 16 +- frame/compat/cblas/src/cblas_zhbmv.c | 28 +- frame/compat/cblas/src/cblas_zhemm.c | 24 +- frame/compat/cblas/src/cblas_zhemv.c | 28 +- frame/compat/cblas/src/cblas_zher.c | 20 +- frame/compat/cblas/src/cblas_zher2.c | 28 +- frame/compat/cblas/src/cblas_zher2k.c | 20 +- frame/compat/cblas/src/cblas_zherk.c | 22 +- frame/compat/cblas/src/cblas_zhpmv.c | 26 +- frame/compat/cblas/src/cblas_zhpr.c | 20 +- frame/compat/cblas/src/cblas_zhpr2.c | 28 +- frame/compat/cblas/src/cblas_zscal.c | 12 +- frame/compat/cblas/src/cblas_zswap.c | 12 +- frame/compat/cblas/src/cblas_zsymm.c | 24 +- frame/compat/cblas/src/cblas_zsyr2k.c | 22 +- frame/compat/cblas/src/cblas_zsyrk.c | 22 +- frame/compat/cblas/src/cblas_ztbmv.c | 18 +- frame/compat/cblas/src/cblas_ztbsv.c | 18 +- frame/compat/cblas/src/cblas_ztpmv.c | 16 +- frame/compat/cblas/src/cblas_ztpsv.c | 16 +- frame/compat/cblas/src/cblas_ztrmm.c | 20 +- frame/compat/cblas/src/cblas_ztrmv.c | 18 +- frame/compat/cblas/src/cblas_ztrsm.c | 24 +- frame/compat/cblas/src/cblas_ztrsv.c | 18 +- frame/compat/check/bla_gemm_check.c | 20 +- frame/compat/check/bla_gemm_check.h | 20 +- frame/compat/check/bla_gemv_check.c | 16 +- frame/compat/check/bla_gemv_check.h | 16 +- frame/compat/check/bla_ger_check.c | 14 +- frame/compat/check/bla_ger_check.h | 14 +- frame/compat/check/bla_hemm_check.c | 18 +- frame/compat/check/bla_hemm_check.h | 18 +- frame/compat/check/bla_hemv_check.c | 14 +- frame/compat/check/bla_hemv_check.h | 14 +- frame/compat/check/bla_her2_check.c | 14 +- frame/compat/check/bla_her2_check.h | 14 +- frame/compat/check/bla_her2k_check.c | 18 +- frame/compat/check/bla_her2k_check.h | 18 +- frame/compat/check/bla_her_check.c | 12 +- frame/compat/check/bla_her_check.h | 12 +- frame/compat/check/bla_herk_check.c | 16 +- frame/compat/check/bla_herk_check.h | 16 +- frame/compat/check/bla_symm_check.c | 18 +- frame/compat/check/bla_symm_check.h | 18 +- frame/compat/check/bla_symv_check.c | 14 +- frame/compat/check/bla_symv_check.h | 14 +- frame/compat/check/bla_syr2_check.c | 14 +- frame/compat/check/bla_syr2_check.h | 14 +- frame/compat/check/bla_syr2k_check.c | 18 +- frame/compat/check/bla_syr2k_check.h | 18 +- frame/compat/check/bla_syr_check.c | 12 +- frame/compat/check/bla_syr_check.h | 12 +- frame/compat/check/bla_syrk_check.c | 16 +- frame/compat/check/bla_syrk_check.h | 16 +- frame/compat/check/bla_trmm_check.c | 20 +- frame/compat/check/bla_trmm_check.h | 20 +- frame/compat/check/bla_trmv_check.c | 16 +- frame/compat/check/bla_trmv_check.h | 16 +- frame/compat/check/bla_trsm_check.c | 20 +- frame/compat/check/bla_trsm_check.h | 20 +- frame/compat/check/bla_trsv_check.c | 16 +- frame/compat/check/bla_trsv_check.h | 16 +- frame/compat/f2c/bla_gbmv.c | 28 +- frame/compat/f2c/bla_gbmv.h | 8 +- frame/compat/f2c/bla_hbmv.c | 16 +- frame/compat/f2c/bla_hbmv.h | 4 +- frame/compat/f2c/bla_hpmv.c | 16 +- frame/compat/f2c/bla_hpmv.h | 4 +- frame/compat/f2c/bla_hpr.c | 16 +- frame/compat/f2c/bla_hpr.h | 4 +- frame/compat/f2c/bla_hpr2.c | 16 +- frame/compat/f2c/bla_hpr2.h | 4 +- frame/compat/f2c/bla_lsame.c | 2 +- frame/compat/f2c/bla_lsame.h | 2 +- frame/compat/f2c/bla_rot.c | 8 +- frame/compat/f2c/bla_rot.h | 8 +- frame/compat/f2c/bla_rotg.c | 16 +- frame/compat/f2c/bla_rotm.c | 4 +- frame/compat/f2c/bla_rotm.h | 4 +- frame/compat/f2c/bla_rotmg.c | 4 +- frame/compat/f2c/bla_rotmg.h | 4 +- frame/compat/f2c/bla_sbmv.c | 12 +- frame/compat/f2c/bla_sbmv.h | 4 +- frame/compat/f2c/bla_spmv.c | 12 +- frame/compat/f2c/bla_spmv.h | 4 +- frame/compat/f2c/bla_spr.c | 12 +- frame/compat/f2c/bla_spr.h | 4 +- frame/compat/f2c/bla_spr2.c | 12 +- frame/compat/f2c/bla_spr2.h | 4 +- frame/compat/f2c/bla_tbmv.c | 28 +- frame/compat/f2c/bla_tbmv.h | 8 +- frame/compat/f2c/bla_tbsv.c | 30 +- frame/compat/f2c/bla_tbsv.h | 8 +- frame/compat/f2c/bla_tpmv.c | 28 +- frame/compat/f2c/bla_tpmv.h | 8 +- frame/compat/f2c/bla_tpsv.c | 30 +- frame/compat/f2c/bla_tpsv.h | 8 +- frame/compat/f2c/bla_xerbla.c | 8 +- frame/compat/f2c/bla_xerbla.h | 2 +- frame/compat/f2c/util/bla_c_abs.c | 2 +- frame/compat/f2c/util/bla_c_abs.h | 2 +- frame/compat/f2c/util/bla_c_div.c | 2 +- frame/compat/f2c/util/bla_c_div.h | 2 +- frame/compat/f2c/util/bla_d_abs.c | 2 +- frame/compat/f2c/util/bla_d_abs.h | 2 +- frame/compat/f2c/util/bla_d_cnjg.c | 2 +- frame/compat/f2c/util/bla_d_cnjg.h | 2 +- frame/compat/f2c/util/bla_d_imag.c | 2 +- frame/compat/f2c/util/bla_d_imag.h | 2 +- frame/compat/f2c/util/bla_d_sign.c | 2 +- frame/compat/f2c/util/bla_d_sign.h | 2 +- frame/compat/f2c/util/bla_f__cabs.h | 2 +- frame/compat/f2c/util/bla_r_abs.c | 2 +- frame/compat/f2c/util/bla_r_abs.h | 2 +- frame/compat/f2c/util/bla_r_cnjg.c | 2 +- frame/compat/f2c/util/bla_r_cnjg.h | 2 +- frame/compat/f2c/util/bla_r_imag.c | 2 +- frame/compat/f2c/util/bla_r_imag.h | 2 +- frame/compat/f2c/util/bla_r_sign.c | 2 +- frame/compat/f2c/util/bla_r_sign.h | 2 +- frame/compat/f2c/util/bla_z_abs.c | 2 +- frame/compat/f2c/util/bla_z_abs.h | 2 +- frame/compat/f2c/util/bla_z_div.c | 2 +- frame/compat/f2c/util/bla_z_div.h | 2 +- frame/include/blis.h | 9 +- 312 files changed, 2467 insertions(+), 3570 deletions(-) diff --git a/config/haswell/bli_config.h b/config/haswell/bli_config.h index 89bba2b20..951b007d8 100644 --- a/config/haswell/bli_config.h +++ b/config/haswell/bli_config.h @@ -35,7 +35,7 @@ #ifndef BLIS_CONFIG_H #define BLIS_CONFIG_H - +#define BLIS_ENABLE_CBLAS #endif diff --git a/frame/compat/bla_amax.c b/frame/compat/bla_amax.c index 47f12de83..24aa192e3 100644 --- a/frame/compat/bla_amax.c +++ b/frame/compat/bla_amax.c @@ -43,8 +43,8 @@ \ f77_int PASTEF772(i,chx,blasname) \ ( \ - f77_int* n, \ - ftype_x* x, f77_int* incx \ + const f77_int* n, \ + const ftype_x* x, const f77_int* incx \ ) \ { \ dim_t n0; \ @@ -68,7 +68,7 @@ f77_int PASTEF772(i,chx,blasname) \ \ /* If the input increments are negative, adjust the pointers so we can use positive increments instead. */ \ - bli_convert_blas_incv( n0, x, *incx, x0, incx0 ); \ + bli_convert_blas_incv( n0, (ftype_x*)x, *incx, x0, incx0 ); \ \ /* Call BLIS interface. */ \ PASTEMAC(chx,blisname) \ diff --git a/frame/compat/bla_amax.h b/frame/compat/bla_amax.h index 220a3fb48..f9d8a9957 100644 --- a/frame/compat/bla_amax.h +++ b/frame/compat/bla_amax.h @@ -41,8 +41,8 @@ \ f77_int PASTEF772(i,chx,blasname) \ ( \ - f77_int* n, \ - ftype_x* x, f77_int* incx \ + const f77_int* n, \ + const ftype_x* x, const f77_int* incx \ ); #ifdef BLIS_ENABLE_BLAS2BLIS diff --git a/frame/compat/bla_asum.c b/frame/compat/bla_asum.c index 8b4291296..df2b174eb 100644 --- a/frame/compat/bla_asum.c +++ b/frame/compat/bla_asum.c @@ -43,8 +43,8 @@ \ ftype_r PASTEF772(chr,chx,blasname) \ ( \ - f77_int* n, \ - ftype_x* x, f77_int* incx \ + const f77_int* n, \ + const ftype_x* x, const f77_int* incx \ ) \ { \ dim_t n0; \ @@ -61,7 +61,7 @@ ftype_r PASTEF772(chr,chx,blasname) \ \ /* If the input increments are negative, adjust the pointers so we can use positive increments instead. */ \ - bli_convert_blas_incv( n0, x, *incx, x0, incx0 ); \ + bli_convert_blas_incv( n0, (ftype_x*)x, *incx, x0, incx0 ); \ \ /* Call BLIS interface. */ \ PASTEMAC(chx,blisname) \ diff --git a/frame/compat/bla_asum.h b/frame/compat/bla_asum.h index 406665913..824d437ed 100644 --- a/frame/compat/bla_asum.h +++ b/frame/compat/bla_asum.h @@ -41,8 +41,8 @@ \ ftype_r PASTEF772(chr,chx,blasname) \ ( \ - f77_int* n, \ - ftype_x* x, f77_int* incx \ + const f77_int* n, \ + const ftype_x* x, const f77_int* incx \ ); #ifdef BLIS_ENABLE_BLAS2BLIS diff --git a/frame/compat/bla_axpy.c b/frame/compat/bla_axpy.c index 53c9e4832..1f4a51857 100644 --- a/frame/compat/bla_axpy.c +++ b/frame/compat/bla_axpy.c @@ -43,10 +43,10 @@ \ void PASTEF77(ch,blasname) \ ( \ - f77_int* n, \ - ftype* alpha, \ - ftype* x, f77_int* incx, \ - ftype* y, f77_int* incy \ + const f77_int* n, \ + const ftype* alpha, \ + const ftype* x, const f77_int* incx, \ + ftype* y, const f77_int* incy \ ) \ { \ dim_t n0; \ @@ -64,15 +64,15 @@ void PASTEF77(ch,blasname) \ \ /* If the input increments are negative, adjust the pointers so we can use positive increments instead. */ \ - bli_convert_blas_incv( n0, x, *incx, x0, incx0 ); \ - bli_convert_blas_incv( n0, y, *incy, y0, incy0 ); \ + bli_convert_blas_incv( n0, (ftype*)x, *incx, x0, incx0 ); \ + bli_convert_blas_incv( n0, (ftype*)y, *incy, y0, incy0 ); \ \ /* Call BLIS interface. */ \ PASTEMAC(ch,blisname) \ ( \ BLIS_NO_CONJUGATE, \ n0, \ - alpha, \ + (ftype*)alpha, \ x0, incx0, \ y0, incy0, \ NULL \ diff --git a/frame/compat/bla_axpy.h b/frame/compat/bla_axpy.h index a457f294d..1fc0a5bbf 100644 --- a/frame/compat/bla_axpy.h +++ b/frame/compat/bla_axpy.h @@ -41,10 +41,10 @@ \ void PASTEF77(ch,blasname) \ ( \ - f77_int* n, \ - ftype* alpha, \ - ftype* x, f77_int* incx, \ - ftype* y, f77_int* incy \ + const f77_int* n, \ + const ftype* alpha, \ + const ftype* x, const f77_int* incx, \ + ftype* y, const f77_int* incy \ ); #ifdef BLIS_ENABLE_BLAS2BLIS diff --git a/frame/compat/bla_copy.c b/frame/compat/bla_copy.c index 26a32d3c4..95a558175 100644 --- a/frame/compat/bla_copy.c +++ b/frame/compat/bla_copy.c @@ -43,9 +43,9 @@ \ void PASTEF77(ch,blasname) \ ( \ - f77_int* n, \ - ftype* x, f77_int* incx, \ - ftype* y, f77_int* incy \ + const f77_int* n, \ + const ftype* x, const f77_int* incx, \ + ftype* y, const f77_int* incy \ ) \ { \ dim_t n0; \ @@ -63,8 +63,8 @@ void PASTEF77(ch,blasname) \ \ /* If the input increments are negative, adjust the pointers so we can use positive increments instead. */ \ - bli_convert_blas_incv( n0, x, *incx, x0, incx0 ); \ - bli_convert_blas_incv( n0, y, *incy, y0, incy0 ); \ + bli_convert_blas_incv( n0, (ftype*)x, *incx, x0, incx0 ); \ + bli_convert_blas_incv( n0, (ftype*)y, *incy, y0, incy0 ); \ \ /* Call BLIS interface. */ \ PASTEMAC(ch,blisname) \ diff --git a/frame/compat/bla_copy.h b/frame/compat/bla_copy.h index a2f9c4c4f..1b342322c 100644 --- a/frame/compat/bla_copy.h +++ b/frame/compat/bla_copy.h @@ -41,9 +41,9 @@ \ void PASTEF77(ch,blasname) \ ( \ - f77_int* n, \ - ftype* x, f77_int* incx, \ - ftype* y, f77_int* incy \ + const f77_int* n, \ + const ftype* x, const f77_int* incx, \ + ftype* y, const f77_int* incy \ ); #ifdef BLIS_ENABLE_BLAS2BLIS diff --git a/frame/compat/bla_dot.c b/frame/compat/bla_dot.c index 949177fc7..11a960677 100644 --- a/frame/compat/bla_dot.c +++ b/frame/compat/bla_dot.c @@ -43,9 +43,9 @@ \ ftype PASTEF772(chxy,blasname,chc) \ ( \ - f77_int* n, \ - ftype* x, f77_int* incx, \ - ftype* y, f77_int* incy \ + const f77_int* n, \ + const ftype* x, const f77_int* incx, \ + const ftype* y, const f77_int* incy \ ) \ { \ dim_t n0; \ @@ -64,8 +64,8 @@ ftype PASTEF772(chxy,blasname,chc) \ \ /* If the input increments are negative, adjust the pointers so we can use positive increments instead. */ \ - bli_convert_blas_incv( n0, x, *incx, x0, incx0 ); \ - bli_convert_blas_incv( n0, y, *incy, y0, incy0 ); \ + bli_convert_blas_incv( n0, (ftype*)x, *incx, x0, incx0 ); \ + bli_convert_blas_incv( n0, (ftype*)y, *incy, y0, incy0 ); \ \ /* Call BLIS interface. */ \ PASTEMAC(chxy,blisname) \ @@ -95,9 +95,9 @@ INSERT_GENTFUNCDOT_BLAS( dot, dotv ) // with result returned in single precision. float PASTEF77(sd,sdot) ( - f77_int* n, - float* x, f77_int* incx, - float* y, f77_int* incy + const f77_int* n, + const float* x, const f77_int* incx, + const float* y, const f77_int* incy ) { return ( float )PASTEF77(d,sdot)( n, @@ -109,9 +109,9 @@ float PASTEF77(sd,sdot) // with result returned in double precision. double PASTEF77(d,sdot) ( - f77_int* n, - float* x, f77_int* incx, - float* y, f77_int* incy + const f77_int* n, + const float* x, const f77_int* incx, + const float* y, const f77_int* incy ) { dim_t n0; @@ -129,8 +129,8 @@ double PASTEF77(d,sdot) /* If the input increments are negative, adjust the pointers so we can use positive increments instead. */ - bli_convert_blas_incv( n0, x, *incx, x0, incx0 ); - bli_convert_blas_incv( n0, y, *incy, y0, incy0 ); + bli_convert_blas_incv( n0, (float*)x, *incx, x0, incx0 ); + bli_convert_blas_incv( n0, (float*)y, *incy, y0, incy0 ); rho = 0.0; diff --git a/frame/compat/bla_dot.h b/frame/compat/bla_dot.h index 168b739d2..c363d720b 100644 --- a/frame/compat/bla_dot.h +++ b/frame/compat/bla_dot.h @@ -41,9 +41,9 @@ \ ftype PASTEF772(chxy,blasname,chc) \ ( \ - f77_int* n, \ - ftype* x, f77_int* incx, \ - ftype* y, f77_int* incy \ + const f77_int* n, \ + const ftype* x, const f77_int* incx, \ + const ftype* y, const f77_int* incy \ ); #ifdef BLIS_ENABLE_BLAS2BLIS @@ -54,15 +54,15 @@ INSERT_GENTPROTDOT_BLAS( dot ) float PASTEF77(sd,sdot) ( - f77_int* n, - float* x, f77_int* incx, - float* y, f77_int* incy + const f77_int* n, + const float* x, const f77_int* incx, + const float* y, const f77_int* incy ); double PASTEF77(d,sdot) ( - f77_int* n, - float* x, f77_int* incx, - float* y, f77_int* incy + const f77_int* n, + const float* x, const f77_int* incx, + const float* y, const f77_int* incy ); #endif diff --git a/frame/compat/bla_gemm.c b/frame/compat/bla_gemm.c index 0cb0bb552..fe5918ec1 100644 --- a/frame/compat/bla_gemm.c +++ b/frame/compat/bla_gemm.c @@ -43,16 +43,16 @@ \ void PASTEF77(ch,blasname) \ ( \ - f77_char* transa, \ - f77_char* transb, \ - f77_int* m, \ - f77_int* n, \ - f77_int* k, \ - ftype* alpha, \ - ftype* a, f77_int* lda, \ - ftype* b, f77_int* ldb, \ - ftype* beta, \ - ftype* c, f77_int* ldc \ + const f77_char* transa, \ + const f77_char* transb, \ + const f77_int* m, \ + const f77_int* n, \ + const f77_int* k, \ + const ftype* alpha, \ + const ftype* a, const f77_int* lda, \ + const ftype* b, const f77_int* ldb, \ + const ftype* beta, \ + ftype* c, const f77_int* ldc \ ) \ { \ trans_t blis_transa; \ @@ -106,11 +106,11 @@ void PASTEF77(ch,blasname) \ m0, \ n0, \ k0, \ - alpha, \ - a, rs_a, cs_a, \ - b, rs_b, cs_b, \ - beta, \ - c, rs_c, cs_c, \ + (ftype*)alpha, \ + (ftype*)a, rs_a, cs_a, \ + (ftype*)b, rs_b, cs_b, \ + (ftype*)beta, \ + (ftype*)c, rs_c, cs_c, \ NULL \ ); \ \ diff --git a/frame/compat/bla_gemm.h b/frame/compat/bla_gemm.h index 3e8993878..723455795 100644 --- a/frame/compat/bla_gemm.h +++ b/frame/compat/bla_gemm.h @@ -41,16 +41,16 @@ \ void PASTEF77(ch,blasname) \ ( \ - f77_char* transa, \ - f77_char* transb, \ - f77_int* m, \ - f77_int* n, \ - f77_int* k, \ - ftype* alpha, \ - ftype* a, f77_int* lda, \ - ftype* b, f77_int* ldb, \ - ftype* beta, \ - ftype* c, f77_int* ldc \ + const f77_char* transa, \ + const f77_char* transb, \ + const f77_int* m, \ + const f77_int* n, \ + const f77_int* k, \ + const ftype* alpha, \ + const ftype* a, const f77_int* lda, \ + const ftype* b, const f77_int* ldb, \ + const ftype* beta, \ + ftype* c, const f77_int* ldc \ ); #ifdef BLIS_ENABLE_BLAS2BLIS diff --git a/frame/compat/bla_gemv.c b/frame/compat/bla_gemv.c index ea5076aa1..1723d1797 100644 --- a/frame/compat/bla_gemv.c +++ b/frame/compat/bla_gemv.c @@ -43,14 +43,14 @@ \ void PASTEF77(ch,blasname) \ ( \ - f77_char* transa, \ - f77_int* m, \ - f77_int* n, \ - ftype* alpha, \ - ftype* a, f77_int* lda, \ - ftype* x, f77_int* incx, \ - ftype* beta, \ - ftype* y, f77_int* incy \ + const f77_char* transa, \ + const f77_int* m, \ + const f77_int* n, \ + const ftype* alpha, \ + const ftype* a, const f77_int* lda, \ + const ftype* x, const f77_int* incx, \ + const ftype* beta, \ + ftype* y, const f77_int* incy \ ) \ { \ trans_t blis_transa; \ @@ -110,8 +110,8 @@ void PASTEF77(ch,blasname) \ \ /* If the input increments are negative, adjust the pointers so we can use positive increments instead. */ \ - bli_convert_blas_incv( n_x, x, *incx, x0, incx0 ); \ - bli_convert_blas_incv( m_y, y, *incy, y0, incy0 ); \ + bli_convert_blas_incv( n_x, (ftype*)x, *incx, x0, incx0 ); \ + bli_convert_blas_incv( m_y, (ftype*)y, *incy, y0, incy0 ); \ \ /* Set the row and column strides of A. */ \ rs_a = 1; \ @@ -124,10 +124,10 @@ void PASTEF77(ch,blasname) \ BLIS_NO_CONJUGATE, \ m0, \ n0, \ - alpha, \ - a, rs_a, cs_a, \ + (ftype*)alpha, \ + (ftype*)a, rs_a, cs_a, \ x0, incx0, \ - beta, \ + (ftype*)beta, \ y0, incy0, \ NULL \ ); \ diff --git a/frame/compat/bla_gemv.h b/frame/compat/bla_gemv.h index 6710aa223..ad512cff6 100644 --- a/frame/compat/bla_gemv.h +++ b/frame/compat/bla_gemv.h @@ -41,14 +41,14 @@ \ void PASTEF77(ch,blasname) \ ( \ - f77_char* transa, \ - f77_int* m, \ - f77_int* n, \ - ftype* alpha, \ - ftype* a, f77_int* lda, \ - ftype* x, f77_int* incx, \ - ftype* beta, \ - ftype* y, f77_int* incy \ + const f77_char* transa, \ + const f77_int* m, \ + const f77_int* n, \ + const ftype* alpha, \ + const ftype* a, const f77_int* lda, \ + const ftype* x, const f77_int* incx, \ + const ftype* beta, \ + ftype* y, const f77_int* incy \ ); #ifdef BLIS_ENABLE_BLAS2BLIS diff --git a/frame/compat/bla_ger.c b/frame/compat/bla_ger.c index 12eefbac0..03dd5ee06 100644 --- a/frame/compat/bla_ger.c +++ b/frame/compat/bla_ger.c @@ -43,12 +43,12 @@ \ void PASTEF772(chxy,blasname,chc) \ ( \ - f77_int* m, \ - f77_int* n, \ - ftype* alpha, \ - ftype* x, f77_int* incx, \ - ftype* y, f77_int* incy, \ - ftype* a, f77_int* lda \ + const f77_int* m, \ + const f77_int* n, \ + const ftype* alpha, \ + const ftype* x, const f77_int* incx, \ + const ftype* y, const f77_int* incy, \ + ftype* a, const f77_int* lda \ ) \ { \ dim_t m0, n0; \ @@ -80,8 +80,8 @@ void PASTEF772(chxy,blasname,chc) \ \ /* If the input increments are negative, adjust the pointers so we can use positive increments instead. */ \ - bli_convert_blas_incv( m0, x, *incx, x0, incx0 ); \ - bli_convert_blas_incv( n0, y, *incy, y0, incy0 ); \ + bli_convert_blas_incv( m0, (ftype*)x, *incx, x0, incx0 ); \ + bli_convert_blas_incv( n0, (ftype*)y, *incy, y0, incy0 ); \ \ /* Set the row and column strides of A. */ \ rs_a = 1; \ @@ -94,10 +94,10 @@ void PASTEF772(chxy,blasname,chc) \ blis_conjy, \ m0, \ n0, \ - alpha, \ + (ftype*)alpha, \ x0, incx0, \ y0, incy0, \ - a, rs_a, cs_a, \ + (ftype*)a, rs_a, cs_a, \ NULL \ ); \ \ diff --git a/frame/compat/bla_ger.h b/frame/compat/bla_ger.h index d1f2dc2f8..5b888d6e4 100644 --- a/frame/compat/bla_ger.h +++ b/frame/compat/bla_ger.h @@ -41,12 +41,12 @@ \ void PASTEF772(chxy,blasname,chc) \ ( \ - f77_int* m, \ - f77_int* n, \ - ftype* alpha, \ - ftype* x, f77_int* incx, \ - ftype* y, f77_int* incy, \ - ftype* a, f77_int* lda \ + const f77_int* m, \ + const f77_int* n, \ + const ftype* alpha, \ + const ftype* x, const f77_int* incx, \ + const ftype* y, const f77_int* incy, \ + ftype* a, const f77_int* lda \ ); #ifdef BLIS_ENABLE_BLAS2BLIS diff --git a/frame/compat/bla_hemm.c b/frame/compat/bla_hemm.c index 7bcc686fe..7cbb3b397 100644 --- a/frame/compat/bla_hemm.c +++ b/frame/compat/bla_hemm.c @@ -43,15 +43,15 @@ \ void PASTEF77(ch,blasname) \ ( \ - f77_char* side, \ - f77_char* uploa, \ - f77_int* m, \ - f77_int* n, \ - ftype* alpha, \ - ftype* a, f77_int* lda, \ - ftype* b, f77_int* ldb, \ - ftype* beta, \ - ftype* c, f77_int* ldc \ + const f77_char* side, \ + const f77_char* uploa, \ + const f77_int* m, \ + const f77_int* n, \ + const ftype* alpha, \ + const ftype* a, const f77_int* lda, \ + const ftype* b, const f77_int* ldb, \ + const ftype* beta, \ + ftype* c, const f77_int* ldc \ ) \ { \ side_t blis_side; \ @@ -104,11 +104,11 @@ void PASTEF77(ch,blasname) \ BLIS_NO_TRANSPOSE, \ m0, \ n0, \ - alpha, \ - a, rs_a, cs_a, \ - b, rs_b, cs_b, \ - beta, \ - c, rs_c, cs_c, \ + (ftype*)alpha, \ + (ftype*)a, rs_a, cs_a, \ + (ftype*)b, rs_b, cs_b, \ + (ftype*)beta, \ + (ftype*)c, rs_c, cs_c, \ NULL \ ); \ \ diff --git a/frame/compat/bla_hemm.h b/frame/compat/bla_hemm.h index 348371f72..16a77357b 100644 --- a/frame/compat/bla_hemm.h +++ b/frame/compat/bla_hemm.h @@ -41,15 +41,15 @@ \ void PASTEF77(ch,blasname) \ ( \ - f77_char* side, \ - f77_char* uploa, \ - f77_int* m, \ - f77_int* n, \ - ftype* alpha, \ - ftype* a, f77_int* lda, \ - ftype* b, f77_int* ldb, \ - ftype* beta, \ - ftype* c, f77_int* ldc \ + const f77_char* side, \ + const f77_char* uploa, \ + const f77_int* m, \ + const f77_int* n, \ + const ftype* alpha, \ + const ftype* a, const f77_int* lda, \ + const ftype* b, const f77_int* ldb, \ + const ftype* beta, \ + ftype* c, const f77_int* ldc \ ); #ifdef BLIS_ENABLE_BLAS2BLIS diff --git a/frame/compat/bla_hemv.c b/frame/compat/bla_hemv.c index 9b3e8cc1a..df53f5859 100644 --- a/frame/compat/bla_hemv.c +++ b/frame/compat/bla_hemv.c @@ -43,13 +43,13 @@ \ void PASTEF77(ch,blasname) \ ( \ - f77_char* uploa, \ - f77_int* m, \ - ftype* alpha, \ - ftype* a, f77_int* lda, \ - ftype* x, f77_int* incx, \ - ftype* beta, \ - ftype* y, f77_int* incy \ + const f77_char* uploa, \ + const f77_int* m, \ + const ftype* alpha, \ + const ftype* a, const f77_int* lda, \ + const ftype* x, const f77_int* incx, \ + const ftype* beta, \ + ftype* y, const f77_int* incy \ ) \ { \ uplo_t blis_uploa; \ @@ -84,8 +84,8 @@ void PASTEF77(ch,blasname) \ \ /* If the input increments are negative, adjust the pointers so we can use positive increments instead. */ \ - bli_convert_blas_incv( m0, x, *incx, x0, incx0 ); \ - bli_convert_blas_incv( m0, y, *incy, y0, incy0 ); \ + bli_convert_blas_incv( m0, (ftype*)x, *incx, x0, incx0 ); \ + bli_convert_blas_incv( m0, (ftype*)y, *incy, y0, incy0 ); \ \ /* Set the row and column strides of A. */ \ rs_a = 1; \ @@ -98,10 +98,10 @@ void PASTEF77(ch,blasname) \ BLIS_NO_CONJUGATE, \ BLIS_NO_CONJUGATE, \ m0, \ - alpha, \ - a, rs_a, cs_a, \ + (ftype*)alpha, \ + (ftype*)a, rs_a, cs_a, \ x0, incx0, \ - beta, \ + (ftype*)beta, \ y0, incy0, \ NULL \ ); \ diff --git a/frame/compat/bla_hemv.h b/frame/compat/bla_hemv.h index 5fd030974..b1fedfaad 100644 --- a/frame/compat/bla_hemv.h +++ b/frame/compat/bla_hemv.h @@ -41,13 +41,13 @@ \ void PASTEF77(ch,blasname) \ ( \ - f77_char* uploa, \ - f77_int* m, \ - ftype* alpha, \ - ftype* a, f77_int* lda, \ - ftype* x, f77_int* incx, \ - ftype* beta, \ - ftype* y, f77_int* incy \ + const f77_char* uploa, \ + const f77_int* m, \ + const ftype* alpha, \ + const ftype* a, const f77_int* lda, \ + const ftype* x, const f77_int* incx, \ + const ftype* beta, \ + ftype* y, const f77_int* incy \ ); #ifdef BLIS_ENABLE_BLAS2BLIS diff --git a/frame/compat/bla_her.c b/frame/compat/bla_her.c index 45d255db7..5ba71344c 100644 --- a/frame/compat/bla_her.c +++ b/frame/compat/bla_her.c @@ -43,11 +43,11 @@ \ void PASTEF77(ch,blasname) \ ( \ - f77_char* uploa, \ - f77_int* m, \ - ftype_r* alpha, \ - ftype* x, f77_int* incx, \ - ftype* a, f77_int* lda \ + const f77_char* uploa, \ + const f77_int* m, \ + const ftype_r* alpha, \ + const ftype* x, const f77_int* incx, \ + ftype* a, const f77_int* lda \ ) \ { \ uplo_t blis_uploa; \ @@ -79,7 +79,7 @@ void PASTEF77(ch,blasname) \ \ /* If the input increments are negative, adjust the pointers so we can use positive increments instead. */ \ - bli_convert_blas_incv( m0, x, *incx, x0, incx0 ); \ + bli_convert_blas_incv( m0, (ftype*)x, *incx, x0, incx0 ); \ \ /* Set the row and column strides of A. */ \ rs_a = 1; \ @@ -91,9 +91,9 @@ void PASTEF77(ch,blasname) \ blis_uploa, \ BLIS_NO_CONJUGATE, \ m0, \ - alpha, \ + (ftype_r*)alpha, \ x0, incx0, \ - a, rs_a, cs_a, \ + (ftype*)a, rs_a, cs_a, \ NULL \ ); \ \ diff --git a/frame/compat/bla_her.h b/frame/compat/bla_her.h index cbae5b0c7..24e78f61b 100644 --- a/frame/compat/bla_her.h +++ b/frame/compat/bla_her.h @@ -41,11 +41,11 @@ \ void PASTEF77(ch,blasname) \ ( \ - f77_char* uploa, \ - f77_int* m, \ - ftype_r* alpha, \ - ftype* x, f77_int* incx, \ - ftype* a, f77_int* lda \ + const f77_char* uploa, \ + const f77_int* m, \ + const ftype_r* alpha, \ + const ftype* x, const f77_int* incx, \ + ftype* a, const f77_int* lda \ ); #ifdef BLIS_ENABLE_BLAS2BLIS diff --git a/frame/compat/bla_her2.c b/frame/compat/bla_her2.c index e998da715..69ac084c7 100644 --- a/frame/compat/bla_her2.c +++ b/frame/compat/bla_her2.c @@ -43,12 +43,12 @@ \ void PASTEF77(ch,blasname) \ ( \ - f77_char* uploa, \ - f77_int* m, \ - ftype* alpha, \ - ftype* x, f77_int* incx, \ - ftype* y, f77_int* incy, \ - ftype* a, f77_int* lda \ + const f77_char* uploa, \ + const f77_int* m, \ + const ftype* alpha, \ + const ftype* x, const f77_int* incx, \ + const ftype* y, const f77_int* incy, \ + ftype* a, const f77_int* lda \ ) \ { \ uplo_t blis_uploa; \ @@ -83,8 +83,8 @@ void PASTEF77(ch,blasname) \ \ /* If the input increments are negative, adjust the pointers so we can use positive increments instead. */ \ - bli_convert_blas_incv( m0, x, *incx, x0, incx0 ); \ - bli_convert_blas_incv( m0, y, *incy, y0, incy0 ); \ + bli_convert_blas_incv( m0, (ftype*)x, *incx, x0, incx0 ); \ + bli_convert_blas_incv( m0, (ftype*)y, *incy, y0, incy0 ); \ \ /* Set the row and column strides of A. */ \ rs_a = 1; \ @@ -97,10 +97,10 @@ void PASTEF77(ch,blasname) \ BLIS_NO_CONJUGATE, \ BLIS_NO_CONJUGATE, \ m0, \ - alpha, \ + (ftype*)alpha, \ x0, incx0, \ y0, incy0, \ - a, rs_a, cs_a, \ + (ftype*)a, rs_a, cs_a, \ NULL \ ); \ \ diff --git a/frame/compat/bla_her2.h b/frame/compat/bla_her2.h index f4db4f711..a4734e6d4 100644 --- a/frame/compat/bla_her2.h +++ b/frame/compat/bla_her2.h @@ -41,12 +41,12 @@ \ void PASTEF77(ch,blasname) \ ( \ - f77_char* uploa, \ - f77_int* m, \ - ftype* alpha, \ - ftype* x, f77_int* incx, \ - ftype* y, f77_int* incy, \ - ftype* a, f77_int* lda \ + const f77_char* uploa, \ + const f77_int* m, \ + const ftype* alpha, \ + const ftype* x, const f77_int* incx, \ + const ftype* y, const f77_int* incy, \ + ftype* a, const f77_int* lda \ ); #ifdef BLIS_ENABLE_BLAS2BLIS diff --git a/frame/compat/bla_her2k.c b/frame/compat/bla_her2k.c index b58c7b93b..85b4d522a 100644 --- a/frame/compat/bla_her2k.c +++ b/frame/compat/bla_her2k.c @@ -43,15 +43,15 @@ \ void PASTEF77(ch,blasname) \ ( \ - f77_char* uploc, \ - f77_char* transa, \ - f77_int* m, \ - f77_int* k, \ - ftype* alpha, \ - ftype* a, f77_int* lda, \ - ftype* b, f77_int* ldb, \ - ftype_r* beta, \ - ftype* c, f77_int* ldc \ + const f77_char* uploc, \ + const f77_char* transa, \ + const f77_int* m, \ + const f77_int* k, \ + const ftype* alpha, \ + const ftype* a, const f77_int* lda, \ + const ftype* b, const f77_int* ldb, \ + const ftype_r* beta, \ + ftype* c, const f77_int* ldc \ ) \ { \ uplo_t blis_uploc; \ @@ -120,11 +120,11 @@ void PASTEF77(ch,blasname) \ blis_transa, \ m0, \ k0, \ - alpha, \ - a, rs_a, cs_a, \ - b, rs_b, cs_b, \ - beta, \ - c, rs_c, cs_c, \ + (ftype*)alpha, \ + (ftype*)a, rs_a, cs_a, \ + (ftype*)b, rs_b, cs_b, \ + (ftype_r*)beta, \ + (ftype*)c, rs_c, cs_c, \ NULL \ ); \ \ diff --git a/frame/compat/bla_her2k.h b/frame/compat/bla_her2k.h index 055c0fcf2..26b60a9bb 100644 --- a/frame/compat/bla_her2k.h +++ b/frame/compat/bla_her2k.h @@ -41,15 +41,15 @@ \ void PASTEF77(ch,blasname) \ ( \ - f77_char* uploc, \ - f77_char* transa, \ - f77_int* m, \ - f77_int* k, \ - ftype* alpha, \ - ftype* a, f77_int* lda, \ - ftype* b, f77_int* ldb, \ - ftype_r* beta, \ - ftype* c, f77_int* ldc \ + const f77_char* uploc, \ + const f77_char* transa, \ + const f77_int* m, \ + const f77_int* k, \ + const ftype* alpha, \ + const ftype* a, const f77_int* lda, \ + const ftype* b, const f77_int* ldb, \ + const ftype_r* beta, \ + ftype* c, const f77_int* ldc \ ); #ifdef BLIS_ENABLE_BLAS2BLIS diff --git a/frame/compat/bla_herk.c b/frame/compat/bla_herk.c index 17b0bedcd..8ce0961e2 100644 --- a/frame/compat/bla_herk.c +++ b/frame/compat/bla_herk.c @@ -43,14 +43,14 @@ \ void PASTEF77(ch,blasname) \ ( \ - f77_char* uploc, \ - f77_char* transa, \ - f77_int* m, \ - f77_int* k, \ - ftype_r* alpha, \ - ftype* a, f77_int* lda, \ - ftype_r* beta, \ - ftype* c, f77_int* ldc \ + const f77_char* uploc, \ + const f77_char* transa, \ + const f77_int* m, \ + const f77_int* k, \ + const ftype_r* alpha, \ + const ftype* a, const f77_int* lda, \ + const ftype_r* beta, \ + ftype* c, const f77_int* ldc \ ) \ { \ uplo_t blis_uploc; \ @@ -114,10 +114,10 @@ void PASTEF77(ch,blasname) \ blis_transa, \ m0, \ k0, \ - alpha, \ - a, rs_a, cs_a, \ - beta, \ - c, rs_c, cs_c, \ + (ftype_r*)alpha, \ + (ftype*)a, rs_a, cs_a, \ + (ftype_r*)beta, \ + (ftype*)c, rs_c, cs_c, \ NULL \ ); \ \ diff --git a/frame/compat/bla_herk.h b/frame/compat/bla_herk.h index dfffd0b08..25f711e7c 100644 --- a/frame/compat/bla_herk.h +++ b/frame/compat/bla_herk.h @@ -41,14 +41,14 @@ \ void PASTEF77(ch,blasname) \ ( \ - f77_char* uploc, \ - f77_char* transa, \ - f77_int* m, \ - f77_int* k, \ - ftype_r* alpha, \ - ftype* a, f77_int* lda, \ - ftype_r* beta, \ - ftype* c, f77_int* ldc \ + const f77_char* uploc, \ + const f77_char* transa, \ + const f77_int* m, \ + const f77_int* k, \ + const ftype_r* alpha, \ + const ftype* a, const f77_int* lda, \ + const ftype_r* beta, \ + ftype* c, const f77_int* ldc \ ); #ifdef BLIS_ENABLE_BLAS2BLIS diff --git a/frame/compat/bla_nrm2.c b/frame/compat/bla_nrm2.c index a575a4088..1e4c91363 100644 --- a/frame/compat/bla_nrm2.c +++ b/frame/compat/bla_nrm2.c @@ -43,8 +43,8 @@ \ ftype_r PASTEF772(chr,chx,blasname) \ ( \ - f77_int* n, \ - ftype_x* x, f77_int* incx \ + const f77_int* n, \ + const ftype_x* x, const f77_int* incx \ ) \ { \ dim_t n0; \ @@ -61,7 +61,7 @@ ftype_r PASTEF772(chr,chx,blasname) \ \ /* If the input increments are negative, adjust the pointers so we can use positive increments instead. */ \ - bli_convert_blas_incv( n0, x, *incx, x0, incx0 ); \ + bli_convert_blas_incv( n0, (ftype_x*)x, *incx, x0, incx0 ); \ \ /* Call BLIS interface. */ \ PASTEMAC(chx,blisname) \ diff --git a/frame/compat/bla_nrm2.h b/frame/compat/bla_nrm2.h index dadbc5fc4..30480eeb2 100644 --- a/frame/compat/bla_nrm2.h +++ b/frame/compat/bla_nrm2.h @@ -41,8 +41,8 @@ \ ftype_r PASTEF772(chr,chx,blasname) \ ( \ - f77_int* n, \ - ftype_x* x, f77_int* incx \ + const f77_int* n, \ + const ftype_x* x, const f77_int* incx \ ); #ifdef BLIS_ENABLE_BLAS2BLIS diff --git a/frame/compat/bla_scal.c b/frame/compat/bla_scal.c index 9258a073c..e386dd93a 100644 --- a/frame/compat/bla_scal.c +++ b/frame/compat/bla_scal.c @@ -43,9 +43,9 @@ \ void PASTEF772(chx,cha,blasname) \ ( \ - f77_int* n, \ - ftype_a* alpha, \ - ftype_x* x, f77_int* incx \ + const f77_int* n, \ + const ftype_a* alpha, \ + ftype_x* x, const f77_int* incx \ ) \ { \ dim_t n0; \ @@ -62,13 +62,13 @@ void PASTEF772(chx,cha,blasname) \ \ /* If the input increments are negative, adjust the pointers so we can use positive increments instead. */ \ - bli_convert_blas_incv( n0, x, *incx, x0, incx0 ); \ + bli_convert_blas_incv( n0, (ftype_x*)x, *incx, x0, incx0 ); \ \ /* NOTE: We do not natively implement BLAS's csscal/zdscal in BLIS. that is, we just always sub-optimally implement those cases by casting alpha to ctype_x (potentially the complex domain) and using the homogeneous datatype instance according to that type. */ \ - PASTEMAC2(cha,chx,cast)( alpha, alpha_cast ); \ + PASTEMAC2(cha,chx,cast)( (ftype_a*)alpha, alpha_cast ); \ \ /* Call BLIS interface. */ \ PASTEMAC(chx,blisname) \ diff --git a/frame/compat/bla_scal.h b/frame/compat/bla_scal.h index 7a15364d6..d9f1617e2 100644 --- a/frame/compat/bla_scal.h +++ b/frame/compat/bla_scal.h @@ -41,9 +41,9 @@ \ void PASTEF772(chx,cha,blasname) \ ( \ - f77_int* n, \ - ftype_a* alpha, \ - ftype_x* x, f77_int* incx \ + const f77_int* n, \ + const ftype_a* alpha, \ + ftype_x* x, const f77_int* incx \ ); #ifdef BLIS_ENABLE_BLAS2BLIS diff --git a/frame/compat/bla_swap.c b/frame/compat/bla_swap.c index cf22603a9..51ab7225a 100644 --- a/frame/compat/bla_swap.c +++ b/frame/compat/bla_swap.c @@ -43,9 +43,9 @@ \ void PASTEF77(ch,blasname) \ ( \ - f77_int* n, \ - ftype* x, f77_int* incx, \ - ftype* y, f77_int* incy \ + const f77_int* n, \ + ftype* x, const f77_int* incx, \ + ftype* y, const f77_int* incy \ ) \ { \ dim_t n0; \ @@ -63,8 +63,8 @@ void PASTEF77(ch,blasname) \ \ /* If the input increments are negative, adjust the pointers so we can use positive increments instead. */ \ - bli_convert_blas_incv( n0, x, *incx, x0, incx0 ); \ - bli_convert_blas_incv( n0, y, *incy, y0, incy0 ); \ + bli_convert_blas_incv( n0, (ftype*)x, *incx, x0, incx0 ); \ + bli_convert_blas_incv( n0, (ftype*)y, *incy, y0, incy0 ); \ \ /* Call BLIS interface. */ \ PASTEMAC(ch,blisname) \ diff --git a/frame/compat/bla_swap.h b/frame/compat/bla_swap.h index 53ec754bb..520462fbb 100644 --- a/frame/compat/bla_swap.h +++ b/frame/compat/bla_swap.h @@ -41,9 +41,9 @@ \ void PASTEF77(ch,blasname) \ ( \ - f77_int* n, \ - ftype* x, f77_int* incx, \ - ftype* y, f77_int* incy \ + const f77_int* n, \ + ftype* x, const f77_int* incx, \ + ftype* y, const f77_int* incy \ ); #ifdef BLIS_ENABLE_BLAS2BLIS diff --git a/frame/compat/bla_symm.c b/frame/compat/bla_symm.c index 3322faad3..df26a6d22 100644 --- a/frame/compat/bla_symm.c +++ b/frame/compat/bla_symm.c @@ -43,15 +43,15 @@ \ void PASTEF77(ch,blasname) \ ( \ - f77_char* side, \ - f77_char* uploa, \ - f77_int* m, \ - f77_int* n, \ - ftype* alpha, \ - ftype* a, f77_int* lda, \ - ftype* b, f77_int* ldb, \ - ftype* beta, \ - ftype* c, f77_int* ldc \ + const f77_char* side, \ + const f77_char* uploa, \ + const f77_int* m, \ + const f77_int* n, \ + const ftype* alpha, \ + const ftype* a, const f77_int* lda, \ + const ftype* b, const f77_int* ldb, \ + const ftype* beta, \ + ftype* c, const f77_int* ldc \ ) \ { \ side_t blis_side; \ @@ -104,11 +104,11 @@ void PASTEF77(ch,blasname) \ BLIS_NO_TRANSPOSE, \ m0, \ n0, \ - alpha, \ - a, rs_a, cs_a, \ - b, rs_b, cs_b, \ - beta, \ - c, rs_c, cs_c, \ + (ftype*)alpha, \ + (ftype*)a, rs_a, cs_a, \ + (ftype*)b, rs_b, cs_b, \ + (ftype*)beta, \ + (ftype*)c, rs_c, cs_c, \ NULL \ ); \ \ diff --git a/frame/compat/bla_symm.h b/frame/compat/bla_symm.h index 492bbcdd1..7b311705d 100644 --- a/frame/compat/bla_symm.h +++ b/frame/compat/bla_symm.h @@ -41,15 +41,15 @@ \ void PASTEF77(ch,blasname) \ ( \ - f77_char* side, \ - f77_char* uploa, \ - f77_int* m, \ - f77_int* n, \ - ftype* alpha, \ - ftype* a, f77_int* lda, \ - ftype* b, f77_int* ldb, \ - ftype* beta, \ - ftype* c, f77_int* ldc \ + const f77_char* side, \ + const f77_char* uploa, \ + const f77_int* m, \ + const f77_int* n, \ + const ftype* alpha, \ + const ftype* a, const f77_int* lda, \ + const ftype* b, const f77_int* ldb, \ + const ftype* beta, \ + ftype* c, const f77_int* ldc \ ); #ifdef BLIS_ENABLE_BLAS2BLIS diff --git a/frame/compat/bla_symv.c b/frame/compat/bla_symv.c index 5ed847721..49406afbc 100644 --- a/frame/compat/bla_symv.c +++ b/frame/compat/bla_symv.c @@ -43,13 +43,13 @@ \ void PASTEF77(ch,blasname) \ ( \ - f77_char* uploa, \ - f77_int* m, \ - ftype* alpha, \ - ftype* a, f77_int* lda, \ - ftype* x, f77_int* incx, \ - ftype* beta, \ - ftype* y, f77_int* incy \ + const f77_char* uploa, \ + const f77_int* m, \ + const ftype* alpha, \ + const ftype* a, const f77_int* lda, \ + const ftype* x, const f77_int* incx, \ + const ftype* beta, \ + ftype* y, const f77_int* incy \ ) \ { \ uplo_t blis_uploa; \ @@ -84,8 +84,8 @@ void PASTEF77(ch,blasname) \ \ /* If the input increments are negative, adjust the pointers so we can use positive increments instead. */ \ - bli_convert_blas_incv( m0, x, *incx, x0, incx0 ); \ - bli_convert_blas_incv( m0, y, *incy, y0, incy0 ); \ + bli_convert_blas_incv( m0, (ftype*)x, *incx, x0, incx0 ); \ + bli_convert_blas_incv( m0, (ftype*)y, *incy, y0, incy0 ); \ \ /* Set the row and column strides of A. */ \ rs_a = 1; \ @@ -98,10 +98,10 @@ void PASTEF77(ch,blasname) \ BLIS_NO_CONJUGATE, \ BLIS_NO_CONJUGATE, \ m0, \ - alpha, \ - a, rs_a, cs_a, \ + (ftype*)alpha, \ + (ftype*)a, rs_a, cs_a, \ x0, incx0, \ - beta, \ + (ftype*)beta, \ y0, incy0, \ NULL \ ); \ diff --git a/frame/compat/bla_symv.h b/frame/compat/bla_symv.h index cb9fffcfd..331f0e8d7 100644 --- a/frame/compat/bla_symv.h +++ b/frame/compat/bla_symv.h @@ -41,13 +41,13 @@ \ void PASTEF77(ch,blasname) \ ( \ - f77_char* uploa, \ - f77_int* m, \ - ftype* alpha, \ - ftype* a, f77_int* lda, \ - ftype* x, f77_int* incx, \ - ftype* beta, \ - ftype* y, f77_int* incy \ + const f77_char* uploa, \ + const f77_int* m, \ + const ftype* alpha, \ + const ftype* a, const f77_int* lda, \ + const ftype* x, const f77_int* incx, \ + const ftype* beta, \ + ftype* y, const f77_int* incy \ ); #ifdef BLIS_ENABLE_BLAS2BLIS diff --git a/frame/compat/bla_syr.c b/frame/compat/bla_syr.c index 112b25c8d..86db9b1e4 100644 --- a/frame/compat/bla_syr.c +++ b/frame/compat/bla_syr.c @@ -43,11 +43,11 @@ \ void PASTEF77(ch,blasname) \ ( \ - f77_char* uploa, \ - f77_int* m, \ - ftype* alpha, \ - ftype* x, f77_int* incx, \ - ftype* a, f77_int* lda \ + const f77_char* uploa, \ + const f77_int* m, \ + const ftype* alpha, \ + const ftype* x, const f77_int* incx, \ + ftype* a, const f77_int* lda \ ) \ { \ uplo_t blis_uploa; \ @@ -79,7 +79,7 @@ void PASTEF77(ch,blasname) \ \ /* If the input increments are negative, adjust the pointers so we can use positive increments instead. */ \ - bli_convert_blas_incv( m0, x, *incx, x0, incx0 ); \ + bli_convert_blas_incv( m0, (ftype*)x, *incx, x0, incx0 ); \ \ /* Set the row and column strides of A. */ \ rs_a = 1; \ @@ -91,9 +91,9 @@ void PASTEF77(ch,blasname) \ blis_uploa, \ BLIS_NO_CONJUGATE, \ m0, \ - alpha, \ + (ftype*)alpha, \ x0, incx0, \ - a, rs_a, cs_a, \ + (ftype*)a, rs_a, cs_a, \ NULL \ ); \ \ diff --git a/frame/compat/bla_syr.h b/frame/compat/bla_syr.h index c1260bd2f..0847eac96 100644 --- a/frame/compat/bla_syr.h +++ b/frame/compat/bla_syr.h @@ -41,11 +41,11 @@ \ void PASTEF77(ch,blasname) \ ( \ - f77_char* uploa, \ - f77_int* m, \ - ftype* alpha, \ - ftype* x, f77_int* incx, \ - ftype* a, f77_int* lda \ + const f77_char* uploa, \ + const f77_int* m, \ + const ftype* alpha, \ + const ftype* x, const f77_int* incx, \ + ftype* a, const f77_int* lda \ ); #ifdef BLIS_ENABLE_BLAS2BLIS diff --git a/frame/compat/bla_syr2.c b/frame/compat/bla_syr2.c index 0a4d5a4b5..f2adf6dc2 100644 --- a/frame/compat/bla_syr2.c +++ b/frame/compat/bla_syr2.c @@ -43,12 +43,12 @@ \ void PASTEF77(ch,blasname) \ ( \ - f77_char* uploa, \ - f77_int* m, \ - ftype* alpha, \ - ftype* x, f77_int* incx, \ - ftype* y, f77_int* incy, \ - ftype* a, f77_int* lda \ + const f77_char* uploa, \ + const f77_int* m, \ + const ftype* alpha, \ + const ftype* x, const f77_int* incx, \ + const ftype* y, const f77_int* incy, \ + ftype* a, const f77_int* lda \ ) \ { \ uplo_t blis_uploa; \ @@ -84,8 +84,8 @@ void PASTEF77(ch,blasname) \ \ /* If the input increments are negative, adjust the pointers so we can use positive increments instead. */ \ - bli_convert_blas_incv( m0, x, *incx, x0, incx0 ); \ - bli_convert_blas_incv( m0, y, *incy, y0, incy0 ); \ + bli_convert_blas_incv( m0, (ftype*)x, *incx, x0, incx0 ); \ + bli_convert_blas_incv( m0, (ftype*)y, *incy, y0, incy0 ); \ \ /* Set the row and column strides of A. */ \ rs_a = 1; \ @@ -98,10 +98,10 @@ void PASTEF77(ch,blasname) \ BLIS_NO_CONJUGATE, \ BLIS_NO_CONJUGATE, \ m0, \ - alpha, \ + (ftype*)alpha, \ x0, incx0, \ y0, incy0, \ - a, rs_a, cs_a, \ + (ftype*)a, rs_a, cs_a, \ NULL \ ); \ \ diff --git a/frame/compat/bla_syr2.h b/frame/compat/bla_syr2.h index 34ec60d81..0ec658df5 100644 --- a/frame/compat/bla_syr2.h +++ b/frame/compat/bla_syr2.h @@ -41,12 +41,12 @@ \ void PASTEF77(ch,blasname) \ ( \ - f77_char* uploa, \ - f77_int* m, \ - ftype* alpha, \ - ftype* x, f77_int* incx, \ - ftype* y, f77_int* incy, \ - ftype* a, f77_int* lda \ + const f77_char* uploa, \ + const f77_int* m, \ + const ftype* alpha, \ + const ftype* x, const f77_int* incx, \ + const ftype* y, const f77_int* incy, \ + ftype* a, const f77_int* lda \ ); #ifdef BLIS_ENABLE_BLAS2BLIS diff --git a/frame/compat/bla_syr2k.c b/frame/compat/bla_syr2k.c index 637d2ac3e..895445d44 100644 --- a/frame/compat/bla_syr2k.c +++ b/frame/compat/bla_syr2k.c @@ -43,15 +43,15 @@ \ void PASTEF77(ch,blasname) \ ( \ - f77_char* uploc, \ - f77_char* transa, \ - f77_int* m, \ - f77_int* k, \ - ftype* alpha, \ - ftype* a, f77_int* lda, \ - ftype* b, f77_int* ldb, \ - ftype* beta, \ - ftype* c, f77_int* ldc \ + const f77_char* uploc, \ + const f77_char* transa, \ + const f77_int* m, \ + const f77_int* k, \ + const ftype* alpha, \ + const ftype* a, const f77_int* lda, \ + const ftype* b, const f77_int* ldb, \ + const ftype* beta, \ + ftype* c, const f77_int* ldc \ ) \ { \ uplo_t blis_uploc; \ @@ -112,11 +112,11 @@ void PASTEF77(ch,blasname) \ blis_transa, \ m0, \ k0, \ - alpha, \ - a, rs_a, cs_a, \ - b, rs_b, cs_b, \ - beta, \ - c, rs_c, cs_c, \ + (ftype*)alpha, \ + (ftype*)a, rs_a, cs_a, \ + (ftype*)b, rs_b, cs_b, \ + (ftype*)beta, \ + (ftype*)c, rs_c, cs_c, \ NULL \ ); \ \ diff --git a/frame/compat/bla_syr2k.h b/frame/compat/bla_syr2k.h index ac4bbaf47..17bbba537 100644 --- a/frame/compat/bla_syr2k.h +++ b/frame/compat/bla_syr2k.h @@ -41,15 +41,15 @@ \ void PASTEF77(ch,blasname) \ ( \ - f77_char* uploc, \ - f77_char* transa, \ - f77_int* m, \ - f77_int* k, \ - ftype* alpha, \ - ftype* a, f77_int* lda, \ - ftype* b, f77_int* ldb, \ - ftype* beta, \ - ftype* c, f77_int* ldc \ + const f77_char* uploc, \ + const f77_char* transa, \ + const f77_int* m, \ + const f77_int* k, \ + const ftype* alpha, \ + const ftype* a, const f77_int* lda, \ + const ftype* b, const f77_int* ldb, \ + const ftype* beta, \ + ftype* c, const f77_int* ldc \ ); #ifdef BLIS_ENABLE_BLAS2BLIS diff --git a/frame/compat/bla_syrk.c b/frame/compat/bla_syrk.c index d48012b3f..dbde1922c 100644 --- a/frame/compat/bla_syrk.c +++ b/frame/compat/bla_syrk.c @@ -43,14 +43,14 @@ \ void PASTEF77(ch,blasname) \ ( \ - f77_char* uploc, \ - f77_char* transa, \ - f77_int* m, \ - f77_int* k, \ - ftype* alpha, \ - ftype* a, f77_int* lda, \ - ftype* beta, \ - ftype* c, f77_int* ldc \ + const f77_char* uploc, \ + const f77_char* transa, \ + const f77_int* m, \ + const f77_int* k, \ + const ftype* alpha, \ + const ftype* a, const f77_int* lda, \ + const ftype* beta, \ + ftype* c, const f77_int* ldc \ ) \ { \ uplo_t blis_uploc; \ @@ -106,10 +106,10 @@ void PASTEF77(ch,blasname) \ blis_transa, \ m0, \ k0, \ - alpha, \ - a, rs_a, cs_a, \ - beta, \ - c, rs_c, cs_c, \ + (ftype*)alpha, \ + (ftype*)a, rs_a, cs_a, \ + (ftype*)beta, \ + (ftype*)c, rs_c, cs_c, \ NULL \ ); \ \ diff --git a/frame/compat/bla_syrk.h b/frame/compat/bla_syrk.h index 2eed8ddba..384ac5a13 100644 --- a/frame/compat/bla_syrk.h +++ b/frame/compat/bla_syrk.h @@ -41,14 +41,14 @@ \ void PASTEF77(ch,blasname) \ ( \ - f77_char* uploc, \ - f77_char* transa, \ - f77_int* m, \ - f77_int* k, \ - ftype* alpha, \ - ftype* a, f77_int* lda, \ - ftype* beta, \ - ftype* c, f77_int* ldc \ + const f77_char* uploc, \ + const f77_char* transa, \ + const f77_int* m, \ + const f77_int* k, \ + const ftype* alpha, \ + const ftype* a, const f77_int* lda, \ + const ftype* beta, \ + ftype* c, const f77_int* ldc \ ); #ifdef BLIS_ENABLE_BLAS2BLIS diff --git a/frame/compat/bla_trmm.c b/frame/compat/bla_trmm.c index c591f5b26..42f8b467d 100644 --- a/frame/compat/bla_trmm.c +++ b/frame/compat/bla_trmm.c @@ -43,15 +43,15 @@ \ void PASTEF77(ch,blasname) \ ( \ - f77_char* side, \ - f77_char* uploa, \ - f77_char* transa, \ - f77_char* diaga, \ - f77_int* m, \ - f77_int* n, \ - ftype* alpha, \ - ftype* a, f77_int* lda, \ - ftype* b, f77_int* ldb \ + const f77_char* side, \ + const f77_char* uploa, \ + const f77_char* transa, \ + const f77_char* diaga, \ + const f77_int* m, \ + const f77_int* n, \ + const ftype* alpha, \ + const ftype* a, const f77_int* lda, \ + ftype* b, const f77_int* ldb \ ) \ { \ side_t blis_side; \ @@ -106,9 +106,9 @@ void PASTEF77(ch,blasname) \ blis_diaga, \ m0, \ n0, \ - alpha, \ - a, rs_a, cs_a, \ - b, rs_b, cs_b, \ + (ftype*)alpha, \ + (ftype*)a, rs_a, cs_a, \ + (ftype*)b, rs_b, cs_b, \ NULL \ ); \ \ diff --git a/frame/compat/bla_trmm.h b/frame/compat/bla_trmm.h index 8ff642a94..4fcfa88e0 100644 --- a/frame/compat/bla_trmm.h +++ b/frame/compat/bla_trmm.h @@ -41,15 +41,15 @@ \ void PASTEF77(ch,blasname) \ ( \ - f77_char* side, \ - f77_char* uploa, \ - f77_char* transa, \ - f77_char* diaga, \ - f77_int* m, \ - f77_int* n, \ - ftype* alpha, \ - ftype* a, f77_int* lda, \ - ftype* b, f77_int* ldb \ + const f77_char* side, \ + const f77_char* uploa, \ + const f77_char* transa, \ + const f77_char* diaga, \ + const f77_int* m, \ + const f77_int* n, \ + const ftype* alpha, \ + const ftype* a, const f77_int* lda, \ + ftype* b, const f77_int* ldb \ ); #ifdef BLIS_ENABLE_BLAS2BLIS diff --git a/frame/compat/bla_trmv.c b/frame/compat/bla_trmv.c index f47a677ff..b2377da39 100644 --- a/frame/compat/bla_trmv.c +++ b/frame/compat/bla_trmv.c @@ -43,12 +43,12 @@ \ void PASTEF77(ch,blasname) \ ( \ - f77_char* uploa, \ - f77_char* transa, \ - f77_char* diaga, \ - f77_int* m, \ - ftype* a, f77_int* lda, \ - ftype* x, f77_int* incx \ + const f77_char* uploa, \ + const f77_char* transa, \ + const f77_char* diaga, \ + const f77_int* m, \ + const ftype* a, const f77_int* lda, \ + ftype* x, const f77_int* incx \ ) \ { \ uplo_t blis_uploa; \ @@ -87,7 +87,7 @@ void PASTEF77(ch,blasname) \ \ /* If the input increments are negative, adjust the pointers so we can use positive increments instead. */ \ - bli_convert_blas_incv( m0, x, *incx, x0, incx0 ); \ + bli_convert_blas_incv( m0, (ftype*)x, *incx, x0, incx0 ); \ \ /* Set the row and column strides of A. */ \ rs_a = 1; \ @@ -104,7 +104,7 @@ void PASTEF77(ch,blasname) \ blis_diaga, \ m0, \ one_p, \ - a, rs_a, cs_a, \ + (ftype*)a, rs_a, cs_a, \ x0, incx0, \ NULL \ ); \ diff --git a/frame/compat/bla_trmv.h b/frame/compat/bla_trmv.h index fb3ccca09..df6ad8ce0 100644 --- a/frame/compat/bla_trmv.h +++ b/frame/compat/bla_trmv.h @@ -41,12 +41,12 @@ \ void PASTEF77(ch,blasname) \ ( \ - f77_char* uploa, \ - f77_char* transa, \ - f77_char* diaga, \ - f77_int* m, \ - ftype* a, f77_int* lda, \ - ftype* x, f77_int* incx \ + const f77_char* uploa, \ + const f77_char* transa, \ + const f77_char* diaga, \ + const f77_int* m, \ + const ftype* a, const f77_int* lda, \ + ftype* x, const f77_int* incx \ ); #ifdef BLIS_ENABLE_BLAS2BLIS diff --git a/frame/compat/bla_trsm.c b/frame/compat/bla_trsm.c index e028c4b94..c06d9d2fc 100644 --- a/frame/compat/bla_trsm.c +++ b/frame/compat/bla_trsm.c @@ -43,15 +43,15 @@ \ void PASTEF77(ch,blasname) \ ( \ - f77_char* side, \ - f77_char* uploa, \ - f77_char* transa, \ - f77_char* diaga, \ - f77_int* m, \ - f77_int* n, \ - ftype* alpha, \ - ftype* a, f77_int* lda, \ - ftype* b, f77_int* ldb \ + const f77_char* side, \ + const f77_char* uploa, \ + const f77_char* transa, \ + const f77_char* diaga, \ + const f77_int* m, \ + const f77_int* n, \ + const ftype* alpha, \ + const ftype* a, const f77_int* lda, \ + ftype* b, const f77_int* ldb \ ) \ { \ side_t blis_side; \ @@ -106,9 +106,9 @@ void PASTEF77(ch,blasname) \ blis_diaga, \ m0, \ n0, \ - alpha, \ - a, rs_a, cs_a, \ - b, rs_b, cs_b, \ + (ftype*)alpha, \ + (ftype*)a, rs_a, cs_a, \ + (ftype*)b, rs_b, cs_b, \ NULL \ ); \ \ diff --git a/frame/compat/bla_trsm.h b/frame/compat/bla_trsm.h index 8ef12fe9c..ff5a8ee40 100644 --- a/frame/compat/bla_trsm.h +++ b/frame/compat/bla_trsm.h @@ -41,15 +41,15 @@ \ void PASTEF77(ch,blasname) \ ( \ - f77_char* side, \ - f77_char* uploa, \ - f77_char* transa, \ - f77_char* diaga, \ - f77_int* m, \ - f77_int* n, \ - ftype* alpha, \ - ftype* a, f77_int* lda, \ - ftype* b, f77_int* ldb \ + const f77_char* side, \ + const f77_char* uploa, \ + const f77_char* transa, \ + const f77_char* diaga, \ + const f77_int* m, \ + const f77_int* n, \ + const ftype* alpha, \ + const ftype* a, const f77_int* lda, \ + ftype* b, const f77_int* ldb \ ); #ifdef BLIS_ENABLE_BLAS2BLIS diff --git a/frame/compat/bla_trsv.c b/frame/compat/bla_trsv.c index bff4016de..0fa7ad453 100644 --- a/frame/compat/bla_trsv.c +++ b/frame/compat/bla_trsv.c @@ -43,12 +43,12 @@ \ void PASTEF77(ch,blasname) \ ( \ - f77_char* uploa, \ - f77_char* transa, \ - f77_char* diaga, \ - f77_int* m, \ - ftype* a, f77_int* lda, \ - ftype* x, f77_int* incx \ + const f77_char* uploa, \ + const f77_char* transa, \ + const f77_char* diaga, \ + const f77_int* m, \ + const ftype* a, const f77_int* lda, \ + ftype* x, const f77_int* incx \ ) \ { \ uplo_t blis_uploa; \ @@ -87,7 +87,7 @@ void PASTEF77(ch,blasname) \ \ /* If the input increments are negative, adjust the pointers so we can use positive increments instead. */ \ - bli_convert_blas_incv( m0, x, *incx, x0, incx0 ); \ + bli_convert_blas_incv( m0, (ftype*)x, *incx, x0, incx0 ); \ \ /* Set the row and column strides of A. */ \ rs_a = 1; \ @@ -104,7 +104,7 @@ void PASTEF77(ch,blasname) \ blis_diaga, \ m0, \ one_p, \ - a, rs_a, cs_a, \ + (ftype*)a, rs_a, cs_a, \ x0, incx0, \ NULL \ ); \ diff --git a/frame/compat/bla_trsv.h b/frame/compat/bla_trsv.h index 2292ad021..19ea1f387 100644 --- a/frame/compat/bla_trsv.h +++ b/frame/compat/bla_trsv.h @@ -41,12 +41,12 @@ \ void PASTEF77(ch,blasname) \ ( \ - f77_char* uploa, \ - f77_char* transa, \ - f77_char* diaga, \ - f77_int* m, \ - ftype* a, f77_int* lda, \ - ftype* x, f77_int* incx \ + const f77_char* uploa, \ + const f77_char* transa, \ + const f77_char* diaga, \ + const f77_int* m, \ + const ftype* a, const f77_int* lda, \ + ftype* x, const f77_int* incx \ ); #ifdef BLIS_ENABLE_BLAS2BLIS diff --git a/frame/compat/bli_blas.h b/frame/compat/bli_blas.h index a046d305a..5583e456b 100644 --- a/frame/compat/bli_blas.h +++ b/frame/compat/bli_blas.h @@ -32,6 +32,15 @@ */ +#ifdef BLIS_ENABLE_CBLAS + +// If the BLAS compatibility layer was not explicitly enabled, we must +// enable it here. +#ifndef BLIS_ENABLE_BLAS2BLIS +#define BLIS_ENABLE_BLAS2BLIS +#endif + +#endif // BLIS_ENABLE_CBLAS #ifdef BLIS_ENABLE_BLAS2BLIS @@ -85,6 +94,11 @@ #include "bla_scal.h" #include "bla_swap.h" +#include "f77_amax_sub.h" +#include "f77_asum_sub.h" +#include "f77_dot_sub.h" +#include "f77_nrm2_sub.h" + // -- Level-2 BLAS prototypes -- diff --git a/frame/compat/cblas/bli_cblas.h b/frame/compat/cblas/bli_cblas.h index da692d70c..0cffbe9bb 100644 --- a/frame/compat/cblas/bli_cblas.h +++ b/frame/compat/cblas/bli_cblas.h @@ -35,22 +35,14 @@ #ifndef BLIS_CBLAS_H #define BLIS_CBLAS_H - #ifdef BLIS_ENABLE_CBLAS -// If the BLAS compatibility layer was not explicitly enabled, we must -// enable it here. -#ifndef BLIS_ENABLE_BLAS2BLIS -#define BLIS_ENABLE_BLAS2BLIS -#endif -// Force trailing underscores. BLIS does not support any other type of -// Fortran name-mangling. -#define ADD_ - -// Define the Fortran integer to be the same kind assumed by BLIS's -// BLAS compatibility layer. -#define F77_INT f77_int +// Undefine these macros so that no internal conversion is done by CBLAS. +// The function signatures have been modified to use the proper integer types +// directly. +#undef F77_INT +#undef F77_CHAR // Include the main CBLAS header so that including this header file // (probably via blis.h) allows applications to access CBLAS diff --git a/frame/compat/cblas/f77_sub/f77_amax_sub.c b/frame/compat/cblas/f77_sub/f77_amax_sub.c index d8402c1c5..a6f55d8c6 100644 --- a/frame/compat/cblas/f77_sub/f77_amax_sub.c +++ b/frame/compat/cblas/f77_sub/f77_amax_sub.c @@ -43,8 +43,8 @@ #define GENTFUNC( ftype_x, chx, blasname, blisname ) \ \ void PASTEF773(i,chx,blasname,sub)( \ - f77_int* n, \ - ftype_x* x, f77_int* incx, \ + const f77_int* n, \ + const ftype_x* x, const f77_int* incx, \ f77_int* rval \ ) \ { \ diff --git a/frame/compat/cblas/f77_sub/f77_amax_sub.h b/frame/compat/cblas/f77_sub/f77_amax_sub.h index e417b1ca7..42ee48d97 100644 --- a/frame/compat/cblas/f77_sub/f77_amax_sub.h +++ b/frame/compat/cblas/f77_sub/f77_amax_sub.h @@ -40,8 +40,8 @@ #define GENTPROT( ftype_x, chx, blasname ) \ \ void PASTEF773(i,chx,blasname,sub)( \ - f77_int* n, \ - ftype_x* x, f77_int* incx, \ + const f77_int* n, \ + const ftype_x* x, const f77_int* incx, \ f77_int* rval \ ); diff --git a/frame/compat/cblas/f77_sub/f77_asum_sub.c b/frame/compat/cblas/f77_sub/f77_asum_sub.c index 56025962c..c8fc069e5 100644 --- a/frame/compat/cblas/f77_sub/f77_asum_sub.c +++ b/frame/compat/cblas/f77_sub/f77_asum_sub.c @@ -43,8 +43,8 @@ #define GENTFUNCR2( ftype_x, ftype_r, chx, chr, blasname, blisname ) \ \ void PASTEF773(chr,chx,blasname,sub)( \ - f77_int* n, \ - ftype_x* x, f77_int* incx, \ + const f77_int* n, \ + const ftype_x* x, const f77_int* incx, \ ftype_r* rval \ ) \ { \ diff --git a/frame/compat/cblas/f77_sub/f77_asum_sub.h b/frame/compat/cblas/f77_sub/f77_asum_sub.h index 3517c8df0..284ec760b 100644 --- a/frame/compat/cblas/f77_sub/f77_asum_sub.h +++ b/frame/compat/cblas/f77_sub/f77_asum_sub.h @@ -40,8 +40,8 @@ #define GENTPROTR2( ftype_x, ftype_r, chx, chr, blasname ) \ \ void PASTEF773(chr,chx,blasname,sub)( \ - f77_int* n, \ - ftype_x* x, f77_int* incx, \ + const f77_int* n, \ + const ftype_x* x, const f77_int* incx, \ ftype_r* rval \ ); diff --git a/frame/compat/cblas/f77_sub/f77_dot_sub.c b/frame/compat/cblas/f77_sub/f77_dot_sub.c index a299609d3..0f4b09bc4 100644 --- a/frame/compat/cblas/f77_sub/f77_dot_sub.c +++ b/frame/compat/cblas/f77_sub/f77_dot_sub.c @@ -43,9 +43,9 @@ #define GENTFUNCDOT( ftype, chxy, chc, blis_conjx, blasname, blisname ) \ \ void PASTEF773(chxy,blasname,chc,sub)( \ - f77_int* n, \ - ftype* x, f77_int* incx, \ - ftype* y, f77_int* incy, \ + const f77_int* n, \ + const ftype* x, const f77_int* incx, \ + const ftype* y, const f77_int* incy, \ ftype* rval \ ) \ { \ @@ -62,22 +62,23 @@ INSERT_GENTFUNCDOT_BLAS( dot, NULL ) // Input vectors stored in single precision, computed in double precision, // with result returned in single precision. -void PASTEF772(sds,dot,sub)( f77_int* n, - float* x, f77_int* incx, - float* y, f77_int* incy, +void PASTEF772(sds,dot,sub)( const f77_int* n, + const float* sb, + const float* x, const f77_int* incx, + const float* y, const f77_int* incy, float* rval ) { - *rval = PASTEF77(sds,dot)( n, - x, incx, - y, incy ); + *rval = *sb + PASTEF77(sds,dot)( n, + x, incx, + y, incy ); } // Input vectors stored in single precision, computed in double precision, // with result returned in double precision. -void PASTEF772(ds,dot,sub)( f77_int* n, - float* x, f77_int* incx, - float* y, f77_int* incy, +void PASTEF772(ds,dot,sub)( const f77_int* n, + const float* x, const f77_int* incx, + const float* y, const f77_int* incy, double* rval ) { diff --git a/frame/compat/cblas/f77_sub/f77_dot_sub.h b/frame/compat/cblas/f77_sub/f77_dot_sub.h index 94eb0973c..70eeec93e 100644 --- a/frame/compat/cblas/f77_sub/f77_dot_sub.h +++ b/frame/compat/cblas/f77_sub/f77_dot_sub.h @@ -40,9 +40,9 @@ #define GENTPROTDOT( ftype, chxy, chc, blasname ) \ \ void PASTEF773(chxy,blasname,chc,sub)( \ - f77_int* n, \ - ftype* x, f77_int* incx, \ - ftype* y, f77_int* incy, \ + const f77_int* n, \ + const ftype* x, const f77_int* incx, \ + const ftype* y, const f77_int* incy, \ ftype* rval \ ); @@ -52,15 +52,16 @@ INSERT_GENTPROTDOT_BLAS( dot ) // -- "Black sheep" dot product function prototypes -- -void PASTEF772(sds,dot,sub)( f77_int* n, - float* x, f77_int* incx, - float* y, f77_int* incy, +void PASTEF772(sds,dot,sub)( const f77_int* n, + const float* sb, + const float* x, const f77_int* incx, + const float* y, const f77_int* incy, float* rval ); -void PASTEF772(ds,dot,sub)( f77_int* n, - float* x, f77_int* incx, - float* y, f77_int* incy, +void PASTEF772(ds,dot,sub)( const f77_int* n, + const float* x, const f77_int* incx, + const float* y, const f77_int* incy, double* rval ); #endif diff --git a/frame/compat/cblas/f77_sub/f77_nrm2_sub.c b/frame/compat/cblas/f77_sub/f77_nrm2_sub.c index 126ab2397..7534d0cfb 100644 --- a/frame/compat/cblas/f77_sub/f77_nrm2_sub.c +++ b/frame/compat/cblas/f77_sub/f77_nrm2_sub.c @@ -43,8 +43,8 @@ #define GENTFUNCR2( ftype_x, ftype_r, chx, chr, blasname, blisname ) \ \ void PASTEF773(chr,chx,blasname,sub)( \ - f77_int* n, \ - ftype_x* x, f77_int* incx, \ + const f77_int* n, \ + const ftype_x* x, const f77_int* incx, \ ftype_r* rval \ ) \ { \ diff --git a/frame/compat/cblas/f77_sub/f77_nrm2_sub.h b/frame/compat/cblas/f77_sub/f77_nrm2_sub.h index 4686a19c4..d966f15f7 100644 --- a/frame/compat/cblas/f77_sub/f77_nrm2_sub.h +++ b/frame/compat/cblas/f77_sub/f77_nrm2_sub.h @@ -40,8 +40,8 @@ #define GENTPROTR2( ftype_x, ftype_r, chx, chr, blasname ) \ \ void PASTEF773(chr,chx,blasname,sub)( \ - f77_int* n, \ - ftype_x* x, f77_int* incx, \ + const f77_int* n, \ + const ftype_x* x, const f77_int* incx, \ ftype_r* rval \ ); diff --git a/frame/compat/cblas/src/cblas.h b/frame/compat/cblas/src/cblas.h index f91557e74..f8b4d43a4 100644 --- a/frame/compat/cblas/src/cblas.h +++ b/frame/compat/cblas/src/cblas.h @@ -5,8 +5,6 @@ /* * Enumerated and derived types */ -#define CBLAS_INDEX size_t /* this may vary between platforms */ - enum CBLAS_ORDER {CblasRowMajor=101, CblasColMajor=102}; enum CBLAS_TRANSPOSE {CblasNoTrans=111, CblasTrans=112, CblasConjTrans=113}; enum CBLAS_UPLO {CblasUpper=121, CblasLower=122}; @@ -22,52 +20,52 @@ extern "C" { * Prototypes for level 1 BLAS functions (complex are recast as routines) * =========================================================================== */ -float cblas_sdsdot(const int N, const float alpha, const float *X, - const int incX, const float *Y, const int incY); -double cblas_dsdot(const int N, const float *X, const int incX, const float *Y, - const int incY); -float cblas_sdot(const int N, const float *X, const int incX, - const float *Y, const int incY); -double cblas_ddot(const int N, const double *X, const int incX, - const double *Y, const int incY); +float cblas_sdsdot(f77_int N, float alpha, const float *X, + f77_int incX, const float *Y, f77_int incY); +double cblas_dsdot(f77_int N, const float *X, f77_int incX, const float *Y, + f77_int incY); +float cblas_sdot(f77_int N, const float *X, f77_int incX, + const float *Y, f77_int incY); +double cblas_ddot(f77_int N, const double *X, f77_int incX, + const double *Y, f77_int incY); /* * Functions having prefixes Z and C only */ -void cblas_cdotu_sub(const int N, const void *X, const int incX, - const void *Y, const int incY, void *dotu); -void cblas_cdotc_sub(const int N, const void *X, const int incX, - const void *Y, const int incY, void *dotc); +void cblas_cdotu_sub(f77_int N, const void *X, f77_int incX, + const void *Y, f77_int incY, void *dotu); +void cblas_cdotc_sub(f77_int N, const void *X, f77_int incX, + const void *Y, f77_int incY, void *dotc); -void cblas_zdotu_sub(const int N, const void *X, const int incX, - const void *Y, const int incY, void *dotu); -void cblas_zdotc_sub(const int N, const void *X, const int incX, - const void *Y, const int incY, void *dotc); +void cblas_zdotu_sub(f77_int N, const void *X, f77_int incX, + const void *Y, f77_int incY, void *dotu); +void cblas_zdotc_sub(f77_int N, const void *X, f77_int incX, + const void *Y, f77_int incY, void *dotc); /* * Functions having prefixes S D SC DZ */ -float cblas_snrm2(const int N, const float *X, const int incX); -float cblas_sasum(const int N, const float *X, const int incX); +float cblas_snrm2(f77_int N, const float *X, f77_int incX); +float cblas_sasum(f77_int N, const float *X, f77_int incX); -double cblas_dnrm2(const int N, const double *X, const int incX); -double cblas_dasum(const int N, const double *X, const int incX); +double cblas_dnrm2(f77_int N, const double *X, f77_int incX); +double cblas_dasum(f77_int N, const double *X, f77_int incX); -float cblas_scnrm2(const int N, const void *X, const int incX); -float cblas_scasum(const int N, const void *X, const int incX); +float cblas_scnrm2(f77_int N, const void *X, f77_int incX); +float cblas_scasum(f77_int N, const void *X, f77_int incX); -double cblas_dznrm2(const int N, const void *X, const int incX); -double cblas_dzasum(const int N, const void *X, const int incX); +double cblas_dznrm2(f77_int N, const void *X, f77_int incX); +double cblas_dzasum(f77_int N, const void *X, f77_int incX); /* * Functions having standard 4 prefixes (S D C Z) */ -CBLAS_INDEX cblas_isamax(const int N, const float *X, const int incX); -CBLAS_INDEX cblas_idamax(const int N, const double *X, const int incX); -CBLAS_INDEX cblas_icamax(const int N, const void *X, const int incX); -CBLAS_INDEX cblas_izamax(const int N, const void *X, const int incX); +f77_int cblas_isamax(f77_int N, const float *X, f77_int incX); +f77_int cblas_idamax(f77_int N, const double *X, f77_int incX); +f77_int cblas_icamax(f77_int N, const void *X, f77_int incX); +f77_int cblas_izamax(f77_int N, const void *X, f77_int incX); /* * =========================================================================== @@ -78,33 +76,33 @@ CBLAS_INDEX cblas_izamax(const int N, const void *X, const int incX); /* * Routines with standard 4 prefixes (s, d, c, z) */ -void cblas_sswap(const int N, float *X, const int incX, - float *Y, const int incY); -void cblas_scopy(const int N, const float *X, const int incX, - float *Y, const int incY); -void cblas_saxpy(const int N, const float alpha, const float *X, - const int incX, float *Y, const int incY); +void cblas_sswap(f77_int N, float *X, f77_int incX, + float *Y, f77_int incY); +void cblas_scopy(f77_int N, const float *X, f77_int incX, + float *Y, f77_int incY); +void cblas_saxpy(f77_int N, float alpha, const float *X, + f77_int incX, float *Y, f77_int incY); -void cblas_dswap(const int N, double *X, const int incX, - double *Y, const int incY); -void cblas_dcopy(const int N, const double *X, const int incX, - double *Y, const int incY); -void cblas_daxpy(const int N, const double alpha, const double *X, - const int incX, double *Y, const int incY); +void cblas_dswap(f77_int N, double *X, f77_int incX, + double *Y, f77_int incY); +void cblas_dcopy(f77_int N, const double *X, f77_int incX, + double *Y, f77_int incY); +void cblas_daxpy(f77_int N, double alpha, const double *X, + f77_int incX, double *Y, f77_int incY); -void cblas_cswap(const int N, void *X, const int incX, - void *Y, const int incY); -void cblas_ccopy(const int N, const void *X, const int incX, - void *Y, const int incY); -void cblas_caxpy(const int N, const void *alpha, const void *X, - const int incX, void *Y, const int incY); +void cblas_cswap(f77_int N, void *X, f77_int incX, + void *Y, f77_int incY); +void cblas_ccopy(f77_int N, const void *X, f77_int incX, + void *Y, f77_int incY); +void cblas_caxpy(f77_int N, const void *alpha, const void *X, + f77_int incX, void *Y, f77_int incY); -void cblas_zswap(const int N, void *X, const int incX, - void *Y, const int incY); -void cblas_zcopy(const int N, const void *X, const int incX, - void *Y, const int incY); -void cblas_zaxpy(const int N, const void *alpha, const void *X, - const int incX, void *Y, const int incY); +void cblas_zswap(f77_int N, void *X, f77_int incX, + void *Y, f77_int incY); +void cblas_zcopy(f77_int N, const void *X, f77_int incX, + void *Y, f77_int incY); +void cblas_zaxpy(f77_int N, const void *alpha, const void *X, + f77_int incX, void *Y, f77_int incY); /* @@ -112,28 +110,28 @@ void cblas_zaxpy(const int N, const void *alpha, const void *X, */ void cblas_srotg(float *a, float *b, float *c, float *s); void cblas_srotmg(float *d1, float *d2, float *b1, const float b2, float *P); -void cblas_srot(const int N, float *X, const int incX, - float *Y, const int incY, const float c, const float s); -void cblas_srotm(const int N, float *X, const int incX, - float *Y, const int incY, const float *P); +void cblas_srot(f77_int N, float *X, f77_int incX, + float *Y, f77_int incY, const float c, const float s); +void cblas_srotm(f77_int N, float *X, f77_int incX, + float *Y, f77_int incY, const float *P); void cblas_drotg(double *a, double *b, double *c, double *s); void cblas_drotmg(double *d1, double *d2, double *b1, const double b2, double *P); -void cblas_drot(const int N, double *X, const int incX, - double *Y, const int incY, const double c, const double s); -void cblas_drotm(const int N, double *X, const int incX, - double *Y, const int incY, const double *P); +void cblas_drot(f77_int N, double *X, f77_int incX, + double *Y, f77_int incY, const double c, const double s); +void cblas_drotm(f77_int N, double *X, f77_int incX, + double *Y, f77_int incY, const double *P); /* * Routines with S D C Z CS and ZD prefixes */ -void cblas_sscal(const int N, const float alpha, float *X, const int incX); -void cblas_dscal(const int N, const double alpha, double *X, const int incX); -void cblas_cscal(const int N, const void *alpha, void *X, const int incX); -void cblas_zscal(const int N, const void *alpha, void *X, const int incX); -void cblas_csscal(const int N, const float alpha, void *X, const int incX); -void cblas_zdscal(const int N, const double alpha, void *X, const int incX); +void cblas_sscal(f77_int N, float alpha, float *X, f77_int incX); +void cblas_dscal(f77_int N, double alpha, double *X, f77_int incX); +void cblas_cscal(f77_int N, const void *alpha, void *X, f77_int incX); +void cblas_zscal(f77_int N, const void *alpha, void *X, f77_int incX); +void cblas_csscal(f77_int N, float alpha, void *X, f77_int incX); +void cblas_zdscal(f77_int N, double alpha, void *X, f77_int incX); /* * =========================================================================== @@ -144,265 +142,265 @@ void cblas_zdscal(const int N, const double alpha, void *X, const int incX); /* * Routines with standard 4 prefixes (S, D, C, Z) */ -void cblas_sgemv(const enum CBLAS_ORDER order, - const enum CBLAS_TRANSPOSE TransA, const int M, const int N, - const float alpha, const float *A, const int lda, - const float *X, const int incX, const float beta, - float *Y, const int incY); -void cblas_sgbmv(const enum CBLAS_ORDER order, - const enum CBLAS_TRANSPOSE TransA, const int M, const int N, - const int KL, const int KU, const float alpha, - const float *A, const int lda, const float *X, - const int incX, const float beta, float *Y, const int incY); -void cblas_strmv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const enum CBLAS_TRANSPOSE TransA, const enum CBLAS_DIAG Diag, - const int N, const float *A, const int lda, - float *X, const int incX); -void cblas_stbmv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const enum CBLAS_TRANSPOSE TransA, const enum CBLAS_DIAG Diag, - const int N, const int K, const float *A, const int lda, - float *X, const int incX); -void cblas_stpmv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const enum CBLAS_TRANSPOSE TransA, const enum CBLAS_DIAG Diag, - const int N, const float *Ap, float *X, const int incX); -void cblas_strsv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const enum CBLAS_TRANSPOSE TransA, const enum CBLAS_DIAG Diag, - const int N, const float *A, const int lda, float *X, - const int incX); -void cblas_stbsv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const enum CBLAS_TRANSPOSE TransA, const enum CBLAS_DIAG Diag, - const int N, const int K, const float *A, const int lda, - float *X, const int incX); -void cblas_stpsv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const enum CBLAS_TRANSPOSE TransA, const enum CBLAS_DIAG Diag, - const int N, const float *Ap, float *X, const int incX); +void cblas_sgemv(enum CBLAS_ORDER order, + enum CBLAS_TRANSPOSE TransA, f77_int M, f77_int N, + float alpha, const float *A, f77_int lda, + const float *X, f77_int incX, float beta, + float *Y, f77_int incY); +void cblas_sgbmv(enum CBLAS_ORDER order, + enum CBLAS_TRANSPOSE TransA, f77_int M, f77_int N, + f77_int KL, f77_int KU, float alpha, + const float *A, f77_int lda, const float *X, + f77_int incX, float beta, float *Y, f77_int incY); +void cblas_strmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, + f77_int N, const float *A, f77_int lda, + float *X, f77_int incX); +void cblas_stbmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, + f77_int N, f77_int K, const float *A, f77_int lda, + float *X, f77_int incX); +void cblas_stpmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, + f77_int N, const float *Ap, float *X, f77_int incX); +void cblas_strsv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, + f77_int N, const float *A, f77_int lda, float *X, + f77_int incX); +void cblas_stbsv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, + f77_int N, f77_int K, const float *A, f77_int lda, + float *X, f77_int incX); +void cblas_stpsv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, + f77_int N, const float *Ap, float *X, f77_int incX); -void cblas_dgemv(const enum CBLAS_ORDER order, - const enum CBLAS_TRANSPOSE TransA, const int M, const int N, - const double alpha, const double *A, const int lda, - const double *X, const int incX, const double beta, - double *Y, const int incY); -void cblas_dgbmv(const enum CBLAS_ORDER order, - const enum CBLAS_TRANSPOSE TransA, const int M, const int N, - const int KL, const int KU, const double alpha, - const double *A, const int lda, const double *X, - const int incX, const double beta, double *Y, const int incY); -void cblas_dtrmv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const enum CBLAS_TRANSPOSE TransA, const enum CBLAS_DIAG Diag, - const int N, const double *A, const int lda, - double *X, const int incX); -void cblas_dtbmv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const enum CBLAS_TRANSPOSE TransA, const enum CBLAS_DIAG Diag, - const int N, const int K, const double *A, const int lda, - double *X, const int incX); -void cblas_dtpmv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const enum CBLAS_TRANSPOSE TransA, const enum CBLAS_DIAG Diag, - const int N, const double *Ap, double *X, const int incX); -void cblas_dtrsv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const enum CBLAS_TRANSPOSE TransA, const enum CBLAS_DIAG Diag, - const int N, const double *A, const int lda, double *X, - const int incX); -void cblas_dtbsv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const enum CBLAS_TRANSPOSE TransA, const enum CBLAS_DIAG Diag, - const int N, const int K, const double *A, const int lda, - double *X, const int incX); -void cblas_dtpsv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const enum CBLAS_TRANSPOSE TransA, const enum CBLAS_DIAG Diag, - const int N, const double *Ap, double *X, const int incX); +void cblas_dgemv(enum CBLAS_ORDER order, + enum CBLAS_TRANSPOSE TransA, f77_int M, f77_int N, + double alpha, const double *A, f77_int lda, + const double *X, f77_int incX, double beta, + double *Y, f77_int incY); +void cblas_dgbmv(enum CBLAS_ORDER order, + enum CBLAS_TRANSPOSE TransA, f77_int M, f77_int N, + f77_int KL, f77_int KU, double alpha, + const double *A, f77_int lda, const double *X, + f77_int incX, double beta, double *Y, f77_int incY); +void cblas_dtrmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, + f77_int N, const double *A, f77_int lda, + double *X, f77_int incX); +void cblas_dtbmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, + f77_int N, f77_int K, const double *A, f77_int lda, + double *X, f77_int incX); +void cblas_dtpmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, + f77_int N, const double *Ap, double *X, f77_int incX); +void cblas_dtrsv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, + f77_int N, const double *A, f77_int lda, double *X, + f77_int incX); +void cblas_dtbsv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, + f77_int N, f77_int K, const double *A, f77_int lda, + double *X, f77_int incX); +void cblas_dtpsv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, + f77_int N, const double *Ap, double *X, f77_int incX); -void cblas_cgemv(const enum CBLAS_ORDER order, - const enum CBLAS_TRANSPOSE TransA, const int M, const int N, - const void *alpha, const void *A, const int lda, - const void *X, const int incX, const void *beta, - void *Y, const int incY); -void cblas_cgbmv(const enum CBLAS_ORDER order, - const enum CBLAS_TRANSPOSE TransA, const int M, const int N, - const int KL, const int KU, const void *alpha, - const void *A, const int lda, const void *X, - const int incX, const void *beta, void *Y, const int incY); -void cblas_ctrmv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const enum CBLAS_TRANSPOSE TransA, const enum CBLAS_DIAG Diag, - const int N, const void *A, const int lda, - void *X, const int incX); -void cblas_ctbmv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const enum CBLAS_TRANSPOSE TransA, const enum CBLAS_DIAG Diag, - const int N, const int K, const void *A, const int lda, - void *X, const int incX); -void cblas_ctpmv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const enum CBLAS_TRANSPOSE TransA, const enum CBLAS_DIAG Diag, - const int N, const void *Ap, void *X, const int incX); -void cblas_ctrsv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const enum CBLAS_TRANSPOSE TransA, const enum CBLAS_DIAG Diag, - const int N, const void *A, const int lda, void *X, - const int incX); -void cblas_ctbsv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const enum CBLAS_TRANSPOSE TransA, const enum CBLAS_DIAG Diag, - const int N, const int K, const void *A, const int lda, - void *X, const int incX); -void cblas_ctpsv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const enum CBLAS_TRANSPOSE TransA, const enum CBLAS_DIAG Diag, - const int N, const void *Ap, void *X, const int incX); +void cblas_cgemv(enum CBLAS_ORDER order, + enum CBLAS_TRANSPOSE TransA, f77_int M, f77_int N, + const void *alpha, const void *A, f77_int lda, + const void *X, f77_int incX, const void *beta, + void *Y, f77_int incY); +void cblas_cgbmv(enum CBLAS_ORDER order, + enum CBLAS_TRANSPOSE TransA, f77_int M, f77_int N, + f77_int KL, f77_int KU, const void *alpha, + const void *A, f77_int lda, const void *X, + f77_int incX, const void *beta, void *Y, f77_int incY); +void cblas_ctrmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, + f77_int N, const void *A, f77_int lda, + void *X, f77_int incX); +void cblas_ctbmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, + f77_int N, f77_int K, const void *A, f77_int lda, + void *X, f77_int incX); +void cblas_ctpmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, + f77_int N, const void *Ap, void *X, f77_int incX); +void cblas_ctrsv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, + f77_int N, const void *A, f77_int lda, void *X, + f77_int incX); +void cblas_ctbsv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, + f77_int N, f77_int K, const void *A, f77_int lda, + void *X, f77_int incX); +void cblas_ctpsv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, + f77_int N, const void *Ap, void *X, f77_int incX); -void cblas_zgemv(const enum CBLAS_ORDER order, - const enum CBLAS_TRANSPOSE TransA, const int M, const int N, - const void *alpha, const void *A, const int lda, - const void *X, const int incX, const void *beta, - void *Y, const int incY); -void cblas_zgbmv(const enum CBLAS_ORDER order, - const enum CBLAS_TRANSPOSE TransA, const int M, const int N, - const int KL, const int KU, const void *alpha, - const void *A, const int lda, const void *X, - const int incX, const void *beta, void *Y, const int incY); -void cblas_ztrmv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const enum CBLAS_TRANSPOSE TransA, const enum CBLAS_DIAG Diag, - const int N, const void *A, const int lda, - void *X, const int incX); -void cblas_ztbmv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const enum CBLAS_TRANSPOSE TransA, const enum CBLAS_DIAG Diag, - const int N, const int K, const void *A, const int lda, - void *X, const int incX); -void cblas_ztpmv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const enum CBLAS_TRANSPOSE TransA, const enum CBLAS_DIAG Diag, - const int N, const void *Ap, void *X, const int incX); -void cblas_ztrsv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const enum CBLAS_TRANSPOSE TransA, const enum CBLAS_DIAG Diag, - const int N, const void *A, const int lda, void *X, - const int incX); -void cblas_ztbsv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const enum CBLAS_TRANSPOSE TransA, const enum CBLAS_DIAG Diag, - const int N, const int K, const void *A, const int lda, - void *X, const int incX); -void cblas_ztpsv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const enum CBLAS_TRANSPOSE TransA, const enum CBLAS_DIAG Diag, - const int N, const void *Ap, void *X, const int incX); +void cblas_zgemv(enum CBLAS_ORDER order, + enum CBLAS_TRANSPOSE TransA, f77_int M, f77_int N, + const void *alpha, const void *A, f77_int lda, + const void *X, f77_int incX, const void *beta, + void *Y, f77_int incY); +void cblas_zgbmv(enum CBLAS_ORDER order, + enum CBLAS_TRANSPOSE TransA, f77_int M, f77_int N, + f77_int KL, f77_int KU, const void *alpha, + const void *A, f77_int lda, const void *X, + f77_int incX, const void *beta, void *Y, f77_int incY); +void cblas_ztrmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, + f77_int N, const void *A, f77_int lda, + void *X, f77_int incX); +void cblas_ztbmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, + f77_int N, f77_int K, const void *A, f77_int lda, + void *X, f77_int incX); +void cblas_ztpmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, + f77_int N, const void *Ap, void *X, f77_int incX); +void cblas_ztrsv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, + f77_int N, const void *A, f77_int lda, void *X, + f77_int incX); +void cblas_ztbsv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, + f77_int N, f77_int K, const void *A, f77_int lda, + void *X, f77_int incX); +void cblas_ztpsv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, + f77_int N, const void *Ap, void *X, f77_int incX); /* * Routines with S and D prefixes only */ -void cblas_ssymv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const int N, const float alpha, const float *A, - const int lda, const float *X, const int incX, - const float beta, float *Y, const int incY); -void cblas_ssbmv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const int N, const int K, const float alpha, const float *A, - const int lda, const float *X, const int incX, - const float beta, float *Y, const int incY); -void cblas_sspmv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const int N, const float alpha, const float *Ap, - const float *X, const int incX, - const float beta, float *Y, const int incY); -void cblas_sger(const enum CBLAS_ORDER order, const int M, const int N, - const float alpha, const float *X, const int incX, - const float *Y, const int incY, float *A, const int lda); -void cblas_ssyr(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const int N, const float alpha, const float *X, - const int incX, float *A, const int lda); -void cblas_sspr(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const int N, const float alpha, const float *X, - const int incX, float *Ap); -void cblas_ssyr2(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const int N, const float alpha, const float *X, - const int incX, const float *Y, const int incY, float *A, - const int lda); -void cblas_sspr2(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const int N, const float alpha, const float *X, - const int incX, const float *Y, const int incY, float *A); +void cblas_ssymv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + f77_int N, float alpha, const float *A, + f77_int lda, const float *X, f77_int incX, + float beta, float *Y, f77_int incY); +void cblas_ssbmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + f77_int N, f77_int K, float alpha, const float *A, + f77_int lda, const float *X, f77_int incX, + float beta, float *Y, f77_int incY); +void cblas_sspmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + f77_int N, float alpha, const float *Ap, + const float *X, f77_int incX, + float beta, float *Y, f77_int incY); +void cblas_sger(enum CBLAS_ORDER order, f77_int M, f77_int N, + float alpha, const float *X, f77_int incX, + const float *Y, f77_int incY, float *A, f77_int lda); +void cblas_ssyr(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + f77_int N, float alpha, const float *X, + f77_int incX, float *A, f77_int lda); +void cblas_sspr(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + f77_int N, float alpha, const float *X, + f77_int incX, float *Ap); +void cblas_ssyr2(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + f77_int N, float alpha, const float *X, + f77_int incX, const float *Y, f77_int incY, float *A, + f77_int lda); +void cblas_sspr2(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + f77_int N, float alpha, const float *X, + f77_int incX, const float *Y, f77_int incY, float *A); -void cblas_dsymv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const int N, const double alpha, const double *A, - const int lda, const double *X, const int incX, - const double beta, double *Y, const int incY); -void cblas_dsbmv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const int N, const int K, const double alpha, const double *A, - const int lda, const double *X, const int incX, - const double beta, double *Y, const int incY); -void cblas_dspmv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const int N, const double alpha, const double *Ap, - const double *X, const int incX, - const double beta, double *Y, const int incY); -void cblas_dger(const enum CBLAS_ORDER order, const int M, const int N, - const double alpha, const double *X, const int incX, - const double *Y, const int incY, double *A, const int lda); -void cblas_dsyr(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const int N, const double alpha, const double *X, - const int incX, double *A, const int lda); -void cblas_dspr(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const int N, const double alpha, const double *X, - const int incX, double *Ap); -void cblas_dsyr2(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const int N, const double alpha, const double *X, - const int incX, const double *Y, const int incY, double *A, - const int lda); -void cblas_dspr2(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const int N, const double alpha, const double *X, - const int incX, const double *Y, const int incY, double *A); +void cblas_dsymv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + f77_int N, double alpha, const double *A, + f77_int lda, const double *X, f77_int incX, + double beta, double *Y, f77_int incY); +void cblas_dsbmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + f77_int N, f77_int K, double alpha, const double *A, + f77_int lda, const double *X, f77_int incX, + double beta, double *Y, f77_int incY); +void cblas_dspmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + f77_int N, double alpha, const double *Ap, + const double *X, f77_int incX, + double beta, double *Y, f77_int incY); +void cblas_dger(enum CBLAS_ORDER order, f77_int M, f77_int N, + double alpha, const double *X, f77_int incX, + const double *Y, f77_int incY, double *A, f77_int lda); +void cblas_dsyr(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + f77_int N, double alpha, const double *X, + f77_int incX, double *A, f77_int lda); +void cblas_dspr(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + f77_int N, double alpha, const double *X, + f77_int incX, double *Ap); +void cblas_dsyr2(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + f77_int N, double alpha, const double *X, + f77_int incX, const double *Y, f77_int incY, double *A, + f77_int lda); +void cblas_dspr2(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + f77_int N, double alpha, const double *X, + f77_int incX, const double *Y, f77_int incY, double *A); /* * Routines with C and Z prefixes only */ -void cblas_chemv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const int N, const void *alpha, const void *A, - const int lda, const void *X, const int incX, - const void *beta, void *Y, const int incY); -void cblas_chbmv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const int N, const int K, const void *alpha, const void *A, - const int lda, const void *X, const int incX, - const void *beta, void *Y, const int incY); -void cblas_chpmv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const int N, const void *alpha, const void *Ap, - const void *X, const int incX, - const void *beta, void *Y, const int incY); -void cblas_cgeru(const enum CBLAS_ORDER order, const int M, const int N, - const void *alpha, const void *X, const int incX, - const void *Y, const int incY, void *A, const int lda); -void cblas_cgerc(const enum CBLAS_ORDER order, const int M, const int N, - const void *alpha, const void *X, const int incX, - const void *Y, const int incY, void *A, const int lda); -void cblas_cher(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const int N, const float alpha, const void *X, const int incX, - void *A, const int lda); -void cblas_chpr(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const int N, const float alpha, const void *X, - const int incX, void *A); -void cblas_cher2(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, const int N, - const void *alpha, const void *X, const int incX, - const void *Y, const int incY, void *A, const int lda); -void cblas_chpr2(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, const int N, - const void *alpha, const void *X, const int incX, - const void *Y, const int incY, void *Ap); +void cblas_chemv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + f77_int N, const void *alpha, const void *A, + f77_int lda, const void *X, f77_int incX, + const void *beta, void *Y, f77_int incY); +void cblas_chbmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + f77_int N, f77_int K, const void *alpha, const void *A, + f77_int lda, const void *X, f77_int incX, + const void *beta, void *Y, f77_int incY); +void cblas_chpmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + f77_int N, const void *alpha, const void *Ap, + const void *X, f77_int incX, + const void *beta, void *Y, f77_int incY); +void cblas_cgeru(enum CBLAS_ORDER order, f77_int M, f77_int N, + const void *alpha, const void *X, f77_int incX, + const void *Y, f77_int incY, void *A, f77_int lda); +void cblas_cgerc(enum CBLAS_ORDER order, f77_int M, f77_int N, + const void *alpha, const void *X, f77_int incX, + const void *Y, f77_int incY, void *A, f77_int lda); +void cblas_cher(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + f77_int N, float alpha, const void *X, f77_int incX, + void *A, f77_int lda); +void cblas_chpr(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + f77_int N, float alpha, const void *X, + f77_int incX, void *A); +void cblas_cher2(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, f77_int N, + const void *alpha, const void *X, f77_int incX, + const void *Y, f77_int incY, void *A, f77_int lda); +void cblas_chpr2(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, f77_int N, + const void *alpha, const void *X, f77_int incX, + const void *Y, f77_int incY, void *Ap); -void cblas_zhemv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const int N, const void *alpha, const void *A, - const int lda, const void *X, const int incX, - const void *beta, void *Y, const int incY); -void cblas_zhbmv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const int N, const int K, const void *alpha, const void *A, - const int lda, const void *X, const int incX, - const void *beta, void *Y, const int incY); -void cblas_zhpmv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const int N, const void *alpha, const void *Ap, - const void *X, const int incX, - const void *beta, void *Y, const int incY); -void cblas_zgeru(const enum CBLAS_ORDER order, const int M, const int N, - const void *alpha, const void *X, const int incX, - const void *Y, const int incY, void *A, const int lda); -void cblas_zgerc(const enum CBLAS_ORDER order, const int M, const int N, - const void *alpha, const void *X, const int incX, - const void *Y, const int incY, void *A, const int lda); -void cblas_zher(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const int N, const double alpha, const void *X, const int incX, - void *A, const int lda); -void cblas_zhpr(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const int N, const double alpha, const void *X, - const int incX, void *A); -void cblas_zher2(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, const int N, - const void *alpha, const void *X, const int incX, - const void *Y, const int incY, void *A, const int lda); -void cblas_zhpr2(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, const int N, - const void *alpha, const void *X, const int incX, - const void *Y, const int incY, void *Ap); +void cblas_zhemv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + f77_int N, const void *alpha, const void *A, + f77_int lda, const void *X, f77_int incX, + const void *beta, void *Y, f77_int incY); +void cblas_zhbmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + f77_int N, f77_int K, const void *alpha, const void *A, + f77_int lda, const void *X, f77_int incX, + const void *beta, void *Y, f77_int incY); +void cblas_zhpmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + f77_int N, const void *alpha, const void *Ap, + const void *X, f77_int incX, + const void *beta, void *Y, f77_int incY); +void cblas_zgeru(enum CBLAS_ORDER order, f77_int M, f77_int N, + const void *alpha, const void *X, f77_int incX, + const void *Y, f77_int incY, void *A, f77_int lda); +void cblas_zgerc(enum CBLAS_ORDER order, f77_int M, f77_int N, + const void *alpha, const void *X, f77_int incX, + const void *Y, f77_int incY, void *A, f77_int lda); +void cblas_zher(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + f77_int N, double alpha, const void *X, f77_int incX, + void *A, f77_int lda); +void cblas_zhpr(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + f77_int N, double alpha, const void *X, + f77_int incX, void *A); +void cblas_zher2(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, f77_int N, + const void *alpha, const void *X, f77_int incX, + const void *Y, f77_int incY, void *A, f77_int lda); +void cblas_zhpr2(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, f77_int N, + const void *alpha, const void *X, f77_int incX, + const void *Y, f77_int incY, void *Ap); /* * =========================================================================== @@ -413,161 +411,161 @@ void cblas_zhpr2(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, const /* * Routines with standard 4 prefixes (S, D, C, Z) */ -void cblas_sgemm(const enum CBLAS_ORDER Order, const enum CBLAS_TRANSPOSE TransA, - const enum CBLAS_TRANSPOSE TransB, const int M, const int N, - const int K, const float alpha, const float *A, - const int lda, const float *B, const int ldb, - const float beta, float *C, const int ldc); -void cblas_ssymm(const enum CBLAS_ORDER Order, const enum CBLAS_SIDE Side, - const enum CBLAS_UPLO Uplo, const int M, const int N, - const float alpha, const float *A, const int lda, - const float *B, const int ldb, const float beta, - float *C, const int ldc); -void cblas_ssyrk(const enum CBLAS_ORDER Order, const enum CBLAS_UPLO Uplo, - const enum CBLAS_TRANSPOSE Trans, const int N, const int K, - const float alpha, const float *A, const int lda, - const float beta, float *C, const int ldc); -void cblas_ssyr2k(const enum CBLAS_ORDER Order, const enum CBLAS_UPLO Uplo, - const enum CBLAS_TRANSPOSE Trans, const int N, const int K, - const float alpha, const float *A, const int lda, - const float *B, const int ldb, const float beta, - float *C, const int ldc); -void cblas_strmm(const enum CBLAS_ORDER Order, const enum CBLAS_SIDE Side, - const enum CBLAS_UPLO Uplo, const enum CBLAS_TRANSPOSE TransA, - const enum CBLAS_DIAG Diag, const int M, const int N, - const float alpha, const float *A, const int lda, - float *B, const int ldb); -void cblas_strsm(const enum CBLAS_ORDER Order, const enum CBLAS_SIDE Side, - const enum CBLAS_UPLO Uplo, const enum CBLAS_TRANSPOSE TransA, - const enum CBLAS_DIAG Diag, const int M, const int N, - const float alpha, const float *A, const int lda, - float *B, const int ldb); +void cblas_sgemm(enum CBLAS_ORDER Order, enum CBLAS_TRANSPOSE TransA, + enum CBLAS_TRANSPOSE TransB, f77_int M, f77_int N, + f77_int K, float alpha, const float *A, + f77_int lda, const float *B, f77_int ldb, + float beta, float *C, f77_int ldc); +void cblas_ssymm(enum CBLAS_ORDER Order, enum CBLAS_SIDE Side, + enum CBLAS_UPLO Uplo, f77_int M, f77_int N, + float alpha, const float *A, f77_int lda, + const float *B, f77_int ldb, float beta, + float *C, f77_int ldc); +void cblas_ssyrk(enum CBLAS_ORDER Order, enum CBLAS_UPLO Uplo, + enum CBLAS_TRANSPOSE Trans, f77_int N, f77_int K, + float alpha, const float *A, f77_int lda, + float beta, float *C, f77_int ldc); +void cblas_ssyr2k(enum CBLAS_ORDER Order, enum CBLAS_UPLO Uplo, + enum CBLAS_TRANSPOSE Trans, f77_int N, f77_int K, + float alpha, const float *A, f77_int lda, + const float *B, f77_int ldb, float beta, + float *C, f77_int ldc); +void cblas_strmm(enum CBLAS_ORDER Order, enum CBLAS_SIDE Side, + enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE TransA, + enum CBLAS_DIAG Diag, f77_int M, f77_int N, + float alpha, const float *A, f77_int lda, + float *B, f77_int ldb); +void cblas_strsm(enum CBLAS_ORDER Order, enum CBLAS_SIDE Side, + enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE TransA, + enum CBLAS_DIAG Diag, f77_int M, f77_int N, + float alpha, const float *A, f77_int lda, + float *B, f77_int ldb); -void cblas_dgemm(const enum CBLAS_ORDER Order, const enum CBLAS_TRANSPOSE TransA, - const enum CBLAS_TRANSPOSE TransB, const int M, const int N, - const int K, const double alpha, const double *A, - const int lda, const double *B, const int ldb, - const double beta, double *C, const int ldc); -void cblas_dsymm(const enum CBLAS_ORDER Order, const enum CBLAS_SIDE Side, - const enum CBLAS_UPLO Uplo, const int M, const int N, - const double alpha, const double *A, const int lda, - const double *B, const int ldb, const double beta, - double *C, const int ldc); -void cblas_dsyrk(const enum CBLAS_ORDER Order, const enum CBLAS_UPLO Uplo, - const enum CBLAS_TRANSPOSE Trans, const int N, const int K, - const double alpha, const double *A, const int lda, - const double beta, double *C, const int ldc); -void cblas_dsyr2k(const enum CBLAS_ORDER Order, const enum CBLAS_UPLO Uplo, - const enum CBLAS_TRANSPOSE Trans, const int N, const int K, - const double alpha, const double *A, const int lda, - const double *B, const int ldb, const double beta, - double *C, const int ldc); -void cblas_dtrmm(const enum CBLAS_ORDER Order, const enum CBLAS_SIDE Side, - const enum CBLAS_UPLO Uplo, const enum CBLAS_TRANSPOSE TransA, - const enum CBLAS_DIAG Diag, const int M, const int N, - const double alpha, const double *A, const int lda, - double *B, const int ldb); -void cblas_dtrsm(const enum CBLAS_ORDER Order, const enum CBLAS_SIDE Side, - const enum CBLAS_UPLO Uplo, const enum CBLAS_TRANSPOSE TransA, - const enum CBLAS_DIAG Diag, const int M, const int N, - const double alpha, const double *A, const int lda, - double *B, const int ldb); +void cblas_dgemm(enum CBLAS_ORDER Order, enum CBLAS_TRANSPOSE TransA, + enum CBLAS_TRANSPOSE TransB, f77_int M, f77_int N, + f77_int K, double alpha, const double *A, + f77_int lda, const double *B, f77_int ldb, + double beta, double *C, f77_int ldc); +void cblas_dsymm(enum CBLAS_ORDER Order, enum CBLAS_SIDE Side, + enum CBLAS_UPLO Uplo, f77_int M, f77_int N, + double alpha, const double *A, f77_int lda, + const double *B, f77_int ldb, double beta, + double *C, f77_int ldc); +void cblas_dsyrk(enum CBLAS_ORDER Order, enum CBLAS_UPLO Uplo, + enum CBLAS_TRANSPOSE Trans, f77_int N, f77_int K, + double alpha, const double *A, f77_int lda, + double beta, double *C, f77_int ldc); +void cblas_dsyr2k(enum CBLAS_ORDER Order, enum CBLAS_UPLO Uplo, + enum CBLAS_TRANSPOSE Trans, f77_int N, f77_int K, + double alpha, const double *A, f77_int lda, + const double *B, f77_int ldb, double beta, + double *C, f77_int ldc); +void cblas_dtrmm(enum CBLAS_ORDER Order, enum CBLAS_SIDE Side, + enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE TransA, + enum CBLAS_DIAG Diag, f77_int M, f77_int N, + double alpha, const double *A, f77_int lda, + double *B, f77_int ldb); +void cblas_dtrsm(enum CBLAS_ORDER Order, enum CBLAS_SIDE Side, + enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE TransA, + enum CBLAS_DIAG Diag, f77_int M, f77_int N, + double alpha, const double *A, f77_int lda, + double *B, f77_int ldb); -void cblas_cgemm(const enum CBLAS_ORDER Order, const enum CBLAS_TRANSPOSE TransA, - const enum CBLAS_TRANSPOSE TransB, const int M, const int N, - const int K, const void *alpha, const void *A, - const int lda, const void *B, const int ldb, - const void *beta, void *C, const int ldc); -void cblas_csymm(const enum CBLAS_ORDER Order, const enum CBLAS_SIDE Side, - const enum CBLAS_UPLO Uplo, const int M, const int N, - const void *alpha, const void *A, const int lda, - const void *B, const int ldb, const void *beta, - void *C, const int ldc); -void cblas_csyrk(const enum CBLAS_ORDER Order, const enum CBLAS_UPLO Uplo, - const enum CBLAS_TRANSPOSE Trans, const int N, const int K, - const void *alpha, const void *A, const int lda, - const void *beta, void *C, const int ldc); -void cblas_csyr2k(const enum CBLAS_ORDER Order, const enum CBLAS_UPLO Uplo, - const enum CBLAS_TRANSPOSE Trans, const int N, const int K, - const void *alpha, const void *A, const int lda, - const void *B, const int ldb, const void *beta, - void *C, const int ldc); -void cblas_ctrmm(const enum CBLAS_ORDER Order, const enum CBLAS_SIDE Side, - const enum CBLAS_UPLO Uplo, const enum CBLAS_TRANSPOSE TransA, - const enum CBLAS_DIAG Diag, const int M, const int N, - const void *alpha, const void *A, const int lda, - void *B, const int ldb); -void cblas_ctrsm(const enum CBLAS_ORDER Order, const enum CBLAS_SIDE Side, - const enum CBLAS_UPLO Uplo, const enum CBLAS_TRANSPOSE TransA, - const enum CBLAS_DIAG Diag, const int M, const int N, - const void *alpha, const void *A, const int lda, - void *B, const int ldb); +void cblas_cgemm(enum CBLAS_ORDER Order, enum CBLAS_TRANSPOSE TransA, + enum CBLAS_TRANSPOSE TransB, f77_int M, f77_int N, + f77_int K, const void *alpha, const void *A, + f77_int lda, const void *B, f77_int ldb, + const void *beta, void *C, f77_int ldc); +void cblas_csymm(enum CBLAS_ORDER Order, enum CBLAS_SIDE Side, + enum CBLAS_UPLO Uplo, f77_int M, f77_int N, + const void *alpha, const void *A, f77_int lda, + const void *B, f77_int ldb, const void *beta, + void *C, f77_int ldc); +void cblas_csyrk(enum CBLAS_ORDER Order, enum CBLAS_UPLO Uplo, + enum CBLAS_TRANSPOSE Trans, f77_int N, f77_int K, + const void *alpha, const void *A, f77_int lda, + const void *beta, void *C, f77_int ldc); +void cblas_csyr2k(enum CBLAS_ORDER Order, enum CBLAS_UPLO Uplo, + enum CBLAS_TRANSPOSE Trans, f77_int N, f77_int K, + const void *alpha, const void *A, f77_int lda, + const void *B, f77_int ldb, const void *beta, + void *C, f77_int ldc); +void cblas_ctrmm(enum CBLAS_ORDER Order, enum CBLAS_SIDE Side, + enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE TransA, + enum CBLAS_DIAG Diag, f77_int M, f77_int N, + const void *alpha, const void *A, f77_int lda, + void *B, f77_int ldb); +void cblas_ctrsm(enum CBLAS_ORDER Order, enum CBLAS_SIDE Side, + enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE TransA, + enum CBLAS_DIAG Diag, f77_int M, f77_int N, + const void *alpha, const void *A, f77_int lda, + void *B, f77_int ldb); -void cblas_zgemm(const enum CBLAS_ORDER Order, const enum CBLAS_TRANSPOSE TransA, - const enum CBLAS_TRANSPOSE TransB, const int M, const int N, - const int K, const void *alpha, const void *A, - const int lda, const void *B, const int ldb, - const void *beta, void *C, const int ldc); -void cblas_zsymm(const enum CBLAS_ORDER Order, const enum CBLAS_SIDE Side, - const enum CBLAS_UPLO Uplo, const int M, const int N, - const void *alpha, const void *A, const int lda, - const void *B, const int ldb, const void *beta, - void *C, const int ldc); -void cblas_zsyrk(const enum CBLAS_ORDER Order, const enum CBLAS_UPLO Uplo, - const enum CBLAS_TRANSPOSE Trans, const int N, const int K, - const void *alpha, const void *A, const int lda, - const void *beta, void *C, const int ldc); -void cblas_zsyr2k(const enum CBLAS_ORDER Order, const enum CBLAS_UPLO Uplo, - const enum CBLAS_TRANSPOSE Trans, const int N, const int K, - const void *alpha, const void *A, const int lda, - const void *B, const int ldb, const void *beta, - void *C, const int ldc); -void cblas_ztrmm(const enum CBLAS_ORDER Order, const enum CBLAS_SIDE Side, - const enum CBLAS_UPLO Uplo, const enum CBLAS_TRANSPOSE TransA, - const enum CBLAS_DIAG Diag, const int M, const int N, - const void *alpha, const void *A, const int lda, - void *B, const int ldb); -void cblas_ztrsm(const enum CBLAS_ORDER Order, const enum CBLAS_SIDE Side, - const enum CBLAS_UPLO Uplo, const enum CBLAS_TRANSPOSE TransA, - const enum CBLAS_DIAG Diag, const int M, const int N, - const void *alpha, const void *A, const int lda, - void *B, const int ldb); +void cblas_zgemm(enum CBLAS_ORDER Order, enum CBLAS_TRANSPOSE TransA, + enum CBLAS_TRANSPOSE TransB, f77_int M, f77_int N, + f77_int K, const void *alpha, const void *A, + f77_int lda, const void *B, f77_int ldb, + const void *beta, void *C, f77_int ldc); +void cblas_zsymm(enum CBLAS_ORDER Order, enum CBLAS_SIDE Side, + enum CBLAS_UPLO Uplo, f77_int M, f77_int N, + const void *alpha, const void *A, f77_int lda, + const void *B, f77_int ldb, const void *beta, + void *C, f77_int ldc); +void cblas_zsyrk(enum CBLAS_ORDER Order, enum CBLAS_UPLO Uplo, + enum CBLAS_TRANSPOSE Trans, f77_int N, f77_int K, + const void *alpha, const void *A, f77_int lda, + const void *beta, void *C, f77_int ldc); +void cblas_zsyr2k(enum CBLAS_ORDER Order, enum CBLAS_UPLO Uplo, + enum CBLAS_TRANSPOSE Trans, f77_int N, f77_int K, + const void *alpha, const void *A, f77_int lda, + const void *B, f77_int ldb, const void *beta, + void *C, f77_int ldc); +void cblas_ztrmm(enum CBLAS_ORDER Order, enum CBLAS_SIDE Side, + enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE TransA, + enum CBLAS_DIAG Diag, f77_int M, f77_int N, + const void *alpha, const void *A, f77_int lda, + void *B, f77_int ldb); +void cblas_ztrsm(enum CBLAS_ORDER Order, enum CBLAS_SIDE Side, + enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE TransA, + enum CBLAS_DIAG Diag, f77_int M, f77_int N, + const void *alpha, const void *A, f77_int lda, + void *B, f77_int ldb); /* * Routines with prefixes C and Z only */ -void cblas_chemm(const enum CBLAS_ORDER Order, const enum CBLAS_SIDE Side, - const enum CBLAS_UPLO Uplo, const int M, const int N, - const void *alpha, const void *A, const int lda, - const void *B, const int ldb, const void *beta, - void *C, const int ldc); -void cblas_cherk(const enum CBLAS_ORDER Order, const enum CBLAS_UPLO Uplo, - const enum CBLAS_TRANSPOSE Trans, const int N, const int K, - const float alpha, const void *A, const int lda, - const float beta, void *C, const int ldc); -void cblas_cher2k(const enum CBLAS_ORDER Order, const enum CBLAS_UPLO Uplo, - const enum CBLAS_TRANSPOSE Trans, const int N, const int K, - const void *alpha, const void *A, const int lda, - const void *B, const int ldb, const float beta, - void *C, const int ldc); +void cblas_chemm(enum CBLAS_ORDER Order, enum CBLAS_SIDE Side, + enum CBLAS_UPLO Uplo, f77_int M, f77_int N, + const void *alpha, const void *A, f77_int lda, + const void *B, f77_int ldb, const void *beta, + void *C, f77_int ldc); +void cblas_cherk(enum CBLAS_ORDER Order, enum CBLAS_UPLO Uplo, + enum CBLAS_TRANSPOSE Trans, f77_int N, f77_int K, + float alpha, const void *A, f77_int lda, + float beta, void *C, f77_int ldc); +void cblas_cher2k(enum CBLAS_ORDER Order, enum CBLAS_UPLO Uplo, + enum CBLAS_TRANSPOSE Trans, f77_int N, f77_int K, + const void *alpha, const void *A, f77_int lda, + const void *B, f77_int ldb, float beta, + void *C, f77_int ldc); -void cblas_zhemm(const enum CBLAS_ORDER Order, const enum CBLAS_SIDE Side, - const enum CBLAS_UPLO Uplo, const int M, const int N, - const void *alpha, const void *A, const int lda, - const void *B, const int ldb, const void *beta, - void *C, const int ldc); -void cblas_zherk(const enum CBLAS_ORDER Order, const enum CBLAS_UPLO Uplo, - const enum CBLAS_TRANSPOSE Trans, const int N, const int K, - const double alpha, const void *A, const int lda, - const double beta, void *C, const int ldc); -void cblas_zher2k(const enum CBLAS_ORDER Order, const enum CBLAS_UPLO Uplo, - const enum CBLAS_TRANSPOSE Trans, const int N, const int K, - const void *alpha, const void *A, const int lda, - const void *B, const int ldb, const double beta, - void *C, const int ldc); +void cblas_zhemm(enum CBLAS_ORDER Order, enum CBLAS_SIDE Side, + enum CBLAS_UPLO Uplo, f77_int M, f77_int N, + const void *alpha, const void *A, f77_int lda, + const void *B, f77_int ldb, const void *beta, + void *C, f77_int ldc); +void cblas_zherk(enum CBLAS_ORDER Order, enum CBLAS_UPLO Uplo, + enum CBLAS_TRANSPOSE Trans, f77_int N, f77_int K, + double alpha, const void *A, f77_int lda, + double beta, void *C, f77_int ldc); +void cblas_zher2k(enum CBLAS_ORDER Order, enum CBLAS_UPLO Uplo, + enum CBLAS_TRANSPOSE Trans, f77_int N, f77_int K, + const void *alpha, const void *A, f77_int lda, + const void *B, f77_int ldb, double beta, + void *C, f77_int ldc); -void cblas_xerbla(int p, const char *rout, const char *form, ...); +void cblas_xerbla(f77_int p, const char *rout, const char *form, ...); #ifdef __cplusplus } diff --git a/frame/compat/cblas/src/cblas_caxpy.c b/frame/compat/cblas/src/cblas_caxpy.c index 69c8c2ac4..748d146c6 100644 --- a/frame/compat/cblas/src/cblas_caxpy.c +++ b/frame/compat/cblas/src/cblas_caxpy.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_caxpy.c @@ -14,8 +10,8 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_caxpy( const int N, const void *alpha, const void *X, - const int incX, void *Y, const int incY) +void cblas_caxpy( f77_int N, const void *alpha, const void *X, + f77_int incX, void *Y, f77_int incY) { #ifdef F77_INT F77_INT F77_N=N, F77_incX=incX, F77_incY=incY; @@ -24,6 +20,6 @@ void cblas_caxpy( const int N, const void *alpha, const void *X, #define F77_incX incX #define F77_incY incY #endif - F77_caxpy( &F77_N, alpha, X, &F77_incX, Y, &F77_incY); + F77_caxpy( &F77_N, (scomplex*)alpha, (scomplex*)X, &F77_incX, (scomplex*)Y, &F77_incY); } #endif diff --git a/frame/compat/cblas/src/cblas_ccopy.c b/frame/compat/cblas/src/cblas_ccopy.c index fbd7b7172..8871680b1 100644 --- a/frame/compat/cblas/src/cblas_ccopy.c +++ b/frame/compat/cblas/src/cblas_ccopy.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_ccopy.c @@ -14,8 +10,8 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_ccopy( const int N, const void *X, - const int incX, void *Y, const int incY) +void cblas_ccopy( f77_int N, const void *X, + f77_int incX, void *Y, f77_int incY) { #ifdef F77_INT F77_INT F77_N=N, F77_incX=incX, F77_incY=incY; @@ -24,6 +20,6 @@ void cblas_ccopy( const int N, const void *X, #define F77_incX incX #define F77_incY incY #endif - F77_ccopy( &F77_N, X, &F77_incX, Y, &F77_incY); + F77_ccopy( &F77_N, (scomplex*)X, &F77_incX, (scomplex*)Y, &F77_incY); } #endif diff --git a/frame/compat/cblas/src/cblas_cdotc_sub.c b/frame/compat/cblas/src/cblas_cdotc_sub.c index 734db9748..d0800ca4f 100644 --- a/frame/compat/cblas/src/cblas_cdotc_sub.c +++ b/frame/compat/cblas/src/cblas_cdotc_sub.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_cdotc_sub.c @@ -15,8 +11,8 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_cdotc_sub( const int N, const void *X, const int incX, - const void *Y, const int incY,void *dotc) +void cblas_cdotc_sub( f77_int N, const void *X, f77_int incX, + const void *Y, f77_int incY,void *dotc) { #ifdef F77_INT F77_INT F77_N=N, F77_incX=incX, F77_incY=incY; @@ -25,6 +21,6 @@ void cblas_cdotc_sub( const int N, const void *X, const int incX, #define F77_incX incX #define F77_incY incY #endif - F77_cdotc_sub( &F77_N, X, &F77_incX, Y, &F77_incY, dotc); + F77_cdotc_sub( &F77_N, (scomplex*)X, &F77_incX, (scomplex*)Y, &F77_incY, (scomplex*)dotc); } #endif diff --git a/frame/compat/cblas/src/cblas_cdotu_sub.c b/frame/compat/cblas/src/cblas_cdotu_sub.c index 7e0890b57..fd14f5bb4 100644 --- a/frame/compat/cblas/src/cblas_cdotu_sub.c +++ b/frame/compat/cblas/src/cblas_cdotu_sub.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_cdotu_sub.f @@ -15,8 +11,8 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_cdotu_sub( const int N, const void *X, - const int incX, const void *Y, const int incY,void *dotu) +void cblas_cdotu_sub( f77_int N, const void *X, + f77_int incX, const void *Y, f77_int incY,void *dotu) { #ifdef F77_INT F77_INT F77_N=N, F77_incX=incX, F77_incY=incY; @@ -25,6 +21,6 @@ void cblas_cdotu_sub( const int N, const void *X, #define F77_incX incX #define F77_incY incY #endif - F77_cdotu_sub( &F77_N, X, &F77_incX, Y, &F77_incY, dotu); + F77_cdotu_sub( &F77_N, (scomplex*)X, &F77_incX, (scomplex*)Y, &F77_incY, (scomplex*)dotu); } #endif diff --git a/frame/compat/cblas/src/cblas_cgbmv.c b/frame/compat/cblas/src/cblas_cgbmv.c index ad04e5101..74872186e 100644 --- a/frame/compat/cblas/src/cblas_cgbmv.c +++ b/frame/compat/cblas/src/cblas_cgbmv.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_cgbmv.c @@ -15,12 +11,12 @@ #include #include "cblas.h" #include "cblas_f77.h" -void cblas_cgbmv(const enum CBLAS_ORDER order, - const enum CBLAS_TRANSPOSE TransA, const int M, const int N, - const int KL, const int KU, - const void *alpha, const void *A, const int lda, - const void *X, const int incX, const void *beta, - void *Y, const int incY) +void cblas_cgbmv(enum CBLAS_ORDER order, + enum CBLAS_TRANSPOSE TransA, f77_int M, f77_int N, + f77_int KL, f77_int KU, + const void *alpha, const void *A, f77_int lda, + const void *X, f77_int incX, const void *beta, + void *Y, f77_int incY) { char TA; #ifdef F77_CHAR @@ -37,7 +33,7 @@ void cblas_cgbmv(const enum CBLAS_ORDER order, #define F77_lda lda #define F77_KL KL #define F77_KU KU - #define F77_incX incx + #define F77_incX incX #define F77_incY incY #endif int n=0, i=0; @@ -65,8 +61,8 @@ void cblas_cgbmv(const enum CBLAS_ORDER order, #ifdef F77_CHAR F77_TA = C2F_CHAR(&TA); #endif - F77_cgbmv(F77_TA, &F77_M, &F77_N, &F77_KL, &F77_KU, alpha, - A, &F77_lda, X, &F77_incX, beta, Y, &F77_incY); + F77_cgbmv(F77_TA, &F77_M, &F77_N, &F77_KL, &F77_KU, (scomplex*)alpha, + (scomplex*)A, &F77_lda, (scomplex*)X, &F77_incX, (scomplex*)beta, (scomplex*)Y, &F77_incY); } else if (order == CblasRowMajor) { @@ -109,7 +105,7 @@ void cblas_cgbmv(const enum CBLAS_ORDER order, #ifdef F77_INT F77_incX = 1; #else - incx = 1; + incX = 1; #endif if( incY > 0 ) @@ -146,11 +142,11 @@ void cblas_cgbmv(const enum CBLAS_ORDER order, F77_TA = C2F_CHAR(&TA); #endif if (TransA == CblasConjTrans) - F77_cgbmv(F77_TA, &F77_N, &F77_M, &F77_KU, &F77_KL, ALPHA, - A ,&F77_lda, x,&F77_incX, BETA, Y, &F77_incY); + F77_cgbmv(F77_TA, &F77_N, &F77_M, &F77_KU, &F77_KL, (scomplex*)ALPHA, + (scomplex*)A ,&F77_lda, (scomplex*)x,&F77_incX, (scomplex*)BETA, (scomplex*)Y, &F77_incY); else - F77_cgbmv(F77_TA, &F77_N, &F77_M, &F77_KU, &F77_KL, alpha, - A ,&F77_lda, x,&F77_incX, beta, Y, &F77_incY); + F77_cgbmv(F77_TA, &F77_N, &F77_M, &F77_KU, &F77_KL, (scomplex*)alpha, + (scomplex*)A ,&F77_lda, (scomplex*)x,&F77_incX, (scomplex*)beta, (scomplex*)Y, &F77_incY); if (TransA == CblasConjTrans) { if (x != X) free(x); diff --git a/frame/compat/cblas/src/cblas_cgemm.c b/frame/compat/cblas/src/cblas_cgemm.c index 4b1e5175c..5680a19f6 100644 --- a/frame/compat/cblas/src/cblas_cgemm.c +++ b/frame/compat/cblas/src/cblas_cgemm.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * @@ -15,11 +11,11 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_cgemm(const enum CBLAS_ORDER Order, const enum CBLAS_TRANSPOSE TransA, - const enum CBLAS_TRANSPOSE TransB, const int M, const int N, - const int K, const void *alpha, const void *A, - const int lda, const void *B, const int ldb, - const void *beta, void *C, const int ldc) +void cblas_cgemm(enum CBLAS_ORDER Order, enum CBLAS_TRANSPOSE TransA, + enum CBLAS_TRANSPOSE TransB, f77_int M, f77_int N, + f77_int K, const void *alpha, const void *A, + f77_int lda, const void *B, f77_int ldb, + const void *beta, void *C, f77_int ldc) { char TA, TB; #ifdef F77_CHAR @@ -75,8 +71,8 @@ void cblas_cgemm(const enum CBLAS_ORDER Order, const enum CBLAS_TRANSPOSE TransA F77_TB = C2F_CHAR(&TB); #endif - F77_cgemm(F77_TA, F77_TB, &F77_M, &F77_N, &F77_K, alpha, A, - &F77_lda, B, &F77_ldb, beta, C, &F77_ldc); + F77_cgemm(F77_TA, F77_TB, &F77_M, &F77_N, &F77_K, (scomplex*)alpha, (scomplex*)A, + &F77_lda, (scomplex*)B, &F77_ldb, (scomplex*)beta, (scomplex*)C, &F77_ldc); } else if (Order == CblasRowMajor) { RowMajorStrg = 1; @@ -105,8 +101,8 @@ void cblas_cgemm(const enum CBLAS_ORDER Order, const enum CBLAS_TRANSPOSE TransA F77_TB = C2F_CHAR(&TB); #endif - F77_cgemm(F77_TA, F77_TB, &F77_N, &F77_M, &F77_K, alpha, B, - &F77_ldb, A, &F77_lda, beta, C, &F77_ldc); + F77_cgemm(F77_TA, F77_TB, &F77_N, &F77_M, &F77_K, (scomplex*)alpha, (scomplex*)B, + &F77_ldb, (scomplex*)A, &F77_lda, (scomplex*)beta, (scomplex*)C, &F77_ldc); } else cblas_xerbla(1, "cblas_cgemm", "Illegal Order setting, %d\n", Order); CBLAS_CallFromC = 0; diff --git a/frame/compat/cblas/src/cblas_cgemv.c b/frame/compat/cblas/src/cblas_cgemv.c index 10e1ac0ef..e5d226262 100644 --- a/frame/compat/cblas/src/cblas_cgemv.c +++ b/frame/compat/cblas/src/cblas_cgemv.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_cgemv.c @@ -15,11 +11,11 @@ #include #include "cblas.h" #include "cblas_f77.h" -void cblas_cgemv(const enum CBLAS_ORDER order, - const enum CBLAS_TRANSPOSE TransA, const int M, const int N, - const void *alpha, const void *A, const int lda, - const void *X, const int incX, const void *beta, - void *Y, const int incY) +void cblas_cgemv(enum CBLAS_ORDER order, + enum CBLAS_TRANSPOSE TransA, f77_int M, f77_int N, + const void *alpha, const void *A, f77_int lda, + const void *X, f77_int incX, const void *beta, + void *Y, f77_int incY) { char TA; #ifdef F77_CHAR @@ -33,7 +29,7 @@ void cblas_cgemv(const enum CBLAS_ORDER order, #define F77_M M #define F77_N N #define F77_lda lda - #define F77_incX incx + #define F77_incX incX #define F77_incY incY #endif @@ -64,8 +60,8 @@ void cblas_cgemv(const enum CBLAS_ORDER order, #ifdef F77_CHAR F77_TA = C2F_CHAR(&TA); #endif - F77_cgemv(F77_TA, &F77_M, &F77_N, alpha, A, &F77_lda, X, &F77_incX, - beta, Y, &F77_incY); + F77_cgemv(F77_TA, &F77_M, &F77_N, (scomplex*)alpha, (scomplex*)A, &F77_lda, (scomplex*)X, &F77_incX, + (scomplex*)beta, (scomplex*)Y, &F77_incY); } else if (order == CblasRowMajor) { @@ -141,11 +137,11 @@ void cblas_cgemv(const enum CBLAS_ORDER order, F77_TA = C2F_CHAR(&TA); #endif if (TransA == CblasConjTrans) - F77_cgemv(F77_TA, &F77_N, &F77_M, ALPHA, A, &F77_lda, stx, - &F77_incX, BETA, Y, &F77_incY); + F77_cgemv(F77_TA, &F77_N, &F77_M, (scomplex*)ALPHA, (scomplex*)A, &F77_lda, (scomplex*)stx, + &F77_incX, (scomplex*)BETA, (scomplex*)Y, &F77_incY); else - F77_cgemv(F77_TA, &F77_N, &F77_M, alpha, A, &F77_lda, x, - &F77_incX, beta, Y, &F77_incY); + F77_cgemv(F77_TA, &F77_N, &F77_M, (scomplex*)alpha, (scomplex*)A, &F77_lda, (scomplex*)x, + &F77_incX, (scomplex*)beta, (scomplex*)Y, &F77_incY); if (TransA == CblasConjTrans) { diff --git a/frame/compat/cblas/src/cblas_cgerc.c b/frame/compat/cblas/src/cblas_cgerc.c index c4e682c68..dc582dd04 100644 --- a/frame/compat/cblas/src/cblas_cgerc.c +++ b/frame/compat/cblas/src/cblas_cgerc.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_cgerc.c @@ -15,9 +11,9 @@ #include #include "cblas.h" #include "cblas_f77.h" -void cblas_cgerc(const enum CBLAS_ORDER order, const int M, const int N, - const void *alpha, const void *X, const int incX, - const void *Y, const int incY, void *A, const int lda) +void cblas_cgerc(enum CBLAS_ORDER order, f77_int M, f77_int N, + const void *alpha, const void *X, f77_int incX, + const void *Y, f77_int incY, void *A, f77_int lda) { #ifdef F77_INT F77_INT F77_M=M, F77_N=N, F77_lda=lda, F77_incX=incX, F77_incY=incY; @@ -25,7 +21,7 @@ void cblas_cgerc(const enum CBLAS_ORDER order, const int M, const int N, #define F77_M M #define F77_N N #define F77_incX incX - #define F77_incY incy + #define F77_incY incY #define F77_lda lda #endif @@ -39,7 +35,7 @@ void cblas_cgerc(const enum CBLAS_ORDER order, const int M, const int N, CBLAS_CallFromC = 1; if (order == CblasColMajor) { - F77_cgerc( &F77_M, &F77_N, alpha, X, &F77_incX, Y, &F77_incY, A, + F77_cgerc( &F77_M, &F77_N, (scomplex*)alpha, (scomplex*)X, &F77_incX, (scomplex*)Y, &F77_incY, (scomplex*)A, &F77_lda); } else if (order == CblasRowMajor) { @@ -73,12 +69,12 @@ void cblas_cgerc(const enum CBLAS_ORDER order, const int M, const int N, #ifdef F77_INT F77_incY = 1; #else - incy = 1; + incY = 1; #endif } else y = (float *) Y; - F77_cgeru( &F77_N, &F77_M, alpha, y, &F77_incY, X, &F77_incX, A, + F77_cgeru( &F77_N, &F77_M, (scomplex*)alpha, (scomplex*)y, &F77_incY, (scomplex*)X, &F77_incX, (scomplex*)A, &F77_lda); if(Y!=y) free(y); diff --git a/frame/compat/cblas/src/cblas_cgeru.c b/frame/compat/cblas/src/cblas_cgeru.c index 8e680ace8..6339ef08a 100644 --- a/frame/compat/cblas/src/cblas_cgeru.c +++ b/frame/compat/cblas/src/cblas_cgeru.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_cgeru.c @@ -13,9 +9,9 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_cgeru(const enum CBLAS_ORDER order, const int M, const int N, - const void *alpha, const void *X, const int incX, - const void *Y, const int incY, void *A, const int lda) +void cblas_cgeru(enum CBLAS_ORDER order, f77_int M, f77_int N, + const void *alpha, const void *X, f77_int incX, + const void *Y, f77_int incY, void *A, f77_int lda) { #ifdef F77_INT F77_INT F77_M=M, F77_N=N, F77_lda=lda, F77_incX=incX, F77_incY=incY; @@ -35,13 +31,13 @@ void cblas_cgeru(const enum CBLAS_ORDER order, const int M, const int N, if (order == CblasColMajor) { - F77_cgeru( &F77_M, &F77_N, alpha, X, &F77_incX, Y, &F77_incY, A, + F77_cgeru( &F77_M, &F77_N, (scomplex*)alpha, (scomplex*)X, &F77_incX, (scomplex*)Y, &F77_incY, (scomplex*)A, &F77_lda); } else if (order == CblasRowMajor) { RowMajorStrg = 1; - F77_cgeru( &F77_N, &F77_M, alpha, Y, &F77_incY, X, &F77_incX, A, + F77_cgeru( &F77_N, &F77_M, (scomplex*)alpha, (scomplex*)Y, &F77_incY, (scomplex*)X, &F77_incX, (scomplex*)A, &F77_lda); } else cblas_xerbla(1, "cblas_cgeru","Illegal Order setting, %d\n", order); diff --git a/frame/compat/cblas/src/cblas_chbmv.c b/frame/compat/cblas/src/cblas_chbmv.c index 10ec5a4dd..463f8ef25 100644 --- a/frame/compat/cblas/src/cblas_chbmv.c +++ b/frame/compat/cblas/src/cblas_chbmv.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_chbmv.c @@ -15,11 +11,11 @@ #include "cblas_f77.h" #include #include -void cblas_chbmv(const enum CBLAS_ORDER order, - const enum CBLAS_UPLO Uplo,const int N,const int K, - const void *alpha, const void *A, const int lda, - const void *X, const int incX, const void *beta, - void *Y, const int incY) +void cblas_chbmv(enum CBLAS_ORDER order, + enum CBLAS_UPLO Uplo,f77_int N,f77_int K, + const void *alpha, const void *A, f77_int lda, + const void *X, f77_int incX, const void *beta, + void *Y, f77_int incY) { char UL; #ifdef F77_CHAR @@ -33,7 +29,7 @@ void cblas_chbmv(const enum CBLAS_ORDER order, #define F77_N N #define F77_K K #define F77_lda lda - #define F77_incX incx + #define F77_incX incX #define F77_incY incY #endif int n, i=0; @@ -60,8 +56,8 @@ void cblas_chbmv(const enum CBLAS_ORDER order, #ifdef F77_CHAR F77_UL = C2F_CHAR(&UL); #endif - F77_chbmv(F77_UL, &F77_N, &F77_K, alpha, A, &F77_lda, X, - &F77_incX, beta, Y, &F77_incY); + F77_chbmv(F77_UL, &F77_N, &F77_K, (scomplex*)alpha, (scomplex*)A, &F77_lda, (scomplex*)X, + &F77_incX, (scomplex*)beta, (scomplex*)Y, &F77_incY); } else if (order == CblasRowMajor) { @@ -102,7 +98,7 @@ void cblas_chbmv(const enum CBLAS_ORDER order, #ifdef F77_INT F77_incX = 1; #else - incx = 1; + incX = 1; #endif if(incY > 0) @@ -134,8 +130,8 @@ void cblas_chbmv(const enum CBLAS_ORDER order, #ifdef F77_CHAR F77_UL = C2F_CHAR(&UL); #endif - F77_chbmv(F77_UL, &F77_N, &F77_K, ALPHA, - A ,&F77_lda, x,&F77_incX, BETA, Y, &F77_incY); + F77_chbmv(F77_UL, &F77_N, &F77_K, (scomplex*)ALPHA, + (scomplex*)A ,&F77_lda, (scomplex*)x,&F77_incX, (scomplex*)BETA, (scomplex*)Y, &F77_incY); } else { diff --git a/frame/compat/cblas/src/cblas_chemm.c b/frame/compat/cblas/src/cblas_chemm.c index ccab2f0bb..e8e1e374d 100644 --- a/frame/compat/cblas/src/cblas_chemm.c +++ b/frame/compat/cblas/src/cblas_chemm.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * @@ -15,11 +11,11 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_chemm(const enum CBLAS_ORDER Order, const enum CBLAS_SIDE Side, - const enum CBLAS_UPLO Uplo, const int M, const int N, - const void *alpha, const void *A, const int lda, - const void *B, const int ldb, const void *beta, - void *C, const int ldc) +void cblas_chemm(enum CBLAS_ORDER Order, const enum CBLAS_SIDE Side, + enum CBLAS_UPLO Uplo, f77_int M, f77_int N, + const void *alpha, const void *A, f77_int lda, + const void *B, f77_int ldb, const void *beta, + void *C, f77_int ldc) { char SD, UL; #ifdef F77_CHAR @@ -72,8 +68,8 @@ void cblas_chemm(const enum CBLAS_ORDER Order, const enum CBLAS_SIDE Side, F77_SD = C2F_CHAR(&SD); #endif - F77_chemm(F77_SD, F77_UL, &F77_M, &F77_N, alpha, A, &F77_lda, - B, &F77_ldb, beta, C, &F77_ldc); + F77_chemm(F77_SD, F77_UL, &F77_M, &F77_N, (scomplex*)alpha, (scomplex*)A, &F77_lda, + (scomplex*)B, &F77_ldb, (scomplex*)beta, (scomplex*)C, &F77_ldc); } else if (Order == CblasRowMajor) { RowMajorStrg = 1; @@ -102,8 +98,8 @@ void cblas_chemm(const enum CBLAS_ORDER Order, const enum CBLAS_SIDE Side, F77_SD = C2F_CHAR(&SD); #endif - F77_chemm(F77_SD, F77_UL, &F77_N, &F77_M, alpha, A, - &F77_lda, B, &F77_ldb, beta, C, &F77_ldc); + F77_chemm(F77_SD, F77_UL, &F77_N, &F77_M, (scomplex*)alpha, (scomplex*)A, + &F77_lda, (scomplex*)B, &F77_ldb, (scomplex*)beta, (scomplex*)C, &F77_ldc); } else cblas_xerbla(1, "cblas_chemm", "Illegal Order setting, %d\n", Order); CBLAS_CallFromC = 0; diff --git a/frame/compat/cblas/src/cblas_chemv.c b/frame/compat/cblas/src/cblas_chemv.c index 22def1465..b1df3ef12 100644 --- a/frame/compat/cblas/src/cblas_chemv.c +++ b/frame/compat/cblas/src/cblas_chemv.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_chemv.c @@ -15,11 +11,11 @@ #include #include "cblas.h" #include "cblas_f77.h" -void cblas_chemv(const enum CBLAS_ORDER order, - const enum CBLAS_UPLO Uplo, const int N, - const void *alpha, const void *A, const int lda, - const void *X, const int incX, const void *beta, - void *Y, const int incY) +void cblas_chemv(enum CBLAS_ORDER order, + enum CBLAS_UPLO Uplo, f77_int N, + const void *alpha, const void *A, f77_int lda, + const void *X, f77_int incX, const void *beta, + void *Y, f77_int incY) { char UL; #ifdef F77_CHAR @@ -32,7 +28,7 @@ void cblas_chemv(const enum CBLAS_ORDER order, #else #define F77_N N #define F77_lda lda - #define F77_incX incx + #define F77_incX incX #define F77_incY incY #endif int n=0, i=0; @@ -60,8 +56,8 @@ void cblas_chemv(const enum CBLAS_ORDER order, #ifdef F77_CHAR F77_UL = C2F_CHAR(&UL); #endif - F77_chemv(F77_UL, &F77_N, alpha, A, &F77_lda, X, &F77_incX, - beta, Y, &F77_incY); + F77_chemv(F77_UL, &F77_N, (scomplex*)alpha, (scomplex*)A, &F77_lda, (scomplex*)X, &F77_incX, + (scomplex*)beta, (scomplex*)Y, &F77_incY); } else if (order == CblasRowMajor) { @@ -102,7 +98,7 @@ void cblas_chemv(const enum CBLAS_ORDER order, #ifdef F77_INT F77_incX = 1; #else - incx = 1; + incX = 1; #endif if(incY > 0) @@ -135,8 +131,8 @@ void cblas_chemv(const enum CBLAS_ORDER order, #ifdef F77_CHAR F77_UL = C2F_CHAR(&UL); #endif - F77_chemv(F77_UL, &F77_N, ALPHA, A, &F77_lda, x, &F77_incX, - BETA, Y, &F77_incY); + F77_chemv(F77_UL, &F77_N, (scomplex*)ALPHA, (scomplex*)A, &F77_lda, (scomplex*)x, &F77_incX, + (scomplex*)BETA, (scomplex*)Y, &F77_incY); } else { diff --git a/frame/compat/cblas/src/cblas_cher.c b/frame/compat/cblas/src/cblas_cher.c index 6f8f805ed..05e1c684a 100644 --- a/frame/compat/cblas/src/cblas_cher.c +++ b/frame/compat/cblas/src/cblas_cher.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_cher.c @@ -15,9 +11,9 @@ #include #include "cblas.h" #include "cblas_f77.h" -void cblas_cher(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const int N, const float alpha, const void *X, const int incX - ,void *A, const int lda) +void cblas_cher(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + f77_int N, float alpha, const void *X, f77_int incX + ,void *A, f77_int lda) { char UL; #ifdef F77_CHAR @@ -31,7 +27,7 @@ void cblas_cher(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, #else #define F77_N N #define F77_lda lda - #define F77_incX incx + #define F77_incX incX #endif int n, i, tincx; float *x=(float *)X, *xx=(float *)X, *tx, *st; @@ -56,7 +52,7 @@ void cblas_cher(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, F77_UL = C2F_CHAR(&UL); #endif - F77_cher(F77_UL, &F77_N, &alpha, X, &F77_incX, A, &F77_lda); + F77_cher(F77_UL, &F77_N, &alpha, (scomplex*)X, &F77_incX, (scomplex*)A, &F77_lda); } else if (order == CblasRowMajor) { @@ -101,11 +97,11 @@ void cblas_cher(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, #ifdef F77_INT F77_incX = 1; #else - incx = 1; + incX = 1; #endif } else x = (float *) X; - F77_cher(F77_UL, &F77_N, &alpha, x, &F77_incX, A, &F77_lda); + F77_cher(F77_UL, &F77_N, &alpha, (scomplex*)x, &F77_incX, (scomplex*)A, &F77_lda); } else { cblas_xerbla(1, "cblas_cher","Illegal Order setting, %d\n", order); diff --git a/frame/compat/cblas/src/cblas_cher2.c b/frame/compat/cblas/src/cblas_cher2.c index 8ce4a28a6..9b82423d6 100644 --- a/frame/compat/cblas/src/cblas_cher2.c +++ b/frame/compat/cblas/src/cblas_cher2.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_cher2.c @@ -15,9 +11,9 @@ #include #include "cblas.h" #include "cblas_f77.h" -void cblas_cher2(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const int N, const void *alpha, const void *X, const int incX, - const void *Y, const int incY, void *A, const int lda) +void cblas_cher2(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + f77_int N, const void *alpha, const void *X, f77_int incX, + const void *Y, f77_int incY, void *A, f77_int lda) { char UL; #ifdef F77_CHAR @@ -31,8 +27,8 @@ void cblas_cher2(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, #else #define F77_N N #define F77_lda lda - #define F77_incX incx - #define F77_incY incy + #define F77_incX incX + #define F77_incY incY #endif int n, i, j, tincx, tincy; float *x=(float *)X, *xx=(float *)X, *y=(float *)Y, @@ -58,8 +54,8 @@ void cblas_cher2(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, F77_UL = C2F_CHAR(&UL); #endif - F77_cher2(F77_UL, &F77_N, alpha, X, &F77_incX, - Y, &F77_incY, A, &F77_lda); + F77_cher2(F77_UL, &F77_N, (scomplex*)alpha, (scomplex*)X, &F77_incX, + (scomplex*)Y, &F77_incY, (scomplex*)A, &F77_lda); } else if (order == CblasRowMajor) { @@ -130,16 +126,16 @@ void cblas_cher2(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, F77_incX = 1; F77_incY = 1; #else - incx = 1; - incy = 1; + incX = 1; + incY = 1; #endif } else { x = (float *) X; y = (float *) Y; } - F77_cher2(F77_UL, &F77_N, alpha, y, &F77_incY, x, - &F77_incX, A, &F77_lda); + F77_cher2(F77_UL, &F77_N, (scomplex*)alpha, (scomplex*)y, &F77_incY, (scomplex*)x, + &F77_incX, (scomplex*)A, &F77_lda); } else { cblas_xerbla(1, "cblas_cher2","Illegal Order setting, %d\n", order); diff --git a/frame/compat/cblas/src/cblas_cher2k.c b/frame/compat/cblas/src/cblas_cher2k.c index 579d41279..fcd1c4b01 100644 --- a/frame/compat/cblas/src/cblas_cher2k.c +++ b/frame/compat/cblas/src/cblas_cher2k.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * @@ -15,11 +11,11 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_cher2k(const enum CBLAS_ORDER Order, const enum CBLAS_UPLO Uplo, - const enum CBLAS_TRANSPOSE Trans, const int N, const int K, - const void *alpha, const void *A, const int lda, - const void *B, const int ldb, const float beta, - void *C, const int ldc) +void cblas_cher2k(enum CBLAS_ORDER Order, enum CBLAS_UPLO Uplo, + enum CBLAS_TRANSPOSE Trans, f77_int N, f77_int K, + const void *alpha, const void *A, f77_int lda, + const void *B, f77_int ldb, float beta, + void *C, f77_int ldc) { char UL, TR; #ifdef F77_CHAR @@ -77,7 +73,7 @@ void cblas_cher2k(const enum CBLAS_ORDER Order, const enum CBLAS_UPLO Uplo, F77_TR = C2F_CHAR(&TR); #endif - F77_cher2k(F77_UL, F77_TR, &F77_N, &F77_K, alpha, A, &F77_lda, B, &F77_ldb, &beta, C, &F77_ldc); + F77_cher2k(F77_UL, F77_TR, &F77_N, &F77_K, (scomplex*)alpha, (scomplex*)A, &F77_lda, (scomplex*)B, &F77_ldb, &beta, (scomplex*)C, &F77_ldc); } else if (Order == CblasRowMajor) { RowMajorStrg = 1; @@ -108,7 +104,7 @@ void cblas_cher2k(const enum CBLAS_ORDER Order, const enum CBLAS_UPLO Uplo, ALPHA[0]= *alp; ALPHA[1]= -alp[1]; - F77_cher2k(F77_UL,F77_TR, &F77_N, &F77_K, ALPHA, A, &F77_lda, B, &F77_ldb, &beta, C, &F77_ldc); + F77_cher2k(F77_UL,F77_TR, &F77_N, &F77_K, (scomplex*)ALPHA, (scomplex*)A, &F77_lda, (scomplex*)B, &F77_ldb, &beta, (scomplex*)C, &F77_ldc); } else cblas_xerbla(1, "cblas_cher2k", "Illegal Order setting, %d\n", Order); CBLAS_CallFromC = 0; diff --git a/frame/compat/cblas/src/cblas_cherk.c b/frame/compat/cblas/src/cblas_cherk.c index f4980b6b8..80bc4a7a8 100644 --- a/frame/compat/cblas/src/cblas_cherk.c +++ b/frame/compat/cblas/src/cblas_cherk.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * @@ -15,10 +11,10 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_cherk(const enum CBLAS_ORDER Order, const enum CBLAS_UPLO Uplo, - const enum CBLAS_TRANSPOSE Trans, const int N, const int K, - const float alpha, const void *A, const int lda, - const float beta, void *C, const int ldc) +void cblas_cherk(enum CBLAS_ORDER Order, enum CBLAS_UPLO Uplo, + enum CBLAS_TRANSPOSE Trans, f77_int N, f77_int K, + float alpha, const void *A, f77_int lda, + float beta, void *C, f77_int ldc) { char UL, TR; #ifdef F77_CHAR @@ -71,8 +67,8 @@ void cblas_cherk(const enum CBLAS_ORDER Order, const enum CBLAS_UPLO Uplo, F77_TR = C2F_CHAR(&TR); #endif - F77_cherk(F77_UL, F77_TR, &F77_N, &F77_K, &alpha, A, &F77_lda, - &beta, C, &F77_ldc); + F77_cherk(F77_UL, F77_TR, &F77_N, &F77_K, &alpha, (scomplex*)A, &F77_lda, + &beta, (scomplex*)C, &F77_ldc); } else if (Order == CblasRowMajor) { RowMajorStrg = 1; @@ -101,8 +97,8 @@ void cblas_cherk(const enum CBLAS_ORDER Order, const enum CBLAS_UPLO Uplo, F77_SD = C2F_CHAR(&SD); #endif - F77_cherk(F77_UL, F77_TR, &F77_N, &F77_K, &alpha, A, &F77_lda, - &beta, C, &F77_ldc); + F77_cherk(F77_UL, F77_TR, &F77_N, &F77_K, &alpha, (scomplex*)A, &F77_lda, + &beta, (scomplex*)C, &F77_ldc); } else cblas_xerbla(1, "cblas_cherk", "Illegal Order setting, %d\n", Order); CBLAS_CallFromC = 0; diff --git a/frame/compat/cblas/src/cblas_chpmv.c b/frame/compat/cblas/src/cblas_chpmv.c index 04217ba37..5857070a0 100644 --- a/frame/compat/cblas/src/cblas_chpmv.c +++ b/frame/compat/cblas/src/cblas_chpmv.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_chpmv.c @@ -15,11 +11,11 @@ #include #include "cblas.h" #include "cblas_f77.h" -void cblas_chpmv(const enum CBLAS_ORDER order, - const enum CBLAS_UPLO Uplo,const int N, +void cblas_chpmv(enum CBLAS_ORDER order, + enum CBLAS_UPLO Uplo,f77_int N, const void *alpha, const void *AP, - const void *X, const int incX, const void *beta, - void *Y, const int incY) + const void *X, f77_int incX, const void *beta, + void *Y, f77_int incY) { char UL; #ifdef F77_CHAR @@ -31,7 +27,7 @@ void cblas_chpmv(const enum CBLAS_ORDER order, F77_INT F77_N=N, F77_incX=incX, F77_incY=incY; #else #define F77_N N - #define F77_incX incx + #define F77_incX incX #define F77_incY incY #endif int n, i=0; @@ -58,8 +54,8 @@ void cblas_chpmv(const enum CBLAS_ORDER order, #ifdef F77_CHAR F77_UL = C2F_CHAR(&UL); #endif - F77_chpmv(F77_UL, &F77_N, alpha, AP, X, - &F77_incX, beta, Y, &F77_incY); + F77_chpmv(F77_UL, &F77_N, (scomplex*)alpha, (scomplex*)AP, (scomplex*)X, + &F77_incX, (scomplex*)beta, (scomplex*)Y, &F77_incY); } else if (order == CblasRowMajor) { @@ -100,7 +96,7 @@ void cblas_chpmv(const enum CBLAS_ORDER order, #ifdef F77_INT F77_incX = 1; #else - incx = 1; + incX = 1; #endif if(incY > 0) @@ -134,8 +130,8 @@ void cblas_chpmv(const enum CBLAS_ORDER order, F77_UL = C2F_CHAR(&UL); #endif - F77_chpmv(F77_UL, &F77_N, ALPHA, - AP, x, &F77_incX, BETA, Y, &F77_incY); + F77_chpmv(F77_UL, &F77_N, (scomplex*)ALPHA, + (scomplex*)AP, (scomplex*)x, &F77_incX, (scomplex*)BETA, (scomplex*)Y, &F77_incY); } else { diff --git a/frame/compat/cblas/src/cblas_chpr.c b/frame/compat/cblas/src/cblas_chpr.c index c04869bc6..cd2f5baa3 100644 --- a/frame/compat/cblas/src/cblas_chpr.c +++ b/frame/compat/cblas/src/cblas_chpr.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_chpr.c @@ -15,9 +11,9 @@ #include #include "cblas.h" #include "cblas_f77.h" -void cblas_chpr(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const int N, const float alpha, const void *X, - const int incX, void *A) +void cblas_chpr(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + f77_int N, float alpha, const void *X, + f77_int incX, void *A) { char UL; #ifdef F77_CHAR @@ -30,7 +26,7 @@ void cblas_chpr(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, F77_INT F77_N=N, F77_incX=incX; #else #define F77_N N - #define F77_incX incx + #define F77_incX incX #endif int n, i, tincx; float *x=(float *)X, *xx=(float *)X, *tx, *st; @@ -55,7 +51,7 @@ void cblas_chpr(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, F77_UL = C2F_CHAR(&UL); #endif - F77_chpr(F77_UL, &F77_N, &alpha, X, &F77_incX, A); + F77_chpr(F77_UL, &F77_N, &alpha, (scomplex*)X, &F77_incX, (scomplex*)A); } else if (order == CblasRowMajor) { @@ -99,12 +95,12 @@ void cblas_chpr(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, #ifdef F77_INT F77_incX = 1; #else - incx = 1; + incX = 1; #endif } else x = (float *) X; - F77_chpr(F77_UL, &F77_N, &alpha, x, &F77_incX, A); + F77_chpr(F77_UL, &F77_N, &alpha, (scomplex*)x, &F77_incX, (scomplex*)A); } else { diff --git a/frame/compat/cblas/src/cblas_chpr2.c b/frame/compat/cblas/src/cblas_chpr2.c index c59f80130..f696083ab 100644 --- a/frame/compat/cblas/src/cblas_chpr2.c +++ b/frame/compat/cblas/src/cblas_chpr2.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_chpr2.c @@ -15,9 +11,9 @@ #include #include "cblas.h" #include "cblas_f77.h" -void cblas_chpr2(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const int N,const void *alpha, const void *X, - const int incX,const void *Y, const int incY, void *Ap) +void cblas_chpr2(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + f77_int N,const void *alpha, const void *X, + f77_int incX,const void *Y, f77_int incY, void *Ap) { char UL; @@ -31,8 +27,8 @@ void cblas_chpr2(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, F77_INT F77_N=N, F77_incX=incX, F77_incY=incY; #else #define F77_N N - #define F77_incX incx - #define F77_incY incy + #define F77_incX incX + #define F77_incY incY #endif int n, i, j, tincx, tincy; float *x=(float *)X, *xx=(float *)X, *y=(float *)Y, @@ -58,7 +54,7 @@ void cblas_chpr2(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, F77_UL = C2F_CHAR(&UL); #endif - F77_chpr2(F77_UL, &F77_N, alpha, X, &F77_incX, Y, &F77_incY, Ap); + F77_chpr2(F77_UL, &F77_N, (scomplex*)alpha, (scomplex*)X, &F77_incX, (scomplex*)Y, &F77_incY, (scomplex*)Ap); } else if (order == CblasRowMajor) { @@ -128,8 +124,8 @@ void cblas_chpr2(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, F77_incX = 1; F77_incY = 1; #else - incx = 1; - incy = 1; + incX = 1; + incY = 1; #endif } else @@ -137,7 +133,7 @@ void cblas_chpr2(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, x = (float *) X; y = (void *) Y; } - F77_chpr2(F77_UL, &F77_N, alpha, y, &F77_incY, x, &F77_incX, Ap); + F77_chpr2(F77_UL, &F77_N, (scomplex*)alpha, (scomplex*)y, &F77_incY, (scomplex*)x, &F77_incX, (scomplex*)Ap); } else { cblas_xerbla(1, "cblas_chpr2","Illegal Order setting, %d\n", order); diff --git a/frame/compat/cblas/src/cblas_cscal.c b/frame/compat/cblas/src/cblas_cscal.c index 0a7607cb6..966b93ae9 100644 --- a/frame/compat/cblas/src/cblas_cscal.c +++ b/frame/compat/cblas/src/cblas_cscal.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_cscal.c @@ -14,8 +10,8 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_cscal( const int N, const void *alpha, void *X, - const int incX) +void cblas_cscal( f77_int N, const void *alpha, void *X, + f77_int incX) { #ifdef F77_INT F77_INT F77_N=N, F77_incX=incX; @@ -23,6 +19,6 @@ void cblas_cscal( const int N, const void *alpha, void *X, #define F77_N N #define F77_incX incX #endif - F77_cscal( &F77_N, alpha, X, &F77_incX); + F77_cscal( &F77_N, (scomplex*)alpha, (scomplex*)X, &F77_incX); } #endif diff --git a/frame/compat/cblas/src/cblas_csscal.c b/frame/compat/cblas/src/cblas_csscal.c index 653d20d8b..b2940d7d4 100644 --- a/frame/compat/cblas/src/cblas_csscal.c +++ b/frame/compat/cblas/src/cblas_csscal.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_csscal.c @@ -14,8 +10,8 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_csscal( const int N, const float alpha, void *X, - const int incX) +void cblas_csscal( f77_int N, float alpha, void *X, + f77_int incX) { #ifdef F77_INT F77_INT F77_N=N, F77_incX=incX; @@ -23,6 +19,6 @@ void cblas_csscal( const int N, const float alpha, void *X, #define F77_N N #define F77_incX incX #endif - F77_csscal( &F77_N, &alpha, X, &F77_incX); + F77_csscal( &F77_N, &alpha, (scomplex*)X, &F77_incX); } #endif diff --git a/frame/compat/cblas/src/cblas_cswap.c b/frame/compat/cblas/src/cblas_cswap.c index 7c77a0c6e..a5713a24c 100644 --- a/frame/compat/cblas/src/cblas_cswap.c +++ b/frame/compat/cblas/src/cblas_cswap.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_cswap.c @@ -14,8 +10,8 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_cswap( const int N, void *X, const int incX, void *Y, - const int incY) +void cblas_cswap( f77_int N, void *X, f77_int incX, void *Y, + f77_int incY) { #ifdef F77_INT F77_INT F77_N=N, F77_incX=incX, F77_incY=incY; @@ -24,6 +20,6 @@ void cblas_cswap( const int N, void *X, const int incX, void *Y, #define F77_incX incX #define F77_incY incY #endif - F77_cswap( &F77_N, X, &F77_incX, Y, &F77_incY); + F77_cswap( &F77_N, (scomplex*)X, &F77_incX, (scomplex*)Y, &F77_incY); } #endif diff --git a/frame/compat/cblas/src/cblas_csymm.c b/frame/compat/cblas/src/cblas_csymm.c index 17590b45d..22cb266e4 100644 --- a/frame/compat/cblas/src/cblas_csymm.c +++ b/frame/compat/cblas/src/cblas_csymm.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * @@ -15,11 +11,11 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_csymm(const enum CBLAS_ORDER Order, const enum CBLAS_SIDE Side, - const enum CBLAS_UPLO Uplo, const int M, const int N, - const void *alpha, const void *A, const int lda, - const void *B, const int ldb, const void *beta, - void *C, const int ldc) +void cblas_csymm(enum CBLAS_ORDER Order, enum CBLAS_SIDE Side, + enum CBLAS_UPLO Uplo, f77_int M, f77_int N, + const void *alpha, const void *A, f77_int lda, + const void *B, f77_int ldb, const void *beta, + void *C, f77_int ldc) { char SD, UL; #ifdef F77_CHAR @@ -72,8 +68,8 @@ void cblas_csymm(const enum CBLAS_ORDER Order, const enum CBLAS_SIDE Side, F77_SD = C2F_CHAR(&SD); #endif - F77_csymm(F77_SD, F77_UL, &F77_M, &F77_N, alpha, A, &F77_lda, - B, &F77_ldb, beta, C, &F77_ldc); + F77_csymm(F77_SD, F77_UL, &F77_M, &F77_N, (scomplex*)alpha, (scomplex*)A, &F77_lda, + (scomplex*)B, &F77_ldb, (scomplex*)beta, (scomplex*)C, &F77_ldc); } else if (Order == CblasRowMajor) { RowMajorStrg = 1; @@ -102,8 +98,8 @@ void cblas_csymm(const enum CBLAS_ORDER Order, const enum CBLAS_SIDE Side, F77_SD = C2F_CHAR(&SD); #endif - F77_csymm(F77_SD, F77_UL, &F77_N, &F77_M, alpha, A, &F77_lda, - B, &F77_ldb, beta, C, &F77_ldc); + F77_csymm(F77_SD, F77_UL, &F77_N, &F77_M, (scomplex*)alpha, (scomplex*)A, &F77_lda, + (scomplex*)B, &F77_ldb, (scomplex*)beta, (scomplex*)C, &F77_ldc); } else cblas_xerbla(1, "cblas_csymm", "Illegal Order setting, %d\n", Order); CBLAS_CallFromC = 0; diff --git a/frame/compat/cblas/src/cblas_csyr2k.c b/frame/compat/cblas/src/cblas_csyr2k.c index b40b92ca5..c47072d74 100644 --- a/frame/compat/cblas/src/cblas_csyr2k.c +++ b/frame/compat/cblas/src/cblas_csyr2k.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * @@ -15,11 +11,11 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_csyr2k(const enum CBLAS_ORDER Order, const enum CBLAS_UPLO Uplo, - const enum CBLAS_TRANSPOSE Trans, const int N, const int K, - const void *alpha, const void *A, const int lda, - const void *B, const int ldb, const void *beta, - void *C, const int ldc) +void cblas_csyr2k(enum CBLAS_ORDER Order, enum CBLAS_UPLO Uplo, + enum CBLAS_TRANSPOSE Trans, f77_int N, f77_int K, + const void *alpha, const void *A, f77_int lda, + const void *B, f77_int ldb, const void *beta, + void *C, f77_int ldc) { char UL, TR; #ifdef F77_CHAR @@ -75,8 +71,8 @@ void cblas_csyr2k(const enum CBLAS_ORDER Order, const enum CBLAS_UPLO Uplo, F77_TR = C2F_CHAR(&TR); #endif - F77_csyr2k(F77_UL, F77_TR, &F77_N, &F77_K, alpha, A, &F77_lda, - B, &F77_ldb, beta, C, &F77_ldc); + F77_csyr2k(F77_UL, F77_TR, &F77_N, &F77_K, (scomplex*)alpha, (scomplex*)A, &F77_lda, + (scomplex*)B, &F77_ldb, (scomplex*)beta, (scomplex*)C, &F77_ldc); } else if (Order == CblasRowMajor) { RowMajorStrg = 1; @@ -105,7 +101,7 @@ void cblas_csyr2k(const enum CBLAS_ORDER Order, const enum CBLAS_UPLO Uplo, F77_TR = C2F_CHAR(&TR); #endif - F77_csyr2k(F77_UL, F77_TR, &F77_N, &F77_K, alpha, A, &F77_lda, B, &F77_ldb, beta, C, &F77_ldc); + F77_csyr2k(F77_UL, F77_TR, &F77_N, &F77_K, (scomplex*)alpha, (scomplex*)A, &F77_lda, (scomplex*)B, &F77_ldb, (scomplex*)beta, (scomplex*)C, &F77_ldc); } else cblas_xerbla(1, "cblas_csyr2k", "Illegal Order setting, %d\n", Order); CBLAS_CallFromC = 0; diff --git a/frame/compat/cblas/src/cblas_csyrk.c b/frame/compat/cblas/src/cblas_csyrk.c index c4927d06a..94d9e2a8f 100644 --- a/frame/compat/cblas/src/cblas_csyrk.c +++ b/frame/compat/cblas/src/cblas_csyrk.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * @@ -15,10 +11,10 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_csyrk(const enum CBLAS_ORDER Order, const enum CBLAS_UPLO Uplo, - const enum CBLAS_TRANSPOSE Trans, const int N, const int K, - const void *alpha, const void *A, const int lda, - const void *beta, void *C, const int ldc) +void cblas_csyrk(enum CBLAS_ORDER Order, enum CBLAS_UPLO Uplo, + enum CBLAS_TRANSPOSE Trans, f77_int N, f77_int K, + const void *alpha, const void *A, f77_int lda, + const void *beta, void *C, f77_int ldc) { char UL, TR; #ifdef F77_CHAR @@ -73,8 +69,8 @@ void cblas_csyrk(const enum CBLAS_ORDER Order, const enum CBLAS_UPLO Uplo, F77_TR = C2F_CHAR(&TR); #endif - F77_csyrk(F77_UL, F77_TR, &F77_N, &F77_K, alpha, A, &F77_lda, - beta, C, &F77_ldc); + F77_csyrk(F77_UL, F77_TR, &F77_N, &F77_K, (scomplex*)alpha, (scomplex*)A, &F77_lda, + (scomplex*)beta, (scomplex*)C, &F77_ldc); } else if (Order == CblasRowMajor) { RowMajorStrg = 1; @@ -103,8 +99,8 @@ void cblas_csyrk(const enum CBLAS_ORDER Order, const enum CBLAS_UPLO Uplo, F77_TR = C2F_CHAR(&TR); #endif - F77_csyrk(F77_UL, F77_TR, &F77_N, &F77_K, alpha, A, &F77_lda, - beta, C, &F77_ldc); + F77_csyrk(F77_UL, F77_TR, &F77_N, &F77_K, (scomplex*)alpha, (scomplex*)A, &F77_lda, + (scomplex*)beta, (scomplex*)C, &F77_ldc); } else cblas_xerbla(1, "cblas_csyrk", "Illegal Order setting, %d\n", Order); CBLAS_CallFromC = 0; diff --git a/frame/compat/cblas/src/cblas_ctbmv.c b/frame/compat/cblas/src/cblas_ctbmv.c index cea3e898b..8dd2499c7 100644 --- a/frame/compat/cblas/src/cblas_ctbmv.c +++ b/frame/compat/cblas/src/cblas_ctbmv.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_ctbmv.c @@ -13,10 +9,10 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_ctbmv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const enum CBLAS_TRANSPOSE TransA, const enum CBLAS_DIAG Diag, - const int N, const int K, const void *A, const int lda, - void *X, const int incX) +void cblas_ctbmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, + f77_int N, f77_int K, const void *A, f77_int lda, + void *X, f77_int incX) { char TA; char UL; @@ -78,7 +74,7 @@ void cblas_ctbmv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, F77_TA = C2F_CHAR(&TA); F77_DI = C2F_CHAR(&DI); #endif - F77_ctbmv( F77_UL, F77_TA, F77_DI, &F77_N, &F77_K, A, &F77_lda, X, + F77_ctbmv( F77_UL, F77_TA, F77_DI, &F77_N, &F77_K, (scomplex*)A, &F77_lda, (scomplex*)X, &F77_incX); } else if (order == CblasRowMajor) @@ -141,7 +137,7 @@ void cblas_ctbmv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, F77_DI = C2F_CHAR(&DI); #endif - F77_ctbmv( F77_UL, F77_TA, F77_DI, &F77_N, &F77_K, A, &F77_lda, X, + F77_ctbmv( F77_UL, F77_TA, F77_DI, &F77_N, &F77_K, (scomplex*)A, &F77_lda, (scomplex*)X, &F77_incX); if (TransA == CblasConjTrans) diff --git a/frame/compat/cblas/src/cblas_ctbsv.c b/frame/compat/cblas/src/cblas_ctbsv.c index c1d1e4084..d9dfdcd22 100644 --- a/frame/compat/cblas/src/cblas_ctbsv.c +++ b/frame/compat/cblas/src/cblas_ctbsv.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_ctbsv.c @@ -13,10 +9,10 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_ctbsv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const enum CBLAS_TRANSPOSE TransA, const enum CBLAS_DIAG Diag, - const int N, const int K, const void *A, const int lda, - void *X, const int incX) +void cblas_ctbsv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, + f77_int N, f77_int K, const void *A, f77_int lda, + void *X, f77_int incX) { char TA; char UL; @@ -78,7 +74,7 @@ void cblas_ctbsv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, F77_TA = C2F_CHAR(&TA); F77_DI = C2F_CHAR(&DI); #endif - F77_ctbsv( F77_UL, F77_TA, F77_DI, &F77_N, &F77_K, A, &F77_lda, X, + F77_ctbsv( F77_UL, F77_TA, F77_DI, &F77_N, &F77_K, (scomplex*)A, &F77_lda, (scomplex*)X, &F77_incX); } else if (order == CblasRowMajor) @@ -145,7 +141,7 @@ void cblas_ctbsv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, F77_DI = C2F_CHAR(&DI); #endif - F77_ctbsv( F77_UL, F77_TA, F77_DI, &F77_N, &F77_K, A, &F77_lda, X, + F77_ctbsv( F77_UL, F77_TA, F77_DI, &F77_N, &F77_K, (scomplex*)A, &F77_lda, (scomplex*)X, &F77_incX); if (TransA == CblasConjTrans) diff --git a/frame/compat/cblas/src/cblas_ctpmv.c b/frame/compat/cblas/src/cblas_ctpmv.c index fe2788d7a..8f9cb33a4 100644 --- a/frame/compat/cblas/src/cblas_ctpmv.c +++ b/frame/compat/cblas/src/cblas_ctpmv.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_ctpmv.c @@ -13,9 +9,9 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_ctpmv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const enum CBLAS_TRANSPOSE TransA, const enum CBLAS_DIAG Diag, - const int N, const void *Ap, void *X, const int incX) +void cblas_ctpmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, + f77_int N, const void *Ap, void *X, f77_int incX) { char TA; char UL; @@ -75,7 +71,7 @@ void cblas_ctpmv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, F77_TA = C2F_CHAR(&TA); F77_DI = C2F_CHAR(&DI); #endif - F77_ctpmv( F77_UL, F77_TA, F77_DI, &F77_N, Ap, X, &F77_incX); + F77_ctpmv( F77_UL, F77_TA, F77_DI, &F77_N, (scomplex*)Ap, (scomplex*)X, &F77_incX); } else if (order == CblasRowMajor) { @@ -137,7 +133,7 @@ void cblas_ctpmv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, F77_DI = C2F_CHAR(&DI); #endif - F77_ctpmv( F77_UL, F77_TA, F77_DI, &F77_N, Ap, X,&F77_incX); + F77_ctpmv( F77_UL, F77_TA, F77_DI, &F77_N, (scomplex*)Ap, (scomplex*)X,&F77_incX); if (TransA == CblasConjTrans) { if (N > 0) diff --git a/frame/compat/cblas/src/cblas_ctpsv.c b/frame/compat/cblas/src/cblas_ctpsv.c index 242e69b7b..77d5821e3 100644 --- a/frame/compat/cblas/src/cblas_ctpsv.c +++ b/frame/compat/cblas/src/cblas_ctpsv.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_ctpsv.c @@ -13,9 +9,9 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_ctpsv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const enum CBLAS_TRANSPOSE TransA, const enum CBLAS_DIAG Diag, - const int N, const void *Ap, void *X, const int incX) +void cblas_ctpsv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, + f77_int N, const void *Ap, void *X, f77_int incX) { char TA; char UL; @@ -75,7 +71,7 @@ void cblas_ctpsv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, F77_TA = C2F_CHAR(&TA); F77_DI = C2F_CHAR(&DI); #endif - F77_ctpsv( F77_UL, F77_TA, F77_DI, &F77_N, Ap, X, &F77_incX); + F77_ctpsv( F77_UL, F77_TA, F77_DI, &F77_N, (scomplex*)Ap, (scomplex*)X, &F77_incX); } else if (order == CblasRowMajor) { @@ -141,7 +137,7 @@ void cblas_ctpsv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, F77_DI = C2F_CHAR(&DI); #endif - F77_ctpsv( F77_UL, F77_TA, F77_DI, &F77_N, Ap, X,&F77_incX); + F77_ctpsv( F77_UL, F77_TA, F77_DI, &F77_N, (scomplex*)Ap, (scomplex*)X,&F77_incX); if (TransA == CblasConjTrans) { diff --git a/frame/compat/cblas/src/cblas_ctrmm.c b/frame/compat/cblas/src/cblas_ctrmm.c index a387d7d1e..7eb621f3b 100644 --- a/frame/compat/cblas/src/cblas_ctrmm.c +++ b/frame/compat/cblas/src/cblas_ctrmm.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * @@ -15,11 +11,11 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_ctrmm(const enum CBLAS_ORDER Order, const enum CBLAS_SIDE Side, - const enum CBLAS_UPLO Uplo, const enum CBLAS_TRANSPOSE TransA, - const enum CBLAS_DIAG Diag, const int M, const int N, - const void *alpha, const void *A, const int lda, - void *B, const int ldb) +void cblas_ctrmm(enum CBLAS_ORDER Order, enum CBLAS_SIDE Side, + enum CBLAS_UPLO Uplo, const enum CBLAS_TRANSPOSE TransA, + enum CBLAS_DIAG Diag, f77_int M, f77_int N, + const void *alpha, const void *A, f77_int lda, + void *B, f77_int ldb) { char UL, TA, SD, DI; #ifdef F77_CHAR @@ -89,7 +85,7 @@ void cblas_ctrmm(const enum CBLAS_ORDER Order, const enum CBLAS_SIDE Side, F77_DI = C2F_CHAR(&DI); #endif - F77_ctrmm(F77_SD, F77_UL, F77_TA, F77_DI, &F77_M, &F77_N, alpha, A, &F77_lda, B, &F77_ldb); + F77_ctrmm(F77_SD, F77_UL, F77_TA, F77_DI, &F77_M, &F77_N, (scomplex*)alpha, (scomplex*)A, &F77_lda, (scomplex*)B, &F77_ldb); } else if (Order == CblasRowMajor) { RowMajorStrg = 1; @@ -141,7 +137,7 @@ void cblas_ctrmm(const enum CBLAS_ORDER Order, const enum CBLAS_SIDE Side, F77_DI = C2F_CHAR(&DI); #endif - F77_ctrmm(F77_SD, F77_UL, F77_TA, F77_DI, &F77_N, &F77_M, alpha, A, &F77_lda, B, &F77_ldb); + F77_ctrmm(F77_SD, F77_UL, F77_TA, F77_DI, &F77_N, &F77_M, (scomplex*)alpha, (scomplex*)A, &F77_lda, (scomplex*)B, &F77_ldb); } else cblas_xerbla(1, "cblas_ctrmm", "Illegal Order setting, %d\n", Order); CBLAS_CallFromC = 0; diff --git a/frame/compat/cblas/src/cblas_ctrmv.c b/frame/compat/cblas/src/cblas_ctrmv.c index a84752bf4..756720207 100644 --- a/frame/compat/cblas/src/cblas_ctrmv.c +++ b/frame/compat/cblas/src/cblas_ctrmv.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_ctrmv.c @@ -13,10 +9,10 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_ctrmv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const enum CBLAS_TRANSPOSE TransA, const enum CBLAS_DIAG Diag, - const int N, const void *A, const int lda, - void *X, const int incX) +void cblas_ctrmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, + f77_int N, const void *A, f77_int lda, + void *X, f77_int incX) { char TA; @@ -78,7 +74,7 @@ void cblas_ctrmv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, F77_TA = C2F_CHAR(&TA); F77_DI = C2F_CHAR(&DI); #endif - F77_ctrmv( F77_UL, F77_TA, F77_DI, &F77_N, A, &F77_lda, X, + F77_ctrmv( F77_UL, F77_TA, F77_DI, &F77_N, (scomplex*)A, &F77_lda, (scomplex*)X, &F77_incX); } else if (order == CblasRowMajor) @@ -139,7 +135,7 @@ void cblas_ctrmv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, F77_TA = C2F_CHAR(&TA); F77_DI = C2F_CHAR(&DI); #endif - F77_ctrmv( F77_UL, F77_TA, F77_DI, &F77_N, A, &F77_lda, X, + F77_ctrmv( F77_UL, F77_TA, F77_DI, &F77_N, (scomplex*)A, &F77_lda, (scomplex*)X, &F77_incX); if (TransA == CblasConjTrans) { diff --git a/frame/compat/cblas/src/cblas_ctrsm.c b/frame/compat/cblas/src/cblas_ctrsm.c index e1f441983..f6e016a21 100644 --- a/frame/compat/cblas/src/cblas_ctrsm.c +++ b/frame/compat/cblas/src/cblas_ctrsm.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * @@ -15,11 +11,11 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_ctrsm(const enum CBLAS_ORDER Order, const enum CBLAS_SIDE Side, - const enum CBLAS_UPLO Uplo, const enum CBLAS_TRANSPOSE TransA, - const enum CBLAS_DIAG Diag, const int M, const int N, - const void *alpha, const void *A, const int lda, - void *B, const int ldb) +void cblas_ctrsm(enum CBLAS_ORDER Order, enum CBLAS_SIDE Side, + enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE TransA, + enum CBLAS_DIAG Diag, f77_int M, f77_int N, + const void *alpha, const void *A, f77_int lda, + void *B, f77_int ldb) { char UL, TA, SD, DI; #ifdef F77_CHAR @@ -151,8 +147,8 @@ void cblas_ctrsm(const enum CBLAS_ORDER Order, const enum CBLAS_SIDE Side, #endif - F77_ctrsm(F77_SD, F77_UL, F77_TA, F77_DI, &F77_N, &F77_M, alpha, A, - &F77_lda, B, &F77_ldb); + F77_ctrsm(F77_SD, F77_UL, F77_TA, F77_DI, &F77_N, &F77_M, (scomplex*)alpha, (scomplex*)A, + &F77_lda, (scomplex*)B, &F77_ldb); } else cblas_xerbla(1, "cblas_ctrsm", "Illegal Order setting, %d\n", Order); CBLAS_CallFromC = 0; diff --git a/frame/compat/cblas/src/cblas_ctrsv.c b/frame/compat/cblas/src/cblas_ctrsv.c index f6dfb5215..539d97e55 100644 --- a/frame/compat/cblas/src/cblas_ctrsv.c +++ b/frame/compat/cblas/src/cblas_ctrsv.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_ctrsv.c @@ -13,10 +9,10 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_ctrsv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const enum CBLAS_TRANSPOSE TransA, const enum CBLAS_DIAG Diag, - const int N, const void *A, const int lda, void *X, - const int incX) +void cblas_ctrsv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, + f77_int N, const void *A, f77_int lda, void *X, + f77_int incX) { char TA; char UL; @@ -77,7 +73,7 @@ void cblas_ctrsv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, F77_TA = C2F_CHAR(&TA); F77_DI = C2F_CHAR(&DI); #endif - F77_ctrsv( F77_UL, F77_TA, F77_DI, &F77_N, A, &F77_lda, X, + F77_ctrsv( F77_UL, F77_TA, F77_DI, &F77_N, (scomplex*)A, &F77_lda, (scomplex*)X, &F77_incX); } else if (order == CblasRowMajor) @@ -140,7 +136,7 @@ void cblas_ctrsv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, F77_TA = C2F_CHAR(&TA); F77_DI = C2F_CHAR(&DI); #endif - F77_ctrsv( F77_UL, F77_TA, F77_DI, &F77_N, A, &F77_lda, X, + F77_ctrsv( F77_UL, F77_TA, F77_DI, &F77_N, (scomplex*)A, &F77_lda, (scomplex*)X, &F77_incX); if (TransA == CblasConjTrans) { diff --git a/frame/compat/cblas/src/cblas_dasum.c b/frame/compat/cblas/src/cblas_dasum.c index 141ddf6df..39c2a06b1 100644 --- a/frame/compat/cblas/src/cblas_dasum.c +++ b/frame/compat/cblas/src/cblas_dasum.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_dasum.c @@ -15,7 +11,7 @@ */ #include "cblas.h" #include "cblas_f77.h" -double cblas_dasum( const int N, const double *X, const int incX) +double cblas_dasum( f77_int N, const double *X, f77_int incX) { double asum; #ifdef F77_INT diff --git a/frame/compat/cblas/src/cblas_daxpy.c b/frame/compat/cblas/src/cblas_daxpy.c index 209b71443..5a3d08d6a 100644 --- a/frame/compat/cblas/src/cblas_daxpy.c +++ b/frame/compat/cblas/src/cblas_daxpy.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_daxpy.c @@ -14,8 +10,8 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_daxpy( const int N, const double alpha, const double *X, - const int incX, double *Y, const int incY) +void cblas_daxpy( f77_int N, double alpha, const double *X, + f77_int incX, double *Y, f77_int incY) { #ifdef F77_INT F77_INT F77_N=N, F77_incX=incX, F77_incY=incY; diff --git a/frame/compat/cblas/src/cblas_dcopy.c b/frame/compat/cblas/src/cblas_dcopy.c index f4809836b..186c3d1d6 100644 --- a/frame/compat/cblas/src/cblas_dcopy.c +++ b/frame/compat/cblas/src/cblas_dcopy.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_dcopy.c @@ -14,8 +10,8 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_dcopy( const int N, const double *X, - const int incX, double *Y, const int incY) +void cblas_dcopy( f77_int N, const double *X, + f77_int incX, double *Y, f77_int incY) { #ifdef F77_INT F77_INT F77_N=N, F77_incX=incX, F77_incY=incY; diff --git a/frame/compat/cblas/src/cblas_ddot.c b/frame/compat/cblas/src/cblas_ddot.c index cbe4f441f..b1675d888 100644 --- a/frame/compat/cblas/src/cblas_ddot.c +++ b/frame/compat/cblas/src/cblas_ddot.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_ddot.c @@ -15,8 +11,8 @@ */ #include "cblas.h" #include "cblas_f77.h" -double cblas_ddot( const int N, const double *X, - const int incX, const double *Y, const int incY) +double cblas_ddot( f77_int N, const double *X, + f77_int incX, const double *Y, f77_int incY) { double dot; #ifdef F77_INT diff --git a/frame/compat/cblas/src/cblas_dgbmv.c b/frame/compat/cblas/src/cblas_dgbmv.c index 3d194827a..f0a19d5e8 100644 --- a/frame/compat/cblas/src/cblas_dgbmv.c +++ b/frame/compat/cblas/src/cblas_dgbmv.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * @@ -14,12 +10,12 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_dgbmv(const enum CBLAS_ORDER order, - const enum CBLAS_TRANSPOSE TransA, const int M, const int N, - const int KL, const int KU, - const double alpha, const double *A, const int lda, - const double *X, const int incX, const double beta, - double *Y, const int incY) +void cblas_dgbmv(enum CBLAS_ORDER order, + enum CBLAS_TRANSPOSE TransA, f77_int M, f77_int N, + f77_int KL, f77_int KU, + double alpha, const double *A, f77_int lda, + const double *X, f77_int incX, double beta, + double *Y, f77_int incY) { char TA; #ifdef F77_CHAR diff --git a/frame/compat/cblas/src/cblas_dgemm.c b/frame/compat/cblas/src/cblas_dgemm.c index 51e60f370..479a15abd 100644 --- a/frame/compat/cblas/src/cblas_dgemm.c +++ b/frame/compat/cblas/src/cblas_dgemm.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * @@ -15,11 +11,11 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_dgemm(const enum CBLAS_ORDER Order, const enum CBLAS_TRANSPOSE TransA, - const enum CBLAS_TRANSPOSE TransB, const int M, const int N, - const int K, const double alpha, const double *A, - const int lda, const double *B, const int ldb, - const double beta, double *C, const int ldc) +void cblas_dgemm(enum CBLAS_ORDER Order, enum CBLAS_TRANSPOSE TransA, + enum CBLAS_TRANSPOSE TransB, f77_int M, f77_int N, + f77_int K, double alpha, const double *A, + f77_int lda, const double *B, f77_int ldb, + double beta, double *C, f77_int ldc) { char TA, TB; #ifdef F77_CHAR diff --git a/frame/compat/cblas/src/cblas_dgemv.c b/frame/compat/cblas/src/cblas_dgemv.c index efc7ae875..025523b2c 100644 --- a/frame/compat/cblas/src/cblas_dgemv.c +++ b/frame/compat/cblas/src/cblas_dgemv.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * @@ -14,11 +10,11 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_dgemv(const enum CBLAS_ORDER order, - const enum CBLAS_TRANSPOSE TransA, const int M, const int N, - const double alpha, const double *A, const int lda, - const double *X, const int incX, const double beta, - double *Y, const int incY) +void cblas_dgemv(enum CBLAS_ORDER order, + enum CBLAS_TRANSPOSE TransA, f77_int M, f77_int N, + double alpha, const double *A, f77_int lda, + const double *X, f77_int incX, double beta, + double *Y, f77_int incY) { char TA; #ifdef F77_CHAR diff --git a/frame/compat/cblas/src/cblas_dger.c b/frame/compat/cblas/src/cblas_dger.c index c661ac43a..366d393b6 100644 --- a/frame/compat/cblas/src/cblas_dger.c +++ b/frame/compat/cblas/src/cblas_dger.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * @@ -15,9 +11,9 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_dger(const enum CBLAS_ORDER order, const int M, const int N, - const double alpha, const double *X, const int incX, - const double *Y, const int incY, double *A, const int lda) +void cblas_dger(enum CBLAS_ORDER order, f77_int M, f77_int N, + double alpha, const double *X, f77_int incX, + const double *Y, f77_int incY, double *A, f77_int lda) { #ifdef F77_INT F77_INT F77_M=M, F77_N=N, F77_lda=lda, F77_incX=incX, F77_incY=incY; diff --git a/frame/compat/cblas/src/cblas_dnrm2.c b/frame/compat/cblas/src/cblas_dnrm2.c index 7ccf71699..537ab8835 100644 --- a/frame/compat/cblas/src/cblas_dnrm2.c +++ b/frame/compat/cblas/src/cblas_dnrm2.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_dnrm2.c @@ -15,7 +11,7 @@ */ #include "cblas.h" #include "cblas_f77.h" -double cblas_dnrm2( const int N, const double *X, const int incX) +double cblas_dnrm2( f77_int N, const double *X, f77_int incX) { double nrm2; #ifdef F77_INT diff --git a/frame/compat/cblas/src/cblas_drot.c b/frame/compat/cblas/src/cblas_drot.c index 200691a7a..b5dac7cad 100644 --- a/frame/compat/cblas/src/cblas_drot.c +++ b/frame/compat/cblas/src/cblas_drot.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_drot.c @@ -14,8 +10,8 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_drot(const int N, double *X, const int incX, - double *Y, const int incY, const double c, const double s) +void cblas_drot(f77_int N, double *X, f77_int incX, + double *Y, f77_int incY, const double c, const double s) { #ifdef F77_INT F77_INT F77_N=N, F77_incX=incX, F77_incY=incY; diff --git a/frame/compat/cblas/src/cblas_drotg.c b/frame/compat/cblas/src/cblas_drotg.c index 18d0d348c..c509bafc7 100644 --- a/frame/compat/cblas/src/cblas_drotg.c +++ b/frame/compat/cblas/src/cblas_drotg.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_drotg.c diff --git a/frame/compat/cblas/src/cblas_drotm.c b/frame/compat/cblas/src/cblas_drotm.c index d7aca5fee..f0ae348dd 100644 --- a/frame/compat/cblas/src/cblas_drotm.c +++ b/frame/compat/cblas/src/cblas_drotm.c @@ -1,13 +1,9 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS #include "cblas.h" #include "cblas_f77.h" -void cblas_drotm( const int N, double *X, const int incX, double *Y, - const int incY, const double *P) +void cblas_drotm( f77_int N, double *X, f77_int incX, double *Y, + f77_int incY, const double *P) { #ifdef F77_INT F77_INT F77_N=N, F77_incX=incX, F77_incY=incY; diff --git a/frame/compat/cblas/src/cblas_drotmg.c b/frame/compat/cblas/src/cblas_drotmg.c index cbf2738db..6b969bf87 100644 --- a/frame/compat/cblas/src/cblas_drotmg.c +++ b/frame/compat/cblas/src/cblas_drotmg.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_drotmg.c diff --git a/frame/compat/cblas/src/cblas_dsbmv.c b/frame/compat/cblas/src/cblas_dsbmv.c index ac0177c11..8398dd6ce 100644 --- a/frame/compat/cblas/src/cblas_dsbmv.c +++ b/frame/compat/cblas/src/cblas_dsbmv.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * @@ -15,11 +11,11 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_dsbmv(const enum CBLAS_ORDER order, - const enum CBLAS_UPLO Uplo, const int N, const int K, - const double alpha, const double *A, const int lda, - const double *X, const int incX, const double beta, - double *Y, const int incY) +void cblas_dsbmv(enum CBLAS_ORDER order, + enum CBLAS_UPLO Uplo, f77_int N, f77_int K, + double alpha, const double *A, f77_int lda, + const double *X, f77_int incX, double beta, + double *Y, f77_int incY) { char UL; #ifdef F77_CHAR diff --git a/frame/compat/cblas/src/cblas_dscal.c b/frame/compat/cblas/src/cblas_dscal.c index 53b4d3567..bb6da3f67 100644 --- a/frame/compat/cblas/src/cblas_dscal.c +++ b/frame/compat/cblas/src/cblas_dscal.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_dscal.c @@ -14,8 +10,8 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_dscal( const int N, const double alpha, double *X, - const int incX) +void cblas_dscal( f77_int N, double alpha, double *X, + f77_int incX) { #ifdef F77_INT F77_INT F77_N=N, F77_incX=incX; diff --git a/frame/compat/cblas/src/cblas_dsdot.c b/frame/compat/cblas/src/cblas_dsdot.c index 7e37cf2f1..734a16dae 100644 --- a/frame/compat/cblas/src/cblas_dsdot.c +++ b/frame/compat/cblas/src/cblas_dsdot.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_dsdot.c @@ -15,8 +11,8 @@ */ #include "cblas.h" #include "cblas_f77.h" -double cblas_dsdot( const int N, const float *X, - const int incX, const float *Y, const int incY) +double cblas_dsdot( f77_int N, const float *X, + f77_int incX, const float *Y, f77_int incY) { double dot; #ifdef F77_INT diff --git a/frame/compat/cblas/src/cblas_dspmv.c b/frame/compat/cblas/src/cblas_dspmv.c index 79504b69b..b8e95cfa8 100644 --- a/frame/compat/cblas/src/cblas_dspmv.c +++ b/frame/compat/cblas/src/cblas_dspmv.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * @@ -16,11 +12,11 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_dspmv(const enum CBLAS_ORDER order, - const enum CBLAS_UPLO Uplo, const int N, - const double alpha, const double *AP, - const double *X, const int incX, const double beta, - double *Y, const int incY) +void cblas_dspmv(enum CBLAS_ORDER order, + enum CBLAS_UPLO Uplo, f77_int N, + double alpha, const double *AP, + const double *X, f77_int incX, double beta, + double *Y, f77_int incY) { char UL; #ifdef F77_CHAR diff --git a/frame/compat/cblas/src/cblas_dspr.c b/frame/compat/cblas/src/cblas_dspr.c index 5e3f54cf7..9156f7a83 100644 --- a/frame/compat/cblas/src/cblas_dspr.c +++ b/frame/compat/cblas/src/cblas_dspr.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * @@ -15,9 +11,9 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_dspr(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const int N, const double alpha, const double *X, - const int incX, double *Ap) +void cblas_dspr(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + f77_int N, double alpha, const double *X, + f77_int incX, double *Ap) { char UL; #ifdef F77_CHAR diff --git a/frame/compat/cblas/src/cblas_dspr2.c b/frame/compat/cblas/src/cblas_dspr2.c index 86bbe1359..8fade8319 100644 --- a/frame/compat/cblas/src/cblas_dspr2.c +++ b/frame/compat/cblas/src/cblas_dspr2.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_dspr2.c @@ -13,9 +9,9 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_dspr2(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const int N, const double alpha, const double *X, - const int incX, const double *Y, const int incY, double *A) +void cblas_dspr2(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + f77_int N, const double alpha, const double *X, + f77_int incX, const double *Y, f77_int incY, double *A) { char UL; #ifdef F77_CHAR diff --git a/frame/compat/cblas/src/cblas_dswap.c b/frame/compat/cblas/src/cblas_dswap.c index 3a26e968f..e204baea0 100644 --- a/frame/compat/cblas/src/cblas_dswap.c +++ b/frame/compat/cblas/src/cblas_dswap.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_dswap.c @@ -14,8 +10,8 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_dswap( const int N, double *X, const int incX, double *Y, - const int incY) +void cblas_dswap( f77_int N, double *X, f77_int incX, double *Y, + f77_int incY) { #ifdef F77_INT F77_INT F77_N=N, F77_incX=incX, F77_incY=incY; diff --git a/frame/compat/cblas/src/cblas_dsymm.c b/frame/compat/cblas/src/cblas_dsymm.c index b073c0106..81bc52268 100644 --- a/frame/compat/cblas/src/cblas_dsymm.c +++ b/frame/compat/cblas/src/cblas_dsymm.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * @@ -15,11 +11,11 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_dsymm(const enum CBLAS_ORDER Order, const enum CBLAS_SIDE Side, - const enum CBLAS_UPLO Uplo, const int M, const int N, - const double alpha, const double *A, const int lda, - const double *B, const int ldb, const double beta, - double *C, const int ldc) +void cblas_dsymm(enum CBLAS_ORDER Order, enum CBLAS_SIDE Side, + enum CBLAS_UPLO Uplo, f77_int M, f77_int N, + double alpha, const double *A, f77_int lda, + const double *B, f77_int ldb, double beta, + double *C, f77_int ldc) { char SD, UL; #ifdef F77_CHAR diff --git a/frame/compat/cblas/src/cblas_dsymv.c b/frame/compat/cblas/src/cblas_dsymv.c index 42ce6a3c3..d0c2aa642 100644 --- a/frame/compat/cblas/src/cblas_dsymv.c +++ b/frame/compat/cblas/src/cblas_dsymv.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * @@ -15,11 +11,11 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_dsymv(const enum CBLAS_ORDER order, - const enum CBLAS_UPLO Uplo, const int N, - const double alpha, const double *A, const int lda, - const double *X, const int incX, const double beta, - double *Y, const int incY) +void cblas_dsymv(enum CBLAS_ORDER order, + enum CBLAS_UPLO Uplo, f77_int N, + double alpha, const double *A, f77_int lda, + const double *X, f77_int incX, double beta, + double *Y, f77_int incY) { char UL; #ifdef F77_CHAR diff --git a/frame/compat/cblas/src/cblas_dsyr.c b/frame/compat/cblas/src/cblas_dsyr.c index 6e9c6ff35..f6dd66c75 100644 --- a/frame/compat/cblas/src/cblas_dsyr.c +++ b/frame/compat/cblas/src/cblas_dsyr.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * @@ -15,9 +11,9 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_dsyr(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const int N, const double alpha, const double *X, - const int incX, double *A, const int lda) +void cblas_dsyr(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + f77_int N, const double alpha, const double *X, + f77_int incX, double *A, f77_int lda) { char UL; #ifdef F77_CHAR diff --git a/frame/compat/cblas/src/cblas_dsyr2.c b/frame/compat/cblas/src/cblas_dsyr2.c index d2bf47c06..c0d773939 100644 --- a/frame/compat/cblas/src/cblas_dsyr2.c +++ b/frame/compat/cblas/src/cblas_dsyr2.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * @@ -15,10 +11,10 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_dsyr2(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const int N, const double alpha, const double *X, - const int incX, const double *Y, const int incY, double *A, - const int lda) +void cblas_dsyr2(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + f77_int N, const double alpha, const double *X, + f77_int incX, const double *Y, f77_int incY, double *A, + f77_int lda) { char UL; #ifdef F77_CHAR diff --git a/frame/compat/cblas/src/cblas_dsyr2k.c b/frame/compat/cblas/src/cblas_dsyr2k.c index 13ee196d8..2c35b9929 100644 --- a/frame/compat/cblas/src/cblas_dsyr2k.c +++ b/frame/compat/cblas/src/cblas_dsyr2k.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * @@ -15,11 +11,11 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_dsyr2k(const enum CBLAS_ORDER Order, const enum CBLAS_UPLO Uplo, - const enum CBLAS_TRANSPOSE Trans, const int N, const int K, - const double alpha, const double *A, const int lda, - const double *B, const int ldb, const double beta, - double *C, const int ldc) +void cblas_dsyr2k(enum CBLAS_ORDER Order, enum CBLAS_UPLO Uplo, + enum CBLAS_TRANSPOSE Trans, f77_int N, f77_int K, + double alpha, const double *A, f77_int lda, + const double *B, f77_int ldb, double beta, + double *C, f77_int ldc) { char UL, TR; #ifdef F77_CHAR diff --git a/frame/compat/cblas/src/cblas_dsyrk.c b/frame/compat/cblas/src/cblas_dsyrk.c index aced9af74..8a7ca1651 100644 --- a/frame/compat/cblas/src/cblas_dsyrk.c +++ b/frame/compat/cblas/src/cblas_dsyrk.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * @@ -15,10 +11,10 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_dsyrk(const enum CBLAS_ORDER Order, const enum CBLAS_UPLO Uplo, - const enum CBLAS_TRANSPOSE Trans, const int N, const int K, - const double alpha, const double *A, const int lda, - const double beta, double *C, const int ldc) +void cblas_dsyrk(enum CBLAS_ORDER Order, enum CBLAS_UPLO Uplo, + enum CBLAS_TRANSPOSE Trans, f77_int N, f77_int K, + double alpha, const double *A, f77_int lda, + double beta, double *C, f77_int ldc) { char UL, TR; #ifdef F77_CHAR diff --git a/frame/compat/cblas/src/cblas_dtbmv.c b/frame/compat/cblas/src/cblas_dtbmv.c index 54698b59c..6502c1c22 100644 --- a/frame/compat/cblas/src/cblas_dtbmv.c +++ b/frame/compat/cblas/src/cblas_dtbmv.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_dtbmv.c @@ -13,10 +9,10 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_dtbmv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const enum CBLAS_TRANSPOSE TransA, const enum CBLAS_DIAG Diag, - const int N, const int K, const double *A, const int lda, - double *X, const int incX) +void cblas_dtbmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, + f77_int N, f77_int K, const double *A, f77_int lda, + double *X, f77_int incX) { char TA; char UL; diff --git a/frame/compat/cblas/src/cblas_dtbsv.c b/frame/compat/cblas/src/cblas_dtbsv.c index f5e4570fc..aae08e956 100644 --- a/frame/compat/cblas/src/cblas_dtbsv.c +++ b/frame/compat/cblas/src/cblas_dtbsv.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_dtbsv.c @@ -13,10 +9,10 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_dtbsv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const enum CBLAS_TRANSPOSE TransA, const enum CBLAS_DIAG Diag, - const int N, const int K, const double *A, const int lda, - double *X, const int incX) +void cblas_dtbsv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, + f77_int N, f77_int K, const double *A, f77_int lda, + double *X, f77_int incX) { char TA; char UL; diff --git a/frame/compat/cblas/src/cblas_dtpmv.c b/frame/compat/cblas/src/cblas_dtpmv.c index 184a54565..b72b4ed7e 100644 --- a/frame/compat/cblas/src/cblas_dtpmv.c +++ b/frame/compat/cblas/src/cblas_dtpmv.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_dtpmv.c @@ -13,9 +9,9 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_dtpmv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const enum CBLAS_TRANSPOSE TransA, const enum CBLAS_DIAG Diag, - const int N, const double *Ap, double *X, const int incX) +void cblas_dtpmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, + f77_int N, const double *Ap, double *X, f77_int incX) { char TA; char UL; diff --git a/frame/compat/cblas/src/cblas_dtpsv.c b/frame/compat/cblas/src/cblas_dtpsv.c index 893736436..501e4a256 100644 --- a/frame/compat/cblas/src/cblas_dtpsv.c +++ b/frame/compat/cblas/src/cblas_dtpsv.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_dtpsv.c @@ -13,9 +9,9 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_dtpsv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const enum CBLAS_TRANSPOSE TransA, const enum CBLAS_DIAG Diag, - const int N, const double *Ap, double *X, const int incX) +void cblas_dtpsv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, + f77_int N, const double *Ap, double *X, f77_int incX) { char TA; char UL; diff --git a/frame/compat/cblas/src/cblas_dtrmm.c b/frame/compat/cblas/src/cblas_dtrmm.c index 7b292b112..c93c4862a 100644 --- a/frame/compat/cblas/src/cblas_dtrmm.c +++ b/frame/compat/cblas/src/cblas_dtrmm.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * @@ -15,11 +11,11 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_dtrmm(const enum CBLAS_ORDER Order, const enum CBLAS_SIDE Side, - const enum CBLAS_UPLO Uplo, const enum CBLAS_TRANSPOSE TransA, - const enum CBLAS_DIAG Diag, const int M, const int N, - const double alpha, const double *A, const int lda, - double *B, const int ldb) +void cblas_dtrmm(enum CBLAS_ORDER Order, enum CBLAS_SIDE Side, + enum CBLAS_UPLO Uplo, const enum CBLAS_TRANSPOSE TransA, + enum CBLAS_DIAG Diag, f77_int M, f77_int N, + double alpha, const double *A, f77_int lda, + double *B, f77_int ldb) { char UL, TA, SD, DI; #ifdef F77_CHAR diff --git a/frame/compat/cblas/src/cblas_dtrmv.c b/frame/compat/cblas/src/cblas_dtrmv.c index 505cb0d52..904d4b75b 100644 --- a/frame/compat/cblas/src/cblas_dtrmv.c +++ b/frame/compat/cblas/src/cblas_dtrmv.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * @@ -15,10 +11,10 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_dtrmv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const enum CBLAS_TRANSPOSE TransA, const enum CBLAS_DIAG Diag, - const int N, const double *A, const int lda, - double *X, const int incX) +void cblas_dtrmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, + f77_int N, const double *A, f77_int lda, + double *X, f77_int incX) { char TA; diff --git a/frame/compat/cblas/src/cblas_dtrsm.c b/frame/compat/cblas/src/cblas_dtrsm.c index cfa38d5e8..552620495 100644 --- a/frame/compat/cblas/src/cblas_dtrsm.c +++ b/frame/compat/cblas/src/cblas_dtrsm.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * @@ -15,11 +11,11 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_dtrsm(const enum CBLAS_ORDER Order, const enum CBLAS_SIDE Side, - const enum CBLAS_UPLO Uplo, const enum CBLAS_TRANSPOSE TransA, - const enum CBLAS_DIAG Diag, const int M, const int N, - const double alpha, const double *A, const int lda, - double *B, const int ldb) +void cblas_dtrsm(enum CBLAS_ORDER Order, enum CBLAS_SIDE Side, + enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE TransA, + enum CBLAS_DIAG Diag, f77_int M, f77_int N, + double alpha, const double *A, f77_int lda, + double *B, f77_int ldb) { char UL, TA, SD, DI; diff --git a/frame/compat/cblas/src/cblas_dtrsv.c b/frame/compat/cblas/src/cblas_dtrsv.c index 5a747584b..4d257f7ea 100644 --- a/frame/compat/cblas/src/cblas_dtrsv.c +++ b/frame/compat/cblas/src/cblas_dtrsv.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_dtrsv.c @@ -13,10 +9,10 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_dtrsv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const enum CBLAS_TRANSPOSE TransA, const enum CBLAS_DIAG Diag, - const int N, const double *A, const int lda, double *X, - const int incX) +void cblas_dtrsv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, + f77_int N, const double *A, f77_int lda, double *X, + f77_int incX) { char TA; diff --git a/frame/compat/cblas/src/cblas_dzasum.c b/frame/compat/cblas/src/cblas_dzasum.c index 8fe779c1d..325a54a19 100644 --- a/frame/compat/cblas/src/cblas_dzasum.c +++ b/frame/compat/cblas/src/cblas_dzasum.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_dzasum.c @@ -15,7 +11,7 @@ */ #include "cblas.h" #include "cblas_f77.h" -double cblas_dzasum( const int N, const void *X, const int incX) +double cblas_dzasum( f77_int N, const void *X, f77_int incX) { double asum; #ifdef F77_INT diff --git a/frame/compat/cblas/src/cblas_dznrm2.c b/frame/compat/cblas/src/cblas_dznrm2.c index ab9495214..0df1ef29e 100644 --- a/frame/compat/cblas/src/cblas_dznrm2.c +++ b/frame/compat/cblas/src/cblas_dznrm2.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_dznrm2.c @@ -15,7 +11,7 @@ */ #include "cblas.h" #include "cblas_f77.h" -double cblas_dznrm2( const int N, const void *X, const int incX) +double cblas_dznrm2( f77_int N, const void *X, f77_int incX) { double nrm2; #ifdef F77_INT diff --git a/frame/compat/cblas/src/cblas_f77.h b/frame/compat/cblas/src/cblas_f77.h index 18435cd30..fcdd946df 100644 --- a/frame/compat/cblas/src/cblas_f77.h +++ b/frame/compat/cblas/src/cblas_f77.h @@ -4,698 +4,164 @@ * * Updated by Jeff Horner * Merged cblas_f77.h and cblas_fortran_header.h + * + * (Heavily hacked down from the original) */ #ifndef CBLAS_F77_H -#define CBLAS_f77_H +#define CBLAS_F77_H -#ifdef CRAY - #include - #define F77_CHAR _fcd - #define C2F_CHAR(a) ( _cptofcd( (a), 1 ) ) - #define C2F_STR(a, i) ( _cptofcd( (a), (i) ) ) - #define F77_STRLEN(a) (_fcdlen) -#endif - -#ifdef WeirdNEC - #define F77_INT long -#endif - -#ifdef F77_CHAR - #define FCHAR F77_CHAR -#else - #define FCHAR char * -#endif - -#ifdef F77_INT - #define FINT const F77_INT * - #define FINT2 F77_INT * -#else - #define FINT const int * - #define FINT2 int * -#endif - -#if defined(ADD_) /* * Level 1 BLAS */ -#define F77_xerbla xerbla_ - #define F77_srotg srotg_ - #define F77_srotmg srotmg_ - #define F77_srot srot_ - #define F77_srotm srotm_ - #define F77_drotg drotg_ - #define F77_drotmg drotmg_ - #define F77_drot drot_ - #define F77_drotm drotm_ - #define F77_sswap sswap_ - #define F77_scopy scopy_ - #define F77_saxpy saxpy_ - #define F77_isamax_sub isamaxsub_ - #define F77_dswap dswap_ - #define F77_dcopy dcopy_ - #define F77_daxpy daxpy_ - #define F77_idamax_sub idamaxsub_ - #define F77_cswap cswap_ - #define F77_ccopy ccopy_ - #define F77_caxpy caxpy_ - #define F77_icamax_sub icamaxsub_ - #define F77_zswap zswap_ - #define F77_zcopy zcopy_ - #define F77_zaxpy zaxpy_ - #define F77_izamax_sub izamaxsub_ - #define F77_sdot_sub sdotsub_ - #define F77_ddot_sub ddotsub_ - #define F77_dsdot_sub dsdotsub_ - #define F77_sscal sscal_ - #define F77_dscal dscal_ - #define F77_cscal cscal_ - #define F77_zscal zscal_ - #define F77_csscal csscal_ - #define F77_zdscal zdscal_ - #define F77_cdotu_sub cdotusub_ - #define F77_cdotc_sub cdotcsub_ - #define F77_zdotu_sub zdotusub_ - #define F77_zdotc_sub zdotcsub_ - #define F77_snrm2_sub snrm2sub_ - #define F77_sasum_sub sasumsub_ - #define F77_dnrm2_sub dnrm2sub_ - #define F77_dasum_sub dasumsub_ - #define F77_scnrm2_sub scnrm2sub_ - #define F77_scasum_sub scasumsub_ - #define F77_dznrm2_sub dznrm2sub_ - #define F77_dzasum_sub dzasumsub_ - #define F77_sdsdot_sub sdsdotsub_ +#define F77_xerbla xerbla_ +#define F77_srotg srotg_ +#define F77_srotmg srotmg_ +#define F77_srot srot_ +#define F77_srotm srotm_ +#define F77_drotg drotg_ +#define F77_drotmg drotmg_ +#define F77_drot drot_ +#define F77_drotm drotm_ +#define F77_sswap sswap_ +#define F77_scopy scopy_ +#define F77_saxpy saxpy_ +#define F77_isamax_sub isamaxsub_ +#define F77_dswap dswap_ +#define F77_dcopy dcopy_ +#define F77_daxpy daxpy_ +#define F77_idamax_sub idamaxsub_ +#define F77_cswap cswap_ +#define F77_ccopy ccopy_ +#define F77_caxpy caxpy_ +#define F77_icamax_sub icamaxsub_ +#define F77_zswap zswap_ +#define F77_zcopy zcopy_ +#define F77_zaxpy zaxpy_ +#define F77_izamax_sub izamaxsub_ +#define F77_sdot_sub sdotsub_ +#define F77_ddot_sub ddotsub_ +#define F77_dsdot_sub dsdotsub_ +#define F77_sscal sscal_ +#define F77_dscal dscal_ +#define F77_cscal cscal_ +#define F77_zscal zscal_ +#define F77_csscal csscal_ +#define F77_zdscal zdscal_ +#define F77_cdotu_sub cdotusub_ +#define F77_cdotc_sub cdotcsub_ +#define F77_zdotu_sub zdotusub_ +#define F77_zdotc_sub zdotcsub_ +#define F77_snrm2_sub snrm2sub_ +#define F77_sasum_sub sasumsub_ +#define F77_dnrm2_sub dnrm2sub_ +#define F77_dasum_sub dasumsub_ +#define F77_scnrm2_sub scnrm2sub_ +#define F77_scasum_sub scasumsub_ +#define F77_dznrm2_sub dznrm2sub_ +#define F77_dzasum_sub dzasumsub_ +#define F77_sdsdot_sub sdsdotsub_ /* - * Level 2 BLAS - */ - #define F77_ssymv ssymv_ - #define F77_ssbmv ssbmv_ - #define F77_sspmv sspmv_ - #define F77_sger sger_ - #define F77_ssyr ssyr_ - #define F77_sspr sspr_ - #define F77_ssyr2 ssyr2_ - #define F77_sspr2 sspr2_ - #define F77_dsymv dsymv_ - #define F77_dsbmv dsbmv_ - #define F77_dspmv dspmv_ - #define F77_dger dger_ - #define F77_dsyr dsyr_ - #define F77_dspr dspr_ - #define F77_dsyr2 dsyr2_ - #define F77_dspr2 dspr2_ - #define F77_chemv chemv_ - #define F77_chbmv chbmv_ - #define F77_chpmv chpmv_ - #define F77_cgeru cgeru_ - #define F77_cgerc cgerc_ - #define F77_cher cher_ - #define F77_chpr chpr_ - #define F77_cher2 cher2_ - #define F77_chpr2 chpr2_ - #define F77_zhemv zhemv_ - #define F77_zhbmv zhbmv_ - #define F77_zhpmv zhpmv_ - #define F77_zgeru zgeru_ - #define F77_zgerc zgerc_ - #define F77_zher zher_ - #define F77_zhpr zhpr_ - #define F77_zher2 zher2_ - #define F77_zhpr2 zhpr2_ - #define F77_sgemv sgemv_ - #define F77_sgbmv sgbmv_ - #define F77_strmv strmv_ - #define F77_stbmv stbmv_ - #define F77_stpmv stpmv_ - #define F77_strsv strsv_ - #define F77_stbsv stbsv_ - #define F77_stpsv stpsv_ - #define F77_dgemv dgemv_ - #define F77_dgbmv dgbmv_ - #define F77_dtrmv dtrmv_ - #define F77_dtbmv dtbmv_ - #define F77_dtpmv dtpmv_ - #define F77_dtrsv dtrsv_ - #define F77_dtbsv dtbsv_ - #define F77_dtpsv dtpsv_ - #define F77_cgemv cgemv_ - #define F77_cgbmv cgbmv_ - #define F77_ctrmv ctrmv_ - #define F77_ctbmv ctbmv_ - #define F77_ctpmv ctpmv_ - #define F77_ctrsv ctrsv_ - #define F77_ctbsv ctbsv_ - #define F77_ctpsv ctpsv_ - #define F77_zgemv zgemv_ - #define F77_zgbmv zgbmv_ - #define F77_ztrmv ztrmv_ - #define F77_ztbmv ztbmv_ - #define F77_ztpmv ztpmv_ - #define F77_ztrsv ztrsv_ - #define F77_ztbsv ztbsv_ - #define F77_ztpsv ztpsv_ +* Level 2 BLAS +*/ +#define F77_ssymv ssymv_ +#define F77_ssbmv ssbmv_ +#define F77_sspmv sspmv_ +#define F77_sger sger_ +#define F77_ssyr ssyr_ +#define F77_sspr sspr_ +#define F77_ssyr2 ssyr2_ +#define F77_sspr2 sspr2_ +#define F77_dsymv dsymv_ +#define F77_dsbmv dsbmv_ +#define F77_dspmv dspmv_ +#define F77_dger dger_ +#define F77_dsyr dsyr_ +#define F77_dspr dspr_ +#define F77_dsyr2 dsyr2_ +#define F77_dspr2 dspr2_ +#define F77_chemv chemv_ +#define F77_chbmv chbmv_ +#define F77_chpmv chpmv_ +#define F77_cgeru cgeru_ +#define F77_cgerc cgerc_ +#define F77_cher cher_ +#define F77_chpr chpr_ +#define F77_cher2 cher2_ +#define F77_chpr2 chpr2_ +#define F77_zhemv zhemv_ +#define F77_zhbmv zhbmv_ +#define F77_zhpmv zhpmv_ +#define F77_zgeru zgeru_ +#define F77_zgerc zgerc_ +#define F77_zher zher_ +#define F77_zhpr zhpr_ +#define F77_zher2 zher2_ +#define F77_zhpr2 zhpr2_ +#define F77_sgemv sgemv_ +#define F77_sgbmv sgbmv_ +#define F77_strmv strmv_ +#define F77_stbmv stbmv_ +#define F77_stpmv stpmv_ +#define F77_strsv strsv_ +#define F77_stbsv stbsv_ +#define F77_stpsv stpsv_ +#define F77_dgemv dgemv_ +#define F77_dgbmv dgbmv_ +#define F77_dtrmv dtrmv_ +#define F77_dtbmv dtbmv_ +#define F77_dtpmv dtpmv_ +#define F77_dtrsv dtrsv_ +#define F77_dtbsv dtbsv_ +#define F77_dtpsv dtpsv_ +#define F77_cgemv cgemv_ +#define F77_cgbmv cgbmv_ +#define F77_ctrmv ctrmv_ +#define F77_ctbmv ctbmv_ +#define F77_ctpmv ctpmv_ +#define F77_ctrsv ctrsv_ +#define F77_ctbsv ctbsv_ +#define F77_ctpsv ctpsv_ +#define F77_zgemv zgemv_ +#define F77_zgbmv zgbmv_ +#define F77_ztrmv ztrmv_ +#define F77_ztbmv ztbmv_ +#define F77_ztpmv ztpmv_ +#define F77_ztrsv ztrsv_ +#define F77_ztbsv ztbsv_ +#define F77_ztpsv ztpsv_ /* - * Level 3 BLAS - */ - #define F77_chemm chemm_ - #define F77_cherk cherk_ - #define F77_cher2k cher2k_ - #define F77_zhemm zhemm_ - #define F77_zherk zherk_ - #define F77_zher2k zher2k_ - #define F77_sgemm sgemm_ - #define F77_ssymm ssymm_ - #define F77_ssyrk ssyrk_ - #define F77_ssyr2k ssyr2k_ - #define F77_strmm strmm_ - #define F77_strsm strsm_ - #define F77_dgemm dgemm_ - #define F77_dsymm dsymm_ - #define F77_dsyrk dsyrk_ - #define F77_dsyr2k dsyr2k_ - #define F77_dtrmm dtrmm_ - #define F77_dtrsm dtrsm_ - #define F77_cgemm cgemm_ - #define F77_csymm csymm_ - #define F77_csyrk csyrk_ - #define F77_csyr2k csyr2k_ - #define F77_ctrmm ctrmm_ - #define F77_ctrsm ctrsm_ - #define F77_zgemm zgemm_ - #define F77_zsymm zsymm_ - #define F77_zsyrk zsyrk_ - #define F77_zsyr2k zsyr2k_ - #define F77_ztrmm ztrmm_ - #define F77_ztrsm ztrsm_ -#elif defined(UPCASE) -/* - * Level 1 BLAS - */ -#define F77_xerbla XERBLA - #define F77_srotg SROTG - #define F77_srotmg SROTMG - #define F77_srot SROT - #define F77_srotm SROTM - #define F77_drotg DROTG - #define F77_drotmg DROTMG - #define F77_drot DROT - #define F77_drotm DROTM - #define F77_sswap SSWAP - #define F77_scopy SCOPY - #define F77_saxpy SAXPY - #define F77_isamax_sub ISAMAXSUB - #define F77_dswap DSWAP - #define F77_dcopy DCOPY - #define F77_daxpy DAXPY - #define F77_idamax_sub IDAMAXSUB - #define F77_cswap CSWAP - #define F77_ccopy CCOPY - #define F77_caxpy CAXPY - #define F77_icamax_sub ICAMAXSUB - #define F77_zswap ZSWAP - #define F77_zcopy ZCOPY - #define F77_zaxpy ZAXPY - #define F77_izamax_sub IZAMAXSUB - #define F77_sdot_sub SDOTSUB - #define F77_ddot_sub DDOTSUB - #define F77_dsdot_sub DSDOTSUB - #define F77_sscal SSCAL - #define F77_dscal DSCAL - #define F77_cscal CSCAL - #define F77_zscal ZSCAL - #define F77_csscal CSSCAL - #define F77_zdscal ZDSCAL - #define F77_cdotu_sub CDOTUSUB - #define F77_cdotc_sub CDOTCSUB - #define F77_zdotu_sub ZDOTUSUB - #define F77_zdotc_sub ZDOTCSUB - #define F77_snrm2_sub SNRM2SUB - #define F77_sasum_sub SASUMSUB - #define F77_dnrm2_sub DNRM2SUB - #define F77_dasum_sub DASUMSUB - #define F77_scnrm2_sub SCNRM2SUB - #define F77_scasum_sub SCASUMSUB - #define F77_dznrm2_sub DZNRM2SUB - #define F77_dzasum_sub DZASUMSUB - #define F77_sdsdot_sub SDSDOTSUB -/* - * Level 2 BLAS - */ - #define F77_ssymv SSYMV - #define F77_ssbmv SSBMV - #define F77_sspmv SSPMV - #define F77_sger SGER - #define F77_ssyr SSYR - #define F77_sspr SSPR - #define F77_ssyr2 SSYR2 - #define F77_sspr2 SSPR2 - #define F77_dsymv DSYMV - #define F77_dsbmv DSBMV - #define F77_dspmv DSPMV - #define F77_dger DGER - #define F77_dsyr DSYR - #define F77_dspr DSPR - #define F77_dsyr2 DSYR2 - #define F77_dspr2 DSPR2 - #define F77_chemv CHEMV - #define F77_chbmv CHBMV - #define F77_chpmv CHPMV - #define F77_cgeru CGERU - #define F77_cgerc CGERC - #define F77_cher CHER - #define F77_chpr CHPR - #define F77_cher2 CHER2 - #define F77_chpr2 CHPR2 - #define F77_zhemv ZHEMV - #define F77_zhbmv ZHBMV - #define F77_zhpmv ZHPMV - #define F77_zgeru ZGERU - #define F77_zgerc ZGERC - #define F77_zher ZHER - #define F77_zhpr ZHPR - #define F77_zher2 ZHER2 - #define F77_zhpr2 ZHPR2 - #define F77_sgemv SGEMV - #define F77_sgbmv SGBMV - #define F77_strmv STRMV - #define F77_stbmv STBMV - #define F77_stpmv STPMV - #define F77_strsv STRSV - #define F77_stbsv STBSV - #define F77_stpsv STPSV - #define F77_dgemv DGEMV - #define F77_dgbmv DGBMV - #define F77_dtrmv DTRMV - #define F77_dtbmv DTBMV - #define F77_dtpmv DTPMV - #define F77_dtrsv DTRSV - #define F77_dtbsv DTBSV - #define F77_dtpsv DTPSV - #define F77_cgemv CGEMV - #define F77_cgbmv CGBMV - #define F77_ctrmv CTRMV - #define F77_ctbmv CTBMV - #define F77_ctpmv CTPMV - #define F77_ctrsv CTRSV - #define F77_ctbsv CTBSV - #define F77_ctpsv CTPSV - #define F77_zgemv ZGEMV - #define F77_zgbmv ZGBMV - #define F77_ztrmv ZTRMV - #define F77_ztbmv ZTBMV - #define F77_ztpmv ZTPMV - #define F77_ztrsv ZTRSV - #define F77_ztbsv ZTBSV - #define F77_ztpsv ZTPSV -/* - * Level 3 BLAS - */ - #define F77_chemm CHEMM - #define F77_cherk CHERK - #define F77_cher2k CHER2K - #define F77_zhemm ZHEMM - #define F77_zherk ZHERK - #define F77_zher2k ZHER2K - #define F77_sgemm SGEMM - #define F77_ssymm SSYMM - #define F77_ssyrk SSYRK - #define F77_ssyr2k SSYR2K - #define F77_strmm STRMM - #define F77_strsm STRSM - #define F77_dgemm DGEMM - #define F77_dsymm DSYMM - #define F77_dsyrk DSYRK - #define F77_dsyr2k DSYR2K - #define F77_dtrmm DTRMM - #define F77_dtrsm DTRSM - #define F77_cgemm CGEMM - #define F77_csymm CSYMM - #define F77_csyrk CSYRK - #define F77_csyr2k CSYR2K - #define F77_ctrmm CTRMM - #define F77_ctrsm CTRSM - #define F77_zgemm ZGEMM - #define F77_zsymm ZSYMM - #define F77_zsyrk ZSYRK - #define F77_zsyr2k ZSYR2K - #define F77_ztrmm ZTRMM - #define F77_ztrsm ZTRSM -#elif defined(NOCHANGE) -/* - * Level 1 BLAS - */ -#define F77_xerbla xerbla - #define F77_srotg srotg - #define F77_srotmg srotmg - #define F77_srot srot - #define F77_srotm srotm - #define F77_drotg drotg - #define F77_drotmg drotmg - #define F77_drot drot - #define F77_drotm drotm - #define F77_sswap sswap - #define F77_scopy scopy - #define F77_saxpy saxpy - #define F77_isamax_sub isamaxsub - #define F77_dswap dswap - #define F77_dcopy dcopy - #define F77_daxpy daxpy - #define F77_idamax_sub idamaxsub - #define F77_cswap cswap - #define F77_ccopy ccopy - #define F77_caxpy caxpy - #define F77_icamax_sub icamaxsub - #define F77_zswap zswap - #define F77_zcopy zcopy - #define F77_zaxpy zaxpy - #define F77_izamax_sub izamaxsub - #define F77_sdot_sub sdotsub - #define F77_ddot_sub ddotsub - #define F77_dsdot_sub dsdotsub - #define F77_sscal sscal - #define F77_dscal dscal - #define F77_cscal cscal - #define F77_zscal zscal - #define F77_csscal csscal - #define F77_zdscal zdscal - #define F77_cdotu_sub cdotusub - #define F77_cdotc_sub cdotcsub - #define F77_zdotu_sub zdotusub - #define F77_zdotc_sub zdotcsub - #define F77_snrm2_sub snrm2sub - #define F77_sasum_sub sasumsub - #define F77_dnrm2_sub dnrm2sub - #define F77_dasum_sub dasumsub - #define F77_scnrm2_sub scnrm2sub - #define F77_scasum_sub scasumsub - #define F77_dznrm2_sub dznrm2sub - #define F77_dzasum_sub dzasumsub - #define F77_sdsdot_sub sdsdotsub -/* - * Level 2 BLAS - */ - #define F77_ssymv ssymv - #define F77_ssbmv ssbmv - #define F77_sspmv sspmv - #define F77_sger sger - #define F77_ssyr ssyr - #define F77_sspr sspr - #define F77_ssyr2 ssyr2 - #define F77_sspr2 sspr2 - #define F77_dsymv dsymv - #define F77_dsbmv dsbmv - #define F77_dspmv dspmv - #define F77_dger dger - #define F77_dsyr dsyr - #define F77_dspr dspr - #define F77_dsyr2 dsyr2 - #define F77_dspr2 dspr2 - #define F77_chemv chemv - #define F77_chbmv chbmv - #define F77_chpmv chpmv - #define F77_cgeru cgeru - #define F77_cgerc cgerc - #define F77_cher cher - #define F77_chpr chpr - #define F77_cher2 cher2 - #define F77_chpr2 chpr2 - #define F77_zhemv zhemv - #define F77_zhbmv zhbmv - #define F77_zhpmv zhpmv - #define F77_zgeru zgeru - #define F77_zgerc zgerc - #define F77_zher zher - #define F77_zhpr zhpr - #define F77_zher2 zher2 - #define F77_zhpr2 zhpr2 - #define F77_sgemv sgemv - #define F77_sgbmv sgbmv - #define F77_strmv strmv - #define F77_stbmv stbmv - #define F77_stpmv stpmv - #define F77_strsv strsv - #define F77_stbsv stbsv - #define F77_stpsv stpsv - #define F77_dgemv dgemv - #define F77_dgbmv dgbmv - #define F77_dtrmv dtrmv - #define F77_dtbmv dtbmv - #define F77_dtpmv dtpmv - #define F77_dtrsv dtrsv - #define F77_dtbsv dtbsv - #define F77_dtpsv dtpsv - #define F77_cgemv cgemv - #define F77_cgbmv cgbmv - #define F77_ctrmv ctrmv - #define F77_ctbmv ctbmv - #define F77_ctpmv ctpmv - #define F77_ctrsv ctrsv - #define F77_ctbsv ctbsv - #define F77_ctpsv ctpsv - #define F77_zgemv zgemv - #define F77_zgbmv zgbmv - #define F77_ztrmv ztrmv - #define F77_ztbmv ztbmv - #define F77_ztpmv ztpmv - #define F77_ztrsv ztrsv - #define F77_ztbsv ztbsv - #define F77_ztpsv ztpsv -/* - * Level 3 BLAS - */ - #define F77_chemm chemm - #define F77_cherk cherk - #define F77_cher2k cher2k - #define F77_zhemm zhemm - #define F77_zherk zherk - #define F77_zher2k zher2k - #define F77_sgemm sgemm - #define F77_ssymm ssymm - #define F77_ssyrk ssyrk - #define F77_ssyr2k ssyr2k - #define F77_strmm strmm - #define F77_strsm strsm - #define F77_dgemm dgemm - #define F77_dsymm dsymm - #define F77_dsyrk dsyrk - #define F77_dsyr2k dsyr2k - #define F77_dtrmm dtrmm - #define F77_dtrsm dtrsm - #define F77_cgemm cgemm - #define F77_csymm csymm - #define F77_csyrk csyrk - #define F77_csyr2k csyr2k - #define F77_ctrmm ctrmm - #define F77_ctrsm ctrsm - #define F77_zgemm zgemm - #define F77_zsymm zsymm - #define F77_zsyrk zsyrk - #define F77_zsyr2k zsyr2k - #define F77_ztrmm ztrmm - #define F77_ztrsm ztrsm -#endif - -#ifdef __cplusplus -extern "C" { -#endif - - void F77_xerbla(FCHAR, void *); -/* - * Level 1 Fortran Prototypes - */ - -/* Single Precision */ - - void F77_srot(FINT, float *, FINT, float *, FINT, const float *, const float *); - void F77_srotg(float *,float *,float *,float *); - void F77_srotm( FINT, float *, FINT, float *, FINT, const float *); - void F77_srotmg(float *,float *,float *,const float *, float *); - void F77_sswap( FINT, float *, FINT, float *, FINT); - void F77_scopy( FINT, const float *, FINT, float *, FINT); - void F77_saxpy( FINT, const float *, const float *, FINT, float *, FINT); - void F77_sdot_sub(FINT, const float *, FINT, const float *, FINT, float *); - void F77_sdsdot_sub( FINT, const float *, const float *, FINT, const float *, FINT, float *); - void F77_sscal( FINT, const float *, float *, FINT); - void F77_snrm2_sub( FINT, const float *, FINT, float *); - void F77_sasum_sub( FINT, const float *, FINT, float *); - void F77_isamax_sub( FINT, const float * , FINT, FINT2); - -/* Double Precision */ - - void F77_drot(FINT, double *, FINT, double *, FINT, const double *, const double *); - void F77_drotg(double *,double *,double *,double *); - void F77_drotm( FINT, double *, FINT, double *, FINT, const double *); - void F77_drotmg(double *,double *,double *,const double *, double *); - void F77_dswap( FINT, double *, FINT, double *, FINT); - void F77_dcopy( FINT, const double *, FINT, double *, FINT); - void F77_daxpy( FINT, const double *, const double *, FINT, double *, FINT); - void F77_dswap( FINT, double *, FINT, double *, FINT); - void F77_dsdot_sub(FINT, const float *, FINT, const float *, FINT, double *); - void F77_ddot_sub( FINT, const double *, FINT, const double *, FINT, double *); - void F77_dscal( FINT, const double *, double *, FINT); - void F77_dnrm2_sub( FINT, const double *, FINT, double *); - void F77_dasum_sub( FINT, const double *, FINT, double *); - void F77_idamax_sub( FINT, const double * , FINT, FINT2); - -/* Single Complex Precision */ - - void F77_cswap( FINT, void *, FINT, void *, FINT); - void F77_ccopy( FINT, const void *, FINT, void *, FINT); - void F77_caxpy( FINT, const void *, const void *, FINT, void *, FINT); - void F77_cswap( FINT, void *, FINT, void *, FINT); - void F77_cdotc_sub( FINT, const void *, FINT, const void *, FINT, void *); - void F77_cdotu_sub( FINT, const void *, FINT, const void *, FINT, void *); - void F77_cscal( FINT, const void *, void *, FINT); - void F77_icamax_sub( FINT, const void *, FINT, FINT2); - void F77_csscal( FINT, const float *, void *, FINT); - void F77_scnrm2_sub( FINT, const void *, FINT, float *); - void F77_scasum_sub( FINT, const void *, FINT, float *); - -/* Double Complex Precision */ - - void F77_zswap( FINT, void *, FINT, void *, FINT); - void F77_zcopy( FINT, const void *, FINT, void *, FINT); - void F77_zaxpy( FINT, const void *, const void *, FINT, void *, FINT); - void F77_zswap( FINT, void *, FINT, void *, FINT); - void F77_zdotc_sub( FINT, const void *, FINT, const void *, FINT, void *); - void F77_zdotu_sub( FINT, const void *, FINT, const void *, FINT, void *); - void F77_zdscal( FINT, const double *, void *, FINT); - void F77_zscal( FINT, const void *, void *, FINT); - void F77_dznrm2_sub( FINT, const void *, FINT, double *); - void F77_dzasum_sub( FINT, const void *, FINT, double *); - void F77_izamax_sub( FINT, const void *, FINT, FINT2); - -/* - * Level 2 Fortran Prototypes - */ - -/* Single Precision */ - - void F77_sgemv(FCHAR, FINT, FINT, const float *, const float *, FINT, const float *, FINT, const float *, float *, FINT); - void F77_sgbmv(FCHAR, FINT, FINT, FINT, FINT, const float *, const float *, FINT, const float *, FINT, const float *, float *, FINT); - void F77_ssymv(FCHAR, FINT, const float *, const float *, FINT, const float *, FINT, const float *, float *, FINT); - void F77_ssbmv(FCHAR, FINT, FINT, const float *, const float *, FINT, const float *, FINT, const float *, float *, FINT); - void F77_sspmv(FCHAR, FINT, const float *, const float *, const float *, FINT, const float *, float *, FINT); - void F77_strmv( FCHAR, FCHAR, FCHAR, FINT, const float *, FINT, float *, FINT); - void F77_stbmv( FCHAR, FCHAR, FCHAR, FINT, FINT, const float *, FINT, float *, FINT); - void F77_strsv( FCHAR, FCHAR, FCHAR, FINT, const float *, FINT, float *, FINT); - void F77_stbsv( FCHAR, FCHAR, FCHAR, FINT, FINT, const float *, FINT, float *, FINT); - void F77_stpmv( FCHAR, FCHAR, FCHAR, FINT, const float *, float *, FINT); - void F77_stpsv( FCHAR, FCHAR, FCHAR, FINT, const float *, float *, FINT); - void F77_sger( FINT, FINT, const float *, const float *, FINT, const float *, FINT, float *, FINT); - void F77_ssyr(FCHAR, FINT, const float *, const float *, FINT, float *, FINT); - void F77_sspr(FCHAR, FINT, const float *, const float *, FINT, float *); - void F77_sspr2(FCHAR, FINT, const float *, const float *, FINT, const float *, FINT, float *); - void F77_ssyr2(FCHAR, FINT, const float *, const float *, FINT, const float *, FINT, float *, FINT); - -/* Double Precision */ - - void F77_dgemv(FCHAR, FINT, FINT, const double *, const double *, FINT, const double *, FINT, const double *, double *, FINT); - void F77_dgbmv(FCHAR, FINT, FINT, FINT, FINT, const double *, const double *, FINT, const double *, FINT, const double *, double *, FINT); - void F77_dsymv(FCHAR, FINT, const double *, const double *, FINT, const double *, FINT, const double *, double *, FINT); - void F77_dsbmv(FCHAR, FINT, FINT, const double *, const double *, FINT, const double *, FINT, const double *, double *, FINT); - void F77_dspmv(FCHAR, FINT, const double *, const double *, const double *, FINT, const double *, double *, FINT); - void F77_dtrmv( FCHAR, FCHAR, FCHAR, FINT, const double *, FINT, double *, FINT); - void F77_dtbmv( FCHAR, FCHAR, FCHAR, FINT, FINT, const double *, FINT, double *, FINT); - void F77_dtrsv( FCHAR, FCHAR, FCHAR, FINT, const double *, FINT, double *, FINT); - void F77_dtbsv( FCHAR, FCHAR, FCHAR, FINT, FINT, const double *, FINT, double *, FINT); - void F77_dtpmv( FCHAR, FCHAR, FCHAR, FINT, const double *, double *, FINT); - void F77_dtpsv( FCHAR, FCHAR, FCHAR, FINT, const double *, double *, FINT); - void F77_dger( FINT, FINT, const double *, const double *, FINT, const double *, FINT, double *, FINT); - void F77_dsyr(FCHAR, FINT, const double *, const double *, FINT, double *, FINT); - void F77_dspr(FCHAR, FINT, const double *, const double *, FINT, double *); - void F77_dspr2(FCHAR, FINT, const double *, const double *, FINT, const double *, FINT, double *); - void F77_dsyr2(FCHAR, FINT, const double *, const double *, FINT, const double *, FINT, double *, FINT); - -/* Single Complex Precision */ - - void F77_cgemv(FCHAR, FINT, FINT, const void *, const void *, FINT, const void *, FINT, const void *, void *, FINT); - void F77_cgbmv(FCHAR, FINT, FINT, FINT, FINT, const void *, const void *, FINT, const void *, FINT, const void *, void *, FINT); - void F77_chemv(FCHAR, FINT, const void *, const void *, FINT, const void *, FINT, const void *, void *, FINT); - void F77_chbmv(FCHAR, FINT, FINT, const void *, const void *, FINT, const void *, FINT, const void *, void *, FINT); - void F77_chpmv(FCHAR, FINT, const void *, const void *, const void *, FINT, const void *, void *, FINT); - void F77_ctrmv( FCHAR, FCHAR, FCHAR, FINT, const void *, FINT, void *, FINT); - void F77_ctbmv( FCHAR, FCHAR, FCHAR, FINT, FINT, const void *, FINT, void *, FINT); - void F77_ctpmv( FCHAR, FCHAR, FCHAR, FINT, const void *, void *, FINT); - void F77_ctrsv( FCHAR, FCHAR, FCHAR, FINT, const void *, FINT, void *, FINT); - void F77_ctbsv( FCHAR, FCHAR, FCHAR, FINT, FINT, const void *, FINT, void *, FINT); - void F77_ctpsv( FCHAR, FCHAR, FCHAR, FINT, const void *, void *,FINT); - void F77_cgerc( FINT, FINT, const void *, const void *, FINT, const void *, FINT, void *, FINT); - void F77_cgeru( FINT, FINT, const void *, const void *, FINT, const void *, FINT, void *, FINT); - void F77_cher(FCHAR, FINT, const float *, const void *, FINT, void *, FINT); - void F77_cher2(FCHAR, FINT, const void *, const void *, FINT, const void *, FINT, void *, FINT); - void F77_chpr(FCHAR, FINT, const float *, const void *, FINT, void *); - void F77_chpr2(FCHAR, FINT, const float *, const void *, FINT, const void *, FINT, void *); - -/* Double Complex Precision */ - - void F77_zgemv(FCHAR, FINT, FINT, const void *, const void *, FINT, const void *, FINT, const void *, void *, FINT); - void F77_zgbmv(FCHAR, FINT, FINT, FINT, FINT, const void *, const void *, FINT, const void *, FINT, const void *, void *, FINT); - void F77_zhemv(FCHAR, FINT, const void *, const void *, FINT, const void *, FINT, const void *, void *, FINT); - void F77_zhbmv(FCHAR, FINT, FINT, const void *, const void *, FINT, const void *, FINT, const void *, void *, FINT); - void F77_zhpmv(FCHAR, FINT, const void *, const void *, const void *, FINT, const void *, void *, FINT); - void F77_ztrmv( FCHAR, FCHAR, FCHAR, FINT, const void *, FINT, void *, FINT); - void F77_ztbmv( FCHAR, FCHAR, FCHAR, FINT, FINT, const void *, FINT, void *, FINT); - void F77_ztpmv( FCHAR, FCHAR, FCHAR, FINT, const void *, void *, FINT); - void F77_ztrsv( FCHAR, FCHAR, FCHAR, FINT, const void *, FINT, void *, FINT); - void F77_ztbsv( FCHAR, FCHAR, FCHAR, FINT, FINT, const void *, FINT, void *, FINT); - void F77_ztpsv( FCHAR, FCHAR, FCHAR, FINT, const void *, void *,FINT); - void F77_zgerc( FINT, FINT, const void *, const void *, FINT, const void *, FINT, void *, FINT); - void F77_zgeru( FINT, FINT, const void *, const void *, FINT, const void *, FINT, void *, FINT); - void F77_zher(FCHAR, FINT, const double *, const void *, FINT, void *, FINT); - void F77_zher2(FCHAR, FINT, const void *, const void *, FINT, const void *, FINT, void *, FINT); - void F77_zhpr(FCHAR, FINT, const double *, const void *, FINT, void *); - void F77_zhpr2(FCHAR, FINT, const double *, const void *, FINT, const void *, FINT, void *); - -/* - * Level 3 Fortran Prototypes - */ - -/* Single Precision */ - - void F77_sgemm(FCHAR, FCHAR, FINT, FINT, FINT, const float *, const float *, FINT, const float *, FINT, const float *, float *, FINT); - void F77_ssymm(FCHAR, FCHAR, FINT, FINT, const float *, const float *, FINT, const float *, FINT, const float *, float *, FINT); - void F77_ssyrk(FCHAR, FCHAR, FINT, FINT, const float *, const float *, FINT, const float *, float *, FINT); - void F77_ssyr2k(FCHAR, FCHAR, FINT, FINT, const float *, const float *, FINT, const float *, FINT, const float *, float *, FINT); - void F77_strmm(FCHAR, FCHAR, FCHAR, FCHAR, FINT, FINT, const float *, const float *, FINT, float *, FINT); - void F77_strsm(FCHAR, FCHAR, FCHAR, FCHAR, FINT, FINT, const float *, const float *, FINT, float *, FINT); - -/* Double Precision */ - - void F77_dgemm(FCHAR, FCHAR, FINT, FINT, FINT, const double *, const double *, FINT, const double *, FINT, const double *, double *, FINT); - void F77_dsymm(FCHAR, FCHAR, FINT, FINT, const double *, const double *, FINT, const double *, FINT, const double *, double *, FINT); - void F77_dsyrk(FCHAR, FCHAR, FINT, FINT, const double *, const double *, FINT, const double *, double *, FINT); - void F77_dsyr2k(FCHAR, FCHAR, FINT, FINT, const double *, const double *, FINT, const double *, FINT, const double *, double *, FINT); - void F77_dtrmm(FCHAR, FCHAR, FCHAR, FCHAR, FINT, FINT, const double *, const double *, FINT, double *, FINT); - void F77_dtrsm(FCHAR, FCHAR, FCHAR, FCHAR, FINT, FINT, const double *, const double *, FINT, double *, FINT); - -/* Single Complex Precision */ - - void F77_cgemm(FCHAR, FCHAR, FINT, FINT, FINT, const float *, const float *, FINT, const float *, FINT, const float *, float *, FINT); - void F77_csymm(FCHAR, FCHAR, FINT, FINT, const float *, const float *, FINT, const float *, FINT, const float *, float *, FINT); - void F77_chemm(FCHAR, FCHAR, FINT, FINT, const float *, const float *, FINT, const float *, FINT, const float *, float *, FINT); - void F77_csyrk(FCHAR, FCHAR, FINT, FINT, const float *, const float *, FINT, const float *, float *, FINT); - void F77_cherk(FCHAR, FCHAR, FINT, FINT, const float *, const float *, FINT, const float *, float *, FINT); - void F77_csyr2k(FCHAR, FCHAR, FINT, FINT, const float *, const float *, FINT, const float *, FINT, const float *, float *, FINT); - void F77_cher2k(FCHAR, FCHAR, FINT, FINT, const float *, const float *, FINT, const float *, FINT, const float *, float *, FINT); - void F77_ctrmm(FCHAR, FCHAR, FCHAR, FCHAR, FINT, FINT, const float *, const float *, FINT, float *, FINT); - void F77_ctrsm(FCHAR, FCHAR, FCHAR, FCHAR, FINT, FINT, const float *, const float *, FINT, float *, FINT); - -/* Double Complex Precision */ - - void F77_zgemm(FCHAR, FCHAR, FINT, FINT, FINT, const double *, const double *, FINT, const double *, FINT, const double *, double *, FINT); - void F77_zsymm(FCHAR, FCHAR, FINT, FINT, const double *, const double *, FINT, const double *, FINT, const double *, double *, FINT); - void F77_zhemm(FCHAR, FCHAR, FINT, FINT, const double *, const double *, FINT, const double *, FINT, const double *, double *, FINT); - void F77_zsyrk(FCHAR, FCHAR, FINT, FINT, const double *, const double *, FINT, const double *, double *, FINT); - void F77_zherk(FCHAR, FCHAR, FINT, FINT, const double *, const double *, FINT, const double *, double *, FINT); - void F77_zsyr2k(FCHAR, FCHAR, FINT, FINT, const double *, const double *, FINT, const double *, FINT, const double *, double *, FINT); - void F77_zher2k(FCHAR, FCHAR, FINT, FINT, const double *, const double *, FINT, const double *, FINT, const double *, double *, FINT); - void F77_ztrmm(FCHAR, FCHAR, FCHAR, FCHAR, FINT, FINT, const double *, const double *, FINT, double *, FINT); - void F77_ztrsm(FCHAR, FCHAR, FCHAR, FCHAR, FINT, FINT, const double *, const double *, FINT, double *, FINT); - -#ifdef __cplusplus -} -#endif +* Level 3 BLAS +*/ +#define F77_chemm chemm_ +#define F77_cherk cherk_ +#define F77_cher2k cher2k_ +#define F77_zhemm zhemm_ +#define F77_zherk zherk_ +#define F77_zher2k zher2k_ +#define F77_sgemm sgemm_ +#define F77_ssymm ssymm_ +#define F77_ssyrk ssyrk_ +#define F77_ssyr2k ssyr2k_ +#define F77_strmm strmm_ +#define F77_strsm strsm_ +#define F77_dgemm dgemm_ +#define F77_dsymm dsymm_ +#define F77_dsyrk dsyrk_ +#define F77_dsyr2k dsyr2k_ +#define F77_dtrmm dtrmm_ +#define F77_dtrsm dtrsm_ +#define F77_cgemm cgemm_ +#define F77_csymm csymm_ +#define F77_csyrk csyrk_ +#define F77_csyr2k csyr2k_ +#define F77_ctrmm ctrmm_ +#define F77_ctrsm ctrsm_ +#define F77_zgemm zgemm_ +#define F77_zsymm zsymm_ +#define F77_zsyrk zsyrk_ +#define F77_zsyr2k zsyr2k_ +#define F77_ztrmm ztrmm_ +#define F77_ztrsm ztrsm_ #endif /* CBLAS_F77_H */ diff --git a/frame/compat/cblas/src/cblas_globals.c b/frame/compat/cblas/src/cblas_globals.c index e0d1afd93..b779d3c3f 100644 --- a/frame/compat/cblas/src/cblas_globals.c +++ b/frame/compat/cblas/src/cblas_globals.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS int CBLAS_CallFromC=0; int RowMajorStrg=0; diff --git a/frame/compat/cblas/src/cblas_icamax.c b/frame/compat/cblas/src/cblas_icamax.c index 5ca481f04..536a321f0 100644 --- a/frame/compat/cblas/src/cblas_icamax.c +++ b/frame/compat/cblas/src/cblas_icamax.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_icamax.c @@ -15,7 +11,7 @@ */ #include "cblas.h" #include "cblas_f77.h" -CBLAS_INDEX cblas_icamax( const int N, const void *X, const int incX) +f77_int cblas_icamax( f77_int N, const void *X, f77_int incX) { f77_int iamax; #ifdef F77_INT @@ -24,7 +20,7 @@ CBLAS_INDEX cblas_icamax( const int N, const void *X, const int incX) #define F77_N N #define F77_incX incX #endif - F77_icamax_sub( &F77_N, X, &F77_incX, &iamax); + F77_icamax_sub( &F77_N, (scomplex*)X, &F77_incX, &iamax); return iamax ? iamax-1 : 0; } #endif diff --git a/frame/compat/cblas/src/cblas_idamax.c b/frame/compat/cblas/src/cblas_idamax.c index 982cae781..8769352cf 100644 --- a/frame/compat/cblas/src/cblas_idamax.c +++ b/frame/compat/cblas/src/cblas_idamax.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_idamax.c @@ -15,7 +11,7 @@ */ #include "cblas.h" #include "cblas_f77.h" -CBLAS_INDEX cblas_idamax( const int N, const double *X, const int incX) +f77_int cblas_idamax( f77_int N, const double *X, f77_int incX) { f77_int iamax; #ifdef F77_INT diff --git a/frame/compat/cblas/src/cblas_isamax.c b/frame/compat/cblas/src/cblas_isamax.c index 3edf1bb65..dcc3f1e09 100644 --- a/frame/compat/cblas/src/cblas_isamax.c +++ b/frame/compat/cblas/src/cblas_isamax.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_isamax.c @@ -15,7 +11,7 @@ */ #include "cblas.h" #include "cblas_f77.h" -CBLAS_INDEX cblas_isamax( const int N, const float *X, const int incX) +f77_int cblas_isamax( f77_int N, const float *X, f77_int incX) { f77_int iamax; #ifdef F77_INT diff --git a/frame/compat/cblas/src/cblas_izamax.c b/frame/compat/cblas/src/cblas_izamax.c index 6ec1b28a3..3dcd4c1b8 100644 --- a/frame/compat/cblas/src/cblas_izamax.c +++ b/frame/compat/cblas/src/cblas_izamax.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_izamax.c @@ -15,7 +11,7 @@ */ #include "cblas.h" #include "cblas_f77.h" -CBLAS_INDEX cblas_izamax( const int N, const void *X, const int incX) +f77_int cblas_izamax( f77_int N, const void *X, f77_int incX) { f77_int iamax; #ifdef F77_INT @@ -24,7 +20,7 @@ CBLAS_INDEX cblas_izamax( const int N, const void *X, const int incX) #define F77_N N #define F77_incX incX #endif - F77_izamax_sub( &F77_N, X, &F77_incX, &iamax); + F77_izamax_sub( &F77_N, (dcomplex*)X, &F77_incX, &iamax); return (iamax ? iamax-1 : 0); } #endif diff --git a/frame/compat/cblas/src/cblas_sasum.c b/frame/compat/cblas/src/cblas_sasum.c index ddf4689f5..7d0e637b8 100644 --- a/frame/compat/cblas/src/cblas_sasum.c +++ b/frame/compat/cblas/src/cblas_sasum.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_sasum.c @@ -15,7 +11,7 @@ */ #include "cblas.h" #include "cblas_f77.h" -float cblas_sasum( const int N, const float *X, const int incX) +float cblas_sasum( f77_int N, const float *X, f77_int incX) { float asum; #ifdef F77_INT diff --git a/frame/compat/cblas/src/cblas_saxpy.c b/frame/compat/cblas/src/cblas_saxpy.c index 2b0b77375..b7f2b2d4e 100644 --- a/frame/compat/cblas/src/cblas_saxpy.c +++ b/frame/compat/cblas/src/cblas_saxpy.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_saxpy.c @@ -15,8 +11,8 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_saxpy( const int N, const float alpha, const float *X, - const int incX, float *Y, const int incY) +void cblas_saxpy( f77_int N, float alpha, const float *X, + f77_int incX, float *Y, f77_int incY) { #ifdef F77_INT F77_INT F77_N=N, F77_incX=incX, F77_incY=incY; diff --git a/frame/compat/cblas/src/cblas_scasum.c b/frame/compat/cblas/src/cblas_scasum.c index de3b4d6d9..32c958749 100644 --- a/frame/compat/cblas/src/cblas_scasum.c +++ b/frame/compat/cblas/src/cblas_scasum.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_scasum.c @@ -15,7 +11,7 @@ */ #include "cblas.h" #include "cblas_f77.h" -float cblas_scasum( const int N, const void *X, const int incX) +float cblas_scasum( f77_int N, const void *X, f77_int incX) { float asum; #ifdef F77_INT diff --git a/frame/compat/cblas/src/cblas_scnrm2.c b/frame/compat/cblas/src/cblas_scnrm2.c index 012fd63fd..0e24c805c 100644 --- a/frame/compat/cblas/src/cblas_scnrm2.c +++ b/frame/compat/cblas/src/cblas_scnrm2.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_scnrm2.c @@ -15,7 +11,7 @@ */ #include "cblas.h" #include "cblas_f77.h" -float cblas_scnrm2( const int N, const void *X, const int incX) +float cblas_scnrm2( f77_int N, const void *X, f77_int incX) { float nrm2; #ifdef F77_INT diff --git a/frame/compat/cblas/src/cblas_scopy.c b/frame/compat/cblas/src/cblas_scopy.c index 586965561..f54343ff1 100644 --- a/frame/compat/cblas/src/cblas_scopy.c +++ b/frame/compat/cblas/src/cblas_scopy.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_scopy.c @@ -14,8 +10,8 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_scopy( const int N, const float *X, - const int incX, float *Y, const int incY) +void cblas_scopy( f77_int N, const float *X, + f77_int incX, float *Y, f77_int incY) { #ifdef F77_INT F77_INT F77_N=N, F77_incX=incX, F77_incY=incY; diff --git a/frame/compat/cblas/src/cblas_sdot.c b/frame/compat/cblas/src/cblas_sdot.c index e29088317..bbf355887 100644 --- a/frame/compat/cblas/src/cblas_sdot.c +++ b/frame/compat/cblas/src/cblas_sdot.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_sdot.c @@ -15,8 +11,8 @@ */ #include "cblas.h" #include "cblas_f77.h" -float cblas_sdot( const int N, const float *X, - const int incX, const float *Y, const int incY) +float cblas_sdot( f77_int N, const float *X, + f77_int incX, const float *Y, f77_int incY) { float dot; #ifdef F77_INT diff --git a/frame/compat/cblas/src/cblas_sdsdot.c b/frame/compat/cblas/src/cblas_sdsdot.c index f4fb4bf87..bfe8644aa 100644 --- a/frame/compat/cblas/src/cblas_sdsdot.c +++ b/frame/compat/cblas/src/cblas_sdsdot.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_sdsdot.c @@ -15,8 +11,8 @@ */ #include "cblas.h" #include "cblas_f77.h" -float cblas_sdsdot( const int N, const float alpha, const float *X, - const int incX, const float *Y, const int incY) +float cblas_sdsdot( f77_int N, float alpha, const float *X, + f77_int incX, const float *Y, f77_int incY) { float dot; #ifdef F77_INT diff --git a/frame/compat/cblas/src/cblas_sgbmv.c b/frame/compat/cblas/src/cblas_sgbmv.c index ae38667d5..8bf944f9d 100644 --- a/frame/compat/cblas/src/cblas_sgbmv.c +++ b/frame/compat/cblas/src/cblas_sgbmv.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * @@ -15,12 +11,12 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_sgbmv(const enum CBLAS_ORDER order, - const enum CBLAS_TRANSPOSE TransA, const int M, const int N, - const int KL, const int KU, - const float alpha, const float *A, const int lda, - const float *X, const int incX, const float beta, - float *Y, const int incY) +void cblas_sgbmv(enum CBLAS_ORDER order, + enum CBLAS_TRANSPOSE TransA, f77_int M, f77_int N, + f77_int KL, f77_int KU, + float alpha, const float *A, f77_int lda, + const float *X, f77_int incX, float beta, + float *Y, f77_int incY) { char TA; #ifdef F77_CHAR diff --git a/frame/compat/cblas/src/cblas_sgemm.c b/frame/compat/cblas/src/cblas_sgemm.c index 026524aec..89d0f07a8 100644 --- a/frame/compat/cblas/src/cblas_sgemm.c +++ b/frame/compat/cblas/src/cblas_sgemm.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * @@ -15,11 +11,11 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_sgemm(const enum CBLAS_ORDER Order, const enum CBLAS_TRANSPOSE TransA, - const enum CBLAS_TRANSPOSE TransB, const int M, const int N, - const int K, const float alpha, const float *A, - const int lda, const float *B, const int ldb, - const float beta, float *C, const int ldc) +void cblas_sgemm(enum CBLAS_ORDER Order, enum CBLAS_TRANSPOSE TransA, + enum CBLAS_TRANSPOSE TransB, f77_int M, f77_int N, + f77_int K, float alpha, const float *A, + f77_int lda, const float *B, f77_int ldb, + float beta, float *C, f77_int ldc) { char TA, TB; #ifdef F77_CHAR diff --git a/frame/compat/cblas/src/cblas_sgemv.c b/frame/compat/cblas/src/cblas_sgemv.c index 7ad22bc89..552140fec 100644 --- a/frame/compat/cblas/src/cblas_sgemv.c +++ b/frame/compat/cblas/src/cblas_sgemv.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * @@ -14,11 +10,11 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_sgemv(const enum CBLAS_ORDER order, - const enum CBLAS_TRANSPOSE TransA, const int M, const int N, - const float alpha, const float *A, const int lda, - const float *X, const int incX, const float beta, - float *Y, const int incY) +void cblas_sgemv(enum CBLAS_ORDER order, + enum CBLAS_TRANSPOSE TransA, f77_int M, f77_int N, + float alpha, const float *A, f77_int lda, + const float *X, f77_int incX, float beta, + float *Y, f77_int incY) { char TA; #ifdef F77_CHAR diff --git a/frame/compat/cblas/src/cblas_sger.c b/frame/compat/cblas/src/cblas_sger.c index f13753724..0617bad1e 100644 --- a/frame/compat/cblas/src/cblas_sger.c +++ b/frame/compat/cblas/src/cblas_sger.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * @@ -15,9 +11,9 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_sger(const enum CBLAS_ORDER order, const int M, const int N, - const float alpha, const float *X, const int incX, - const float *Y, const int incY, float *A, const int lda) +void cblas_sger(enum CBLAS_ORDER order, f77_int M, f77_int N, + const float alpha, const float *X, f77_int incX, + const float *Y, f77_int incY, float *A, f77_int lda) { #ifdef F77_INT F77_INT F77_M=M, F77_N=N, F77_lda=lda, F77_incX=incX, F77_incY=incY; diff --git a/frame/compat/cblas/src/cblas_snrm2.c b/frame/compat/cblas/src/cblas_snrm2.c index cae230cca..7c0fd160a 100644 --- a/frame/compat/cblas/src/cblas_snrm2.c +++ b/frame/compat/cblas/src/cblas_snrm2.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_snrm2.c @@ -15,7 +11,7 @@ */ #include "cblas.h" #include "cblas_f77.h" -float cblas_snrm2( const int N, const float *X, const int incX) +float cblas_snrm2( f77_int N, const float *X, f77_int incX) { float nrm2; #ifdef F77_INT diff --git a/frame/compat/cblas/src/cblas_srot.c b/frame/compat/cblas/src/cblas_srot.c index d5b875803..b9e7ede46 100644 --- a/frame/compat/cblas/src/cblas_srot.c +++ b/frame/compat/cblas/src/cblas_srot.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_srot.c @@ -14,8 +10,8 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_srot( const int N, float *X, const int incX, float *Y, - const int incY, const float c, const float s) +void cblas_srot( f77_int N, float *X, f77_int incX, float *Y, + f77_int incY, const float c, const float s) { #ifdef F77_INT F77_INT F77_N=N, F77_incX=incX, F77_incY=incY; diff --git a/frame/compat/cblas/src/cblas_srotg.c b/frame/compat/cblas/src/cblas_srotg.c index ad25895ea..165497f7e 100644 --- a/frame/compat/cblas/src/cblas_srotg.c +++ b/frame/compat/cblas/src/cblas_srotg.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_srotg.c diff --git a/frame/compat/cblas/src/cblas_srotm.c b/frame/compat/cblas/src/cblas_srotm.c index 08be377aa..ce417d769 100644 --- a/frame/compat/cblas/src/cblas_srotm.c +++ b/frame/compat/cblas/src/cblas_srotm.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_srotm.c @@ -14,8 +10,8 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_srotm( const int N, float *X, const int incX, float *Y, - const int incY, const float *P) +void cblas_srotm( f77_int N, float *X, f77_int incX, float *Y, + f77_int incY, const float *P) { #ifdef F77_INT F77_INT F77_N=N, F77_incX=incX, F77_incY=incY; diff --git a/frame/compat/cblas/src/cblas_srotmg.c b/frame/compat/cblas/src/cblas_srotmg.c index 532926bd1..7f26ac659 100644 --- a/frame/compat/cblas/src/cblas_srotmg.c +++ b/frame/compat/cblas/src/cblas_srotmg.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_srotmg.c diff --git a/frame/compat/cblas/src/cblas_ssbmv.c b/frame/compat/cblas/src/cblas_ssbmv.c index eedd8a8d1..ef8a96cfb 100644 --- a/frame/compat/cblas/src/cblas_ssbmv.c +++ b/frame/compat/cblas/src/cblas_ssbmv.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * @@ -14,10 +10,10 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_ssbmv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const int N, const int K, const float alpha, const float *A, - const int lda, const float *X, const int incX, - const float beta, float *Y, const int incY) +void cblas_ssbmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + f77_int N, f77_int K, float alpha, const float *A, + f77_int lda, const float *X, f77_int incX, + float beta, float *Y, f77_int incY) { char UL; #ifdef F77_CHAR diff --git a/frame/compat/cblas/src/cblas_sscal.c b/frame/compat/cblas/src/cblas_sscal.c index a8b1e35ec..55547ae64 100644 --- a/frame/compat/cblas/src/cblas_sscal.c +++ b/frame/compat/cblas/src/cblas_sscal.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_sscal.c @@ -14,8 +10,8 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_sscal( const int N, const float alpha, float *X, - const int incX) +void cblas_sscal( f77_int N, float alpha, float *X, + f77_int incX) { #ifdef F77_INT F77_INT F77_N=N, F77_incX=incX; diff --git a/frame/compat/cblas/src/cblas_sspmv.c b/frame/compat/cblas/src/cblas_sspmv.c index b53c6da5a..a54f64214 100644 --- a/frame/compat/cblas/src/cblas_sspmv.c +++ b/frame/compat/cblas/src/cblas_sspmv.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * @@ -14,11 +10,11 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_sspmv(const enum CBLAS_ORDER order, - const enum CBLAS_UPLO Uplo, const int N, - const float alpha, const float *AP, - const float *X, const int incX, const float beta, - float *Y, const int incY) +void cblas_sspmv(enum CBLAS_ORDER order, + enum CBLAS_UPLO Uplo, f77_int N, + float alpha, const float *AP, + const float *X, f77_int incX, float beta, + float *Y, f77_int incY) { char UL; #ifdef F77_CHAR diff --git a/frame/compat/cblas/src/cblas_sspr.c b/frame/compat/cblas/src/cblas_sspr.c index 015c131d2..693dbba8c 100644 --- a/frame/compat/cblas/src/cblas_sspr.c +++ b/frame/compat/cblas/src/cblas_sspr.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * @@ -15,9 +11,9 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_sspr(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const int N, const float alpha, const float *X, - const int incX, float *Ap) +void cblas_sspr(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + f77_int N, const float alpha, const float *X, + f77_int incX, float *Ap) { char UL; #ifdef F77_CHAR diff --git a/frame/compat/cblas/src/cblas_sspr2.c b/frame/compat/cblas/src/cblas_sspr2.c index 35f095917..a4b612897 100644 --- a/frame/compat/cblas/src/cblas_sspr2.c +++ b/frame/compat/cblas/src/cblas_sspr2.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * @@ -15,9 +11,9 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_sspr2(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const int N, const float alpha, const float *X, - const int incX, const float *Y, const int incY, float *A) +void cblas_sspr2(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + f77_int N, const float alpha, const float *X, + f77_int incX, const float *Y, f77_int incY, float *A) { char UL; #ifdef F77_CHAR diff --git a/frame/compat/cblas/src/cblas_sswap.c b/frame/compat/cblas/src/cblas_sswap.c index fd751cda2..2c24ad0fa 100644 --- a/frame/compat/cblas/src/cblas_sswap.c +++ b/frame/compat/cblas/src/cblas_sswap.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_sswap.c @@ -14,8 +10,8 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_sswap( const int N, float *X, const int incX, float *Y, - const int incY) +void cblas_sswap( f77_int N, float *X, f77_int incX, float *Y, + f77_int incY) { #ifdef F77_INT F77_INT F77_N=N, F77_incX=incX, F77_incY=incY; diff --git a/frame/compat/cblas/src/cblas_ssymm.c b/frame/compat/cblas/src/cblas_ssymm.c index b795ebb90..218ddba6a 100644 --- a/frame/compat/cblas/src/cblas_ssymm.c +++ b/frame/compat/cblas/src/cblas_ssymm.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * @@ -15,11 +11,11 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_ssymm(const enum CBLAS_ORDER Order, const enum CBLAS_SIDE Side, - const enum CBLAS_UPLO Uplo, const int M, const int N, - const float alpha, const float *A, const int lda, - const float *B, const int ldb, const float beta, - float *C, const int ldc) +void cblas_ssymm(enum CBLAS_ORDER Order, enum CBLAS_SIDE Side, + enum CBLAS_UPLO Uplo, f77_int M, f77_int N, + float alpha, const float *A, f77_int lda, + const float *B, f77_int ldb, float beta, + float *C, f77_int ldc) { char SD, UL; #ifdef F77_CHAR diff --git a/frame/compat/cblas/src/cblas_ssymv.c b/frame/compat/cblas/src/cblas_ssymv.c index a85497f96..6027aaddf 100644 --- a/frame/compat/cblas/src/cblas_ssymv.c +++ b/frame/compat/cblas/src/cblas_ssymv.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * @@ -15,11 +11,11 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_ssymv(const enum CBLAS_ORDER order, - const enum CBLAS_UPLO Uplo, const int N, - const float alpha, const float *A, const int lda, - const float *X, const int incX, const float beta, - float *Y, const int incY) +void cblas_ssymv(enum CBLAS_ORDER order, + enum CBLAS_UPLO Uplo, f77_int N, + float alpha, const float *A, f77_int lda, + const float *X, f77_int incX, float beta, + float *Y, f77_int incY) { char UL; #ifdef F77_CHAR diff --git a/frame/compat/cblas/src/cblas_ssyr.c b/frame/compat/cblas/src/cblas_ssyr.c index 1e982ef8d..14ed8fe54 100644 --- a/frame/compat/cblas/src/cblas_ssyr.c +++ b/frame/compat/cblas/src/cblas_ssyr.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * @@ -14,9 +10,9 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_ssyr(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const int N, const float alpha, const float *X, - const int incX, float *A, const int lda) +void cblas_ssyr(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + f77_int N, const float alpha, const float *X, + f77_int incX, float *A, f77_int lda) { char UL; #ifdef F77_CHAR diff --git a/frame/compat/cblas/src/cblas_ssyr2.c b/frame/compat/cblas/src/cblas_ssyr2.c index f55136317..48263f2ae 100644 --- a/frame/compat/cblas/src/cblas_ssyr2.c +++ b/frame/compat/cblas/src/cblas_ssyr2.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * @@ -15,10 +11,10 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_ssyr2(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const int N, const float alpha, const float *X, - const int incX, const float *Y, const int incY, float *A, - const int lda) +void cblas_ssyr2(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + f77_int N, const float alpha, const float *X, + f77_int incX, const float *Y, f77_int incY, float *A, + f77_int lda) { char UL; #ifdef F77_CHAR diff --git a/frame/compat/cblas/src/cblas_ssyr2k.c b/frame/compat/cblas/src/cblas_ssyr2k.c index 5153beae5..50cf8bf1d 100644 --- a/frame/compat/cblas/src/cblas_ssyr2k.c +++ b/frame/compat/cblas/src/cblas_ssyr2k.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * @@ -15,11 +11,11 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_ssyr2k(const enum CBLAS_ORDER Order, const enum CBLAS_UPLO Uplo, - const enum CBLAS_TRANSPOSE Trans, const int N, const int K, - const float alpha, const float *A, const int lda, - const float *B, const int ldb, const float beta, - float *C, const int ldc) +void cblas_ssyr2k(enum CBLAS_ORDER Order, enum CBLAS_UPLO Uplo, + enum CBLAS_TRANSPOSE Trans, f77_int N, f77_int K, + float alpha, const float *A, f77_int lda, + const float *B, f77_int ldb, float beta, + float *C, f77_int ldc) { char UL, TR; #ifdef F77_CHAR diff --git a/frame/compat/cblas/src/cblas_ssyrk.c b/frame/compat/cblas/src/cblas_ssyrk.c index efe1d3be6..6f486870f 100644 --- a/frame/compat/cblas/src/cblas_ssyrk.c +++ b/frame/compat/cblas/src/cblas_ssyrk.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * @@ -15,10 +11,10 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_ssyrk(const enum CBLAS_ORDER Order, const enum CBLAS_UPLO Uplo, - const enum CBLAS_TRANSPOSE Trans, const int N, const int K, - const float alpha, const float *A, const int lda, - const float beta, float *C, const int ldc) +void cblas_ssyrk(enum CBLAS_ORDER Order, enum CBLAS_UPLO Uplo, + enum CBLAS_TRANSPOSE Trans, f77_int N, f77_int K, + float alpha, const float *A, f77_int lda, + float beta, float *C, f77_int ldc) { char UL, TR; #ifdef F77_CHAR diff --git a/frame/compat/cblas/src/cblas_stbmv.c b/frame/compat/cblas/src/cblas_stbmv.c index f0799ccf3..15daa49da 100644 --- a/frame/compat/cblas/src/cblas_stbmv.c +++ b/frame/compat/cblas/src/cblas_stbmv.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_stbmv.c @@ -13,10 +9,10 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_stbmv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const enum CBLAS_TRANSPOSE TransA, const enum CBLAS_DIAG Diag, - const int N, const int K, const float *A, const int lda, - float *X, const int incX) +void cblas_stbmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, + f77_int N, f77_int K, const float *A, f77_int lda, + float *X, f77_int incX) { char TA; char UL; diff --git a/frame/compat/cblas/src/cblas_stbsv.c b/frame/compat/cblas/src/cblas_stbsv.c index ab4f44b53..ec9d9c844 100644 --- a/frame/compat/cblas/src/cblas_stbsv.c +++ b/frame/compat/cblas/src/cblas_stbsv.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_stbsv.c @@ -13,10 +9,10 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_stbsv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const enum CBLAS_TRANSPOSE TransA, const enum CBLAS_DIAG Diag, - const int N, const int K, const float *A, const int lda, - float *X, const int incX) +void cblas_stbsv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, + f77_int N, f77_int K, const float *A, f77_int lda, + float *X, f77_int incX) { char TA; char UL; diff --git a/frame/compat/cblas/src/cblas_stpmv.c b/frame/compat/cblas/src/cblas_stpmv.c index 605de03de..91b308176 100644 --- a/frame/compat/cblas/src/cblas_stpmv.c +++ b/frame/compat/cblas/src/cblas_stpmv.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * @@ -14,9 +10,9 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_stpmv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const enum CBLAS_TRANSPOSE TransA, const enum CBLAS_DIAG Diag, - const int N, const float *Ap, float *X, const int incX) +void cblas_stpmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, + f77_int N, const float *Ap, float *X, f77_int incX) { char TA; char UL; diff --git a/frame/compat/cblas/src/cblas_stpsv.c b/frame/compat/cblas/src/cblas_stpsv.c index ba3b599ec..548eaec79 100644 --- a/frame/compat/cblas/src/cblas_stpsv.c +++ b/frame/compat/cblas/src/cblas_stpsv.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_stpsv.c @@ -13,9 +9,9 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_stpsv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const enum CBLAS_TRANSPOSE TransA, const enum CBLAS_DIAG Diag, - const int N, const float *Ap, float *X, const int incX) +void cblas_stpsv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, + f77_int N, const float *Ap, float *X, f77_int incX) { char TA; char UL; diff --git a/frame/compat/cblas/src/cblas_strmm.c b/frame/compat/cblas/src/cblas_strmm.c index 810bce9d3..a7737109b 100644 --- a/frame/compat/cblas/src/cblas_strmm.c +++ b/frame/compat/cblas/src/cblas_strmm.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * @@ -15,11 +11,11 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_strmm(const enum CBLAS_ORDER Order, const enum CBLAS_SIDE Side, - const enum CBLAS_UPLO Uplo, const enum CBLAS_TRANSPOSE TransA, - const enum CBLAS_DIAG Diag, const int M, const int N, - const float alpha, const float *A, const int lda, - float *B, const int ldb) +void cblas_strmm(enum CBLAS_ORDER Order, enum CBLAS_SIDE Side, + enum CBLAS_UPLO Uplo, const enum CBLAS_TRANSPOSE TransA, + enum CBLAS_DIAG Diag, f77_int M, f77_int N, + float alpha, const float *A, f77_int lda, + float *B, f77_int ldb) { char UL, TA, SD, DI; #ifdef F77_CHAR diff --git a/frame/compat/cblas/src/cblas_strmv.c b/frame/compat/cblas/src/cblas_strmv.c index 8d216751f..987589eb7 100644 --- a/frame/compat/cblas/src/cblas_strmv.c +++ b/frame/compat/cblas/src/cblas_strmv.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * @@ -14,10 +10,10 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_strmv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const enum CBLAS_TRANSPOSE TransA, const enum CBLAS_DIAG Diag, - const int N, const float *A, const int lda, - float *X, const int incX) +void cblas_strmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, + f77_int N, const float *A, f77_int lda, + float *X, f77_int incX) { char TA; diff --git a/frame/compat/cblas/src/cblas_strsm.c b/frame/compat/cblas/src/cblas_strsm.c index 27be540e3..ef78969f0 100644 --- a/frame/compat/cblas/src/cblas_strsm.c +++ b/frame/compat/cblas/src/cblas_strsm.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * @@ -15,11 +11,11 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_strsm(const enum CBLAS_ORDER Order, const enum CBLAS_SIDE Side, - const enum CBLAS_UPLO Uplo, const enum CBLAS_TRANSPOSE TransA, - const enum CBLAS_DIAG Diag, const int M, const int N, - const float alpha, const float *A, const int lda, - float *B, const int ldb) +void cblas_strsm(enum CBLAS_ORDER Order, enum CBLAS_SIDE Side, + enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE TransA, + enum CBLAS_DIAG Diag, f77_int M, f77_int N, + float alpha, const float *A, f77_int lda, + float *B, f77_int ldb) { char UL, TA, SD, DI; diff --git a/frame/compat/cblas/src/cblas_strsv.c b/frame/compat/cblas/src/cblas_strsv.c index a497dfc38..a37c797b8 100644 --- a/frame/compat/cblas/src/cblas_strsv.c +++ b/frame/compat/cblas/src/cblas_strsv.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_strsv.c @@ -13,10 +9,10 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_strsv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const enum CBLAS_TRANSPOSE TransA, const enum CBLAS_DIAG Diag, - const int N, const float *A, const int lda, float *X, - const int incX) +void cblas_strsv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, + f77_int N, const float *A, f77_int lda, float *X, + f77_int incX) { char TA; diff --git a/frame/compat/cblas/src/cblas_xerbla.c b/frame/compat/cblas/src/cblas_xerbla.c index d377db30d..5d7908068 100644 --- a/frame/compat/cblas/src/cblas_xerbla.c +++ b/frame/compat/cblas/src/cblas_xerbla.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS #include #include @@ -11,7 +7,7 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_xerbla(int info, const char *rout, const char *form, ...) +void cblas_xerbla(f77_int info, const char *rout, const char *form, ...) { extern int RowMajorStrg; char empty[1] = ""; @@ -69,7 +65,7 @@ void cblas_xerbla(int info, const char *rout, const char *form, ...) vfprintf(stderr, form, argptr); va_end(argptr); if (info && !info) - F77_xerbla(empty, &info); /* Force link of our F77 error handler */ + F77_xerbla(empty, &info, 0); /* Force link of our F77 error handler */ exit(-1); } #endif diff --git a/frame/compat/cblas/src/cblas_zaxpy.c b/frame/compat/cblas/src/cblas_zaxpy.c index 73b1d2e44..dcf2f5c78 100644 --- a/frame/compat/cblas/src/cblas_zaxpy.c +++ b/frame/compat/cblas/src/cblas_zaxpy.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_zaxpy.c @@ -14,8 +10,8 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_zaxpy( const int N, const void *alpha, const void *X, - const int incX, void *Y, const int incY) +void cblas_zaxpy( f77_int N, const void *alpha, const void *X, + f77_int incX, void *Y, f77_int incY) { #ifdef F77_INT F77_INT F77_N=N, F77_incX=incX, F77_incY=incY; @@ -24,6 +20,6 @@ void cblas_zaxpy( const int N, const void *alpha, const void *X, #define F77_incX incX #define F77_incY incY #endif - F77_zaxpy( &F77_N, alpha, X, &F77_incX, Y, &F77_incY); + F77_zaxpy( &F77_N, (dcomplex*)alpha, (dcomplex*)X, &F77_incX, (dcomplex*)Y, &F77_incY); } #endif diff --git a/frame/compat/cblas/src/cblas_zcopy.c b/frame/compat/cblas/src/cblas_zcopy.c index 1a8d92fc8..5b0a7dd5d 100644 --- a/frame/compat/cblas/src/cblas_zcopy.c +++ b/frame/compat/cblas/src/cblas_zcopy.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_zcopy.c @@ -14,8 +10,8 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_zcopy( const int N, const void *X, - const int incX, void *Y, const int incY) +void cblas_zcopy( f77_int N, const void *X, + f77_int incX, void *Y, f77_int incY) { #ifdef F77_INT F77_INT F77_N=N, F77_incX=incX, F77_incY=incY; @@ -24,6 +20,6 @@ void cblas_zcopy( const int N, const void *X, #define F77_incX incX #define F77_incY incY #endif - F77_zcopy( &F77_N, X, &F77_incX, Y, &F77_incY); + F77_zcopy( &F77_N, (dcomplex*)X, &F77_incX, (dcomplex*)Y, &F77_incY); } #endif diff --git a/frame/compat/cblas/src/cblas_zdotc_sub.c b/frame/compat/cblas/src/cblas_zdotc_sub.c index 0dc0d1b2b..2e0808c88 100644 --- a/frame/compat/cblas/src/cblas_zdotc_sub.c +++ b/frame/compat/cblas/src/cblas_zdotc_sub.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_zdotc_sub.c @@ -15,8 +11,8 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_zdotc_sub( const int N, const void *X, const int incX, - const void *Y, const int incY, void *dotc) +void cblas_zdotc_sub( f77_int N, const void *X, f77_int incX, + const void *Y, f77_int incY, void *dotc) { #ifdef F77_INT F77_INT F77_N=N, F77_incX=incX, F77_incY=incY; @@ -25,7 +21,7 @@ void cblas_zdotc_sub( const int N, const void *X, const int incX, #define F77_incX incX #define F77_incY incY #endif - F77_zdotc_sub( &F77_N, X, &F77_incX, Y, &F77_incY, dotc); + F77_zdotc_sub( &F77_N, (dcomplex*)X, &F77_incX, (dcomplex*)Y, &F77_incY, (dcomplex*)dotc); return; } #endif diff --git a/frame/compat/cblas/src/cblas_zdotu_sub.c b/frame/compat/cblas/src/cblas_zdotu_sub.c index b1d95c6da..255ad833f 100644 --- a/frame/compat/cblas/src/cblas_zdotu_sub.c +++ b/frame/compat/cblas/src/cblas_zdotu_sub.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_zdotu_sub.c @@ -15,8 +11,8 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_zdotu_sub( const int N, const void *X, const int incX, - const void *Y, const int incY, void *dotu) +void cblas_zdotu_sub( f77_int N, const void *X, f77_int incX, + const void *Y, f77_int incY, void *dotu) { #ifdef F77_INT F77_INT F77_N=N, F77_incX=incX, F77_incY=incY; @@ -25,7 +21,7 @@ void cblas_zdotu_sub( const int N, const void *X, const int incX, #define F77_incX incX #define F77_incY incY #endif - F77_zdotu_sub( &F77_N, X, &F77_incX, Y, &F77_incY, dotu); + F77_zdotu_sub( &F77_N, (dcomplex*)X, &F77_incX, (dcomplex*)Y, &F77_incY, (dcomplex*)dotu); return; } #endif diff --git a/frame/compat/cblas/src/cblas_zdscal.c b/frame/compat/cblas/src/cblas_zdscal.c index eeced12da..9666e4509 100644 --- a/frame/compat/cblas/src/cblas_zdscal.c +++ b/frame/compat/cblas/src/cblas_zdscal.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_zdscal.c @@ -14,8 +10,8 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_zdscal( const int N, const double alpha, void *X, - const int incX) +void cblas_zdscal( f77_int N, double alpha, void *X, + f77_int incX) { #ifdef F77_INT F77_INT F77_N=N, F77_incX=incX; @@ -23,6 +19,6 @@ void cblas_zdscal( const int N, const double alpha, void *X, #define F77_N N #define F77_incX incX #endif - F77_zdscal( &F77_N, &alpha, X, &F77_incX); + F77_zdscal( &F77_N, &alpha, (dcomplex*)X, &F77_incX); } #endif diff --git a/frame/compat/cblas/src/cblas_zgbmv.c b/frame/compat/cblas/src/cblas_zgbmv.c index 19bdc8dec..f6efa4e7b 100644 --- a/frame/compat/cblas/src/cblas_zgbmv.c +++ b/frame/compat/cblas/src/cblas_zgbmv.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_zgbmv.c @@ -15,12 +11,12 @@ #include #include "cblas.h" #include "cblas_f77.h" -void cblas_zgbmv(const enum CBLAS_ORDER order, - const enum CBLAS_TRANSPOSE TransA, const int M, const int N, - const int KL, const int KU, - const void *alpha, const void *A, const int lda, - const void *X, const int incX, const void *beta, - void *Y, const int incY) +void cblas_zgbmv(enum CBLAS_ORDER order, + enum CBLAS_TRANSPOSE TransA, f77_int M, f77_int N, + f77_int KL, f77_int KU, + const void *alpha, const void *A, f77_int lda, + const void *X, f77_int incX, const void *beta, + void *Y, f77_int incY) { char TA; #ifdef F77_CHAR @@ -37,7 +33,7 @@ void cblas_zgbmv(const enum CBLAS_ORDER order, #define F77_lda lda #define F77_KL KL #define F77_KU KU - #define F77_incX incx + #define F77_incX incX #define F77_incY incY #endif int n, i=0; @@ -65,8 +61,8 @@ void cblas_zgbmv(const enum CBLAS_ORDER order, #ifdef F77_CHAR F77_TA = C2F_CHAR(&TA); #endif - F77_zgbmv(F77_TA, &F77_M, &F77_N, &F77_KL, &F77_KU, alpha, - A, &F77_lda, X, &F77_incX, beta, Y, &F77_incY); + F77_zgbmv(F77_TA, &F77_M, &F77_N, &F77_KL, &F77_KU, (dcomplex*)alpha, + (dcomplex*)A, &F77_lda, (dcomplex*)X, &F77_incX, (dcomplex*)beta, (dcomplex*)Y, &F77_incY); } else if (order == CblasRowMajor) { @@ -109,7 +105,7 @@ void cblas_zgbmv(const enum CBLAS_ORDER order, #ifdef F77_INT F77_incX = 1; #else - incx = 1; + incX = 1; #endif if( incY > 0 ) @@ -146,11 +142,11 @@ void cblas_zgbmv(const enum CBLAS_ORDER order, F77_TA = C2F_CHAR(&TA); #endif if (TransA == CblasConjTrans) - F77_zgbmv(F77_TA, &F77_N, &F77_M, &F77_KU, &F77_KL, ALPHA, - A ,&F77_lda, x,&F77_incX, BETA, Y, &F77_incY); + F77_zgbmv(F77_TA, &F77_N, &F77_M, &F77_KU, &F77_KL, (dcomplex*)ALPHA, + (dcomplex*)A ,&F77_lda, (dcomplex*)x,&F77_incX, (dcomplex*)BETA, (dcomplex*)Y, &F77_incY); else - F77_zgbmv(F77_TA, &F77_N, &F77_M, &F77_KU, &F77_KL, alpha, - A ,&F77_lda, x,&F77_incX, beta, Y, &F77_incY); + F77_zgbmv(F77_TA, &F77_N, &F77_M, &F77_KU, &F77_KL, (dcomplex*)alpha, + (dcomplex*)A ,&F77_lda, (dcomplex*)x,&F77_incX, (dcomplex*)beta, (dcomplex*)Y, &F77_incY); if (TransA == CblasConjTrans) { if (x != X) free(x); diff --git a/frame/compat/cblas/src/cblas_zgemm.c b/frame/compat/cblas/src/cblas_zgemm.c index f91ece49f..e50de2205 100644 --- a/frame/compat/cblas/src/cblas_zgemm.c +++ b/frame/compat/cblas/src/cblas_zgemm.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * @@ -15,11 +11,11 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_zgemm(const enum CBLAS_ORDER Order, const enum CBLAS_TRANSPOSE TransA, - const enum CBLAS_TRANSPOSE TransB, const int M, const int N, - const int K, const void *alpha, const void *A, - const int lda, const void *B, const int ldb, - const void *beta, void *C, const int ldc) +void cblas_zgemm(enum CBLAS_ORDER Order, enum CBLAS_TRANSPOSE TransA, + enum CBLAS_TRANSPOSE TransB, f77_int M, f77_int N, + f77_int K, const void *alpha, const void *A, + f77_int lda, const void *B, f77_int ldb, + const void *beta, void *C, f77_int ldc) { char TA, TB; #ifdef F77_CHAR @@ -75,8 +71,8 @@ void cblas_zgemm(const enum CBLAS_ORDER Order, const enum CBLAS_TRANSPOSE TransA F77_TB = C2F_CHAR(&TB); #endif - F77_zgemm(F77_TA, F77_TB, &F77_M, &F77_N, &F77_K, alpha, A, - &F77_lda, B, &F77_ldb, beta, C, &F77_ldc); + F77_zgemm(F77_TA, F77_TB, &F77_M, &F77_N, &F77_K, (dcomplex*)alpha, (dcomplex*)A, + &F77_lda, (dcomplex*)B, &F77_ldb, (dcomplex*)beta, (dcomplex*)C, &F77_ldc); } else if (Order == CblasRowMajor) { RowMajorStrg = 1; @@ -105,8 +101,8 @@ void cblas_zgemm(const enum CBLAS_ORDER Order, const enum CBLAS_TRANSPOSE TransA F77_TB = C2F_CHAR(&TB); #endif - F77_zgemm(F77_TA, F77_TB, &F77_N, &F77_M, &F77_K, alpha, B, - &F77_ldb, A, &F77_lda, beta, C, &F77_ldc); + F77_zgemm(F77_TA, F77_TB, &F77_N, &F77_M, &F77_K, (dcomplex*)alpha, (dcomplex*)B, + &F77_ldb, (dcomplex*)A, &F77_lda, (dcomplex*)beta, (dcomplex*)C, &F77_ldc); } else cblas_xerbla(1, "cblas_zgemm", "Illegal Order setting, %d\n", Order); CBLAS_CallFromC = 0; diff --git a/frame/compat/cblas/src/cblas_zgemv.c b/frame/compat/cblas/src/cblas_zgemv.c index 924be72fb..05b0bfe84 100644 --- a/frame/compat/cblas/src/cblas_zgemv.c +++ b/frame/compat/cblas/src/cblas_zgemv.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_zgemv.c @@ -15,11 +11,11 @@ #include #include "cblas.h" #include "cblas_f77.h" -void cblas_zgemv(const enum CBLAS_ORDER order, - const enum CBLAS_TRANSPOSE TransA, const int M, const int N, - const void *alpha, const void *A, const int lda, - const void *X, const int incX, const void *beta, - void *Y, const int incY) +void cblas_zgemv(enum CBLAS_ORDER order, + enum CBLAS_TRANSPOSE TransA, f77_int M, f77_int N, + const void *alpha, const void *A, f77_int lda, + const void *X, f77_int incX, const void *beta, + void *Y, f77_int incY) { char TA; #ifdef F77_CHAR @@ -33,7 +29,7 @@ void cblas_zgemv(const enum CBLAS_ORDER order, #define F77_M M #define F77_N N #define F77_lda lda - #define F77_incX incx + #define F77_incX incX #define F77_incY incY #endif @@ -63,8 +59,8 @@ void cblas_zgemv(const enum CBLAS_ORDER order, #ifdef F77_CHAR F77_TA = C2F_CHAR(&TA); #endif - F77_zgemv(F77_TA, &F77_M, &F77_N, alpha, A, &F77_lda, X, &F77_incX, - beta, Y, &F77_incY); + F77_zgemv(F77_TA, &F77_M, &F77_N, (dcomplex*)alpha, (dcomplex*)A, &F77_lda, (dcomplex*)X, &F77_incX, + (dcomplex*)beta, (dcomplex*)Y, &F77_incY); } else if (order == CblasRowMajor) { @@ -108,7 +104,7 @@ void cblas_zgemv(const enum CBLAS_ORDER order, #ifdef F77_INT F77_incX = 1; #else - incx = 1; + incX = 1; #endif if(incY > 0) @@ -143,11 +139,11 @@ void cblas_zgemv(const enum CBLAS_ORDER order, F77_TA = C2F_CHAR(&TA); #endif if (TransA == CblasConjTrans) - F77_zgemv(F77_TA, &F77_N, &F77_M, ALPHA, A, &F77_lda, x, - &F77_incX, BETA, Y, &F77_incY); + F77_zgemv(F77_TA, &F77_N, &F77_M, (dcomplex*)ALPHA, (dcomplex*)A, &F77_lda, (dcomplex*)x, + &F77_incX, (dcomplex*)BETA, (dcomplex*)Y, &F77_incY); else - F77_zgemv(F77_TA, &F77_N, &F77_M, alpha, A, &F77_lda, x, - &F77_incX, beta, Y, &F77_incY); + F77_zgemv(F77_TA, &F77_N, &F77_M, (dcomplex*)alpha, (dcomplex*)A, &F77_lda, (dcomplex*)x, + &F77_incX, (dcomplex*)beta, (dcomplex*)Y, &F77_incY); if (TransA == CblasConjTrans) { diff --git a/frame/compat/cblas/src/cblas_zgerc.c b/frame/compat/cblas/src/cblas_zgerc.c index 9e56ef35e..9667958c5 100644 --- a/frame/compat/cblas/src/cblas_zgerc.c +++ b/frame/compat/cblas/src/cblas_zgerc.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_zgerc.c @@ -15,9 +11,9 @@ #include #include "cblas.h" #include "cblas_f77.h" -void cblas_zgerc(const enum CBLAS_ORDER order, const int M, const int N, - const void *alpha, const void *X, const int incX, - const void *Y, const int incY, void *A, const int lda) +void cblas_zgerc(enum CBLAS_ORDER order, f77_int M, f77_int N, + const void *alpha, const void *X, f77_int incX, + const void *Y, f77_int incY, void *A, f77_int lda) { #ifdef F77_INT F77_INT F77_M=M, F77_N=N, F77_lda=lda, F77_incX=incX, F77_incY=incY; @@ -25,7 +21,7 @@ void cblas_zgerc(const enum CBLAS_ORDER order, const int M, const int N, #define F77_M M #define F77_N N #define F77_incX incX - #define F77_incY incy + #define F77_incY incY #define F77_lda lda #endif @@ -39,7 +35,7 @@ void cblas_zgerc(const enum CBLAS_ORDER order, const int M, const int N, CBLAS_CallFromC = 1; if (order == CblasColMajor) { - F77_zgerc( &F77_M, &F77_N, alpha, X, &F77_incX, Y, &F77_incY, A, + F77_zgerc( &F77_M, &F77_N, (dcomplex*)alpha, (dcomplex*)X, &F77_incX, (dcomplex*)Y, &F77_incY, (dcomplex*)A, &F77_lda); } else if (order == CblasRowMajor) { @@ -73,12 +69,12 @@ void cblas_zgerc(const enum CBLAS_ORDER order, const int M, const int N, #ifdef F77_INT F77_incY = 1; #else - incy = 1; + incY = 1; #endif } else y = (double *) Y; - F77_zgeru( &F77_N, &F77_M, alpha, y, &F77_incY, X, &F77_incX, A, + F77_zgeru( &F77_N, &F77_M, (dcomplex*)alpha, (dcomplex*)y, &F77_incY, (dcomplex*)X, &F77_incX, (dcomplex*)A, &F77_lda); if(Y!=y) free(y); diff --git a/frame/compat/cblas/src/cblas_zgeru.c b/frame/compat/cblas/src/cblas_zgeru.c index 994f5e7df..3538ed044 100644 --- a/frame/compat/cblas/src/cblas_zgeru.c +++ b/frame/compat/cblas/src/cblas_zgeru.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_zgeru.c @@ -13,9 +9,9 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_zgeru(const enum CBLAS_ORDER order, const int M, const int N, - const void *alpha, const void *X, const int incX, - const void *Y, const int incY, void *A, const int lda) +void cblas_zgeru(enum CBLAS_ORDER order, f77_int M, f77_int N, + const void *alpha, const void *X, f77_int incX, + const void *Y, f77_int incY, void *A, f77_int lda) { #ifdef F77_INT F77_INT F77_M=M, F77_N=N, F77_lda=lda, F77_incX=incX, F77_incY=incY; @@ -34,13 +30,13 @@ void cblas_zgeru(const enum CBLAS_ORDER order, const int M, const int N, if (order == CblasColMajor) { - F77_zgeru( &F77_M, &F77_N, alpha, X, &F77_incX, Y, &F77_incY, A, + F77_zgeru( &F77_M, &F77_N, (dcomplex*)alpha, (dcomplex*)X, &F77_incX, (dcomplex*)Y, &F77_incY, (dcomplex*)A, &F77_lda); } else if (order == CblasRowMajor) { RowMajorStrg = 1; - F77_zgeru( &F77_N, &F77_M, alpha, Y, &F77_incY, X, &F77_incX, A, + F77_zgeru( &F77_N, &F77_M, (dcomplex*)alpha, (dcomplex*)Y, &F77_incY, (dcomplex*)X, &F77_incX, (dcomplex*)A, &F77_lda); } else cblas_xerbla(1, "cblas_zgeru", "Illegal Order setting, %d\n", order); diff --git a/frame/compat/cblas/src/cblas_zhbmv.c b/frame/compat/cblas/src/cblas_zhbmv.c index 1cd5095d3..8bfd139e9 100644 --- a/frame/compat/cblas/src/cblas_zhbmv.c +++ b/frame/compat/cblas/src/cblas_zhbmv.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_zhbmv.c @@ -15,11 +11,11 @@ #include "cblas_f77.h" #include #include -void cblas_zhbmv(const enum CBLAS_ORDER order, - const enum CBLAS_UPLO Uplo,const int N,const int K, - const void *alpha, const void *A, const int lda, - const void *X, const int incX, const void *beta, - void *Y, const int incY) +void cblas_zhbmv(enum CBLAS_ORDER order, + enum CBLAS_UPLO Uplo,f77_int N,f77_int K, + const void *alpha, const void *A, f77_int lda, + const void *X, f77_int incX, const void *beta, + void *Y, f77_int incY) { char UL; #ifdef F77_CHAR @@ -33,7 +29,7 @@ void cblas_zhbmv(const enum CBLAS_ORDER order, #define F77_N N #define F77_K K #define F77_lda lda - #define F77_incX incx + #define F77_incX incX #define F77_incY incY #endif int n, i=0; @@ -60,8 +56,8 @@ void cblas_zhbmv(const enum CBLAS_ORDER order, #ifdef F77_CHAR F77_UL = C2F_CHAR(&UL); #endif - F77_zhbmv(F77_UL, &F77_N, &F77_K, alpha, A, &F77_lda, X, - &F77_incX, beta, Y, &F77_incY); + F77_zhbmv(F77_UL, &F77_N, &F77_K, (dcomplex*)alpha, (dcomplex*)A, &F77_lda, (dcomplex*)X, + &F77_incX, (dcomplex*)beta, (dcomplex*)Y, &F77_incY); } else if (order == CblasRowMajor) { @@ -102,7 +98,7 @@ void cblas_zhbmv(const enum CBLAS_ORDER order, #ifdef F77_INT F77_incX = 1; #else - incx = 1; + incX = 1; #endif if(incY > 0) @@ -134,8 +130,8 @@ void cblas_zhbmv(const enum CBLAS_ORDER order, #ifdef F77_CHAR F77_UL = C2F_CHAR(&UL); #endif - F77_zhbmv(F77_UL, &F77_N, &F77_K, ALPHA, - A ,&F77_lda, x,&F77_incX, BETA, Y, &F77_incY); + F77_zhbmv(F77_UL, &F77_N, &F77_K, (dcomplex*)ALPHA, + (dcomplex*)A ,&F77_lda, (dcomplex*)x,&F77_incX, (dcomplex*)BETA, (dcomplex*)Y, &F77_incY); } else { diff --git a/frame/compat/cblas/src/cblas_zhemm.c b/frame/compat/cblas/src/cblas_zhemm.c index 596e72569..7da2a41e6 100644 --- a/frame/compat/cblas/src/cblas_zhemm.c +++ b/frame/compat/cblas/src/cblas_zhemm.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * @@ -15,11 +11,11 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_zhemm(const enum CBLAS_ORDER Order, const enum CBLAS_SIDE Side, - const enum CBLAS_UPLO Uplo, const int M, const int N, - const void *alpha, const void *A, const int lda, - const void *B, const int ldb, const void *beta, - void *C, const int ldc) +void cblas_zhemm(enum CBLAS_ORDER Order, const enum CBLAS_SIDE Side, + enum CBLAS_UPLO Uplo, f77_int M, f77_int N, + const void *alpha, const void *A, f77_int lda, + const void *B, f77_int ldb, const void *beta, + void *C, f77_int ldc) { char SD, UL; #ifdef F77_CHAR @@ -72,8 +68,8 @@ void cblas_zhemm(const enum CBLAS_ORDER Order, const enum CBLAS_SIDE Side, F77_SD = C2F_CHAR(&SD); #endif - F77_zhemm(F77_SD, F77_UL, &F77_M, &F77_N, alpha, A, &F77_lda, - B, &F77_ldb, beta, C, &F77_ldc); + F77_zhemm(F77_SD, F77_UL, &F77_M, &F77_N, (dcomplex*)alpha, (dcomplex*)A, &F77_lda, + (dcomplex*)B, &F77_ldb, (dcomplex*)beta, (dcomplex*)C, &F77_ldc); } else if (Order == CblasRowMajor) { RowMajorStrg = 1; @@ -102,8 +98,8 @@ void cblas_zhemm(const enum CBLAS_ORDER Order, const enum CBLAS_SIDE Side, F77_SD = C2F_CHAR(&SD); #endif - F77_zhemm(F77_SD, F77_UL, &F77_N, &F77_M, alpha, A, - &F77_lda, B, &F77_ldb, beta, C, &F77_ldc); + F77_zhemm(F77_SD, F77_UL, &F77_N, &F77_M, (dcomplex*)alpha, (dcomplex*)A, + &F77_lda, (dcomplex*)B, &F77_ldb, (dcomplex*)beta, (dcomplex*)C, &F77_ldc); } else cblas_xerbla(1, "cblas_zhemm", "Illegal Order setting, %d\n", Order); CBLAS_CallFromC = 0; diff --git a/frame/compat/cblas/src/cblas_zhemv.c b/frame/compat/cblas/src/cblas_zhemv.c index e30303e88..a0b6082ce 100644 --- a/frame/compat/cblas/src/cblas_zhemv.c +++ b/frame/compat/cblas/src/cblas_zhemv.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_zhemv.c @@ -15,11 +11,11 @@ #include #include "cblas.h" #include "cblas_f77.h" -void cblas_zhemv(const enum CBLAS_ORDER order, - const enum CBLAS_UPLO Uplo, const int N, - const void *alpha, const void *A, const int lda, - const void *X, const int incX, const void *beta, - void *Y, const int incY) +void cblas_zhemv(enum CBLAS_ORDER order, + enum CBLAS_UPLO Uplo, f77_int N, + const void *alpha, const void *A, f77_int lda, + const void *X, f77_int incX, const void *beta, + void *Y, f77_int incY) { char UL; #ifdef F77_CHAR @@ -32,7 +28,7 @@ void cblas_zhemv(const enum CBLAS_ORDER order, #else #define F77_N N #define F77_lda lda - #define F77_incX incx + #define F77_incX incX #define F77_incY incY #endif int n, i=0; @@ -60,8 +56,8 @@ void cblas_zhemv(const enum CBLAS_ORDER order, #ifdef F77_CHAR F77_UL = C2F_CHAR(&UL); #endif - F77_zhemv(F77_UL, &F77_N, alpha, A, &F77_lda, X, &F77_incX, - beta, Y, &F77_incY); + F77_zhemv(F77_UL, &F77_N, (dcomplex*)alpha, (dcomplex*)A, &F77_lda, (dcomplex*)X, &F77_incX, + (dcomplex*)beta, (dcomplex*)Y, &F77_incY); } else if (order == CblasRowMajor) { @@ -102,7 +98,7 @@ void cblas_zhemv(const enum CBLAS_ORDER order, #ifdef F77_INT F77_incX = 1; #else - incx = 1; + incX = 1; #endif if(incY > 0) @@ -135,8 +131,8 @@ void cblas_zhemv(const enum CBLAS_ORDER order, #ifdef F77_CHAR F77_UL = C2F_CHAR(&UL); #endif - F77_zhemv(F77_UL, &F77_N, ALPHA, A, &F77_lda, x, &F77_incX, - BETA, Y, &F77_incY); + F77_zhemv(F77_UL, &F77_N, (dcomplex*)ALPHA, (dcomplex*)A, &F77_lda, (dcomplex*)x, &F77_incX, + (dcomplex*)BETA, (dcomplex*)Y, &F77_incY); } else { diff --git a/frame/compat/cblas/src/cblas_zher.c b/frame/compat/cblas/src/cblas_zher.c index af2e2ea6f..9e513d43b 100644 --- a/frame/compat/cblas/src/cblas_zher.c +++ b/frame/compat/cblas/src/cblas_zher.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_zher.c @@ -15,9 +11,9 @@ #include #include "cblas.h" #include "cblas_f77.h" -void cblas_zher(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const int N, const double alpha, const void *X, const int incX - ,void *A, const int lda) +void cblas_zher(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + f77_int N, double alpha, const void *X, f77_int incX + ,void *A, f77_int lda) { char UL; #ifdef F77_CHAR @@ -31,7 +27,7 @@ void cblas_zher(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, #else #define F77_N N #define F77_lda lda - #define F77_incX incx + #define F77_incX incX #endif int n, i, tincx; double *x=(double *)X, *xx=(double *)X, *tx, *st; @@ -56,7 +52,7 @@ void cblas_zher(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, F77_UL = C2F_CHAR(&UL); #endif - F77_zher(F77_UL, &F77_N, &alpha, X, &F77_incX, A, &F77_lda); + F77_zher(F77_UL, &F77_N, &alpha, (dcomplex*)X, &F77_incX, (dcomplex*)A, &F77_lda); } else if (order == CblasRowMajor) { @@ -101,11 +97,11 @@ void cblas_zher(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, #ifdef F77_INT F77_incX = 1; #else - incx = 1; + incX = 1; #endif } else x = (double *) X; - F77_zher(F77_UL, &F77_N, &alpha, x, &F77_incX, A, &F77_lda); + F77_zher(F77_UL, &F77_N, &alpha, (dcomplex*)x, &F77_incX, (dcomplex*)A, &F77_lda); } else cblas_xerbla(1, "cblas_zher", "Illegal Order setting, %d\n", order); if(X!=x) free(x); diff --git a/frame/compat/cblas/src/cblas_zher2.c b/frame/compat/cblas/src/cblas_zher2.c index 8a9bb2e9e..5d49302f9 100644 --- a/frame/compat/cblas/src/cblas_zher2.c +++ b/frame/compat/cblas/src/cblas_zher2.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_zher2.c @@ -15,9 +11,9 @@ #include #include "cblas.h" #include "cblas_f77.h" -void cblas_zher2(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const int N, const void *alpha, const void *X, const int incX, - const void *Y, const int incY, void *A, const int lda) +void cblas_zher2(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + f77_int N, const void *alpha, const void *X, f77_int incX, + const void *Y, f77_int incY, void *A, f77_int lda) { char UL; #ifdef F77_CHAR @@ -31,8 +27,8 @@ void cblas_zher2(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, #else #define F77_N N #define F77_lda lda - #define F77_incX incx - #define F77_incY incy + #define F77_incX incX + #define F77_incY incY #endif int n, i, j, tincx, tincy; double *x=(double *)X, *xx=(double *)X, *y=(double *)Y, @@ -58,8 +54,8 @@ void cblas_zher2(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, F77_UL = C2F_CHAR(&UL); #endif - F77_zher2(F77_UL, &F77_N, alpha, X, &F77_incX, - Y, &F77_incY, A, &F77_lda); + F77_zher2(F77_UL, &F77_N, (dcomplex*)alpha, (dcomplex*)X, &F77_incX, + (dcomplex*)Y, &F77_incY, (dcomplex*)A, &F77_lda); } else if (order == CblasRowMajor) { @@ -130,16 +126,16 @@ void cblas_zher2(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, F77_incX = 1; F77_incY = 1; #else - incx = 1; - incy = 1; + incX = 1; + incY = 1; #endif } else { x = (double *) X; y = (double *) Y; } - F77_zher2(F77_UL, &F77_N, alpha, y, &F77_incY, x, - &F77_incX, A, &F77_lda); + F77_zher2(F77_UL, &F77_N, (dcomplex*)alpha, (dcomplex*)y, &F77_incY, (dcomplex*)x, + &F77_incX, (dcomplex*)A, &F77_lda); } else { diff --git a/frame/compat/cblas/src/cblas_zher2k.c b/frame/compat/cblas/src/cblas_zher2k.c index d0b0fd130..424f650d0 100644 --- a/frame/compat/cblas/src/cblas_zher2k.c +++ b/frame/compat/cblas/src/cblas_zher2k.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * @@ -15,11 +11,11 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_zher2k(const enum CBLAS_ORDER Order, const enum CBLAS_UPLO Uplo, - const enum CBLAS_TRANSPOSE Trans, const int N, const int K, - const void *alpha, const void *A, const int lda, - const void *B, const int ldb, const double beta, - void *C, const int ldc) +void cblas_zher2k(enum CBLAS_ORDER Order, enum CBLAS_UPLO Uplo, + enum CBLAS_TRANSPOSE Trans, f77_int N, f77_int K, + const void *alpha, const void *A, f77_int lda, + const void *B, f77_int ldb, double beta, + void *C, f77_int ldc) { char UL, TR; #ifdef F77_CHAR @@ -77,7 +73,7 @@ void cblas_zher2k(const enum CBLAS_ORDER Order, const enum CBLAS_UPLO Uplo, F77_TR = C2F_CHAR(&TR); #endif - F77_zher2k(F77_UL, F77_TR, &F77_N, &F77_K, alpha, A, &F77_lda, B, &F77_ldb, &beta, C, &F77_ldc); + F77_zher2k(F77_UL, F77_TR, &F77_N, &F77_K, (dcomplex*)alpha, (dcomplex*)A, &F77_lda, (dcomplex*)B, &F77_ldb, &beta, (dcomplex*)C, &F77_ldc); } else if (Order == CblasRowMajor) { RowMajorStrg = 1; @@ -108,7 +104,7 @@ void cblas_zher2k(const enum CBLAS_ORDER Order, const enum CBLAS_UPLO Uplo, ALPHA[0]= *alp; ALPHA[1]= -alp[1]; - F77_zher2k(F77_UL,F77_TR, &F77_N, &F77_K, ALPHA, A, &F77_lda, B, &F77_ldb, &beta, C, &F77_ldc); + F77_zher2k(F77_UL,F77_TR, &F77_N, &F77_K, (dcomplex*)ALPHA, (dcomplex*)A, &F77_lda, (dcomplex*)B, &F77_ldb, &beta, (dcomplex*)C, &F77_ldc); } else cblas_xerbla(1, "cblas_zher2k", "Illegal Order setting, %d\n", Order); CBLAS_CallFromC = 0; RowMajorStrg = 0; diff --git a/frame/compat/cblas/src/cblas_zherk.c b/frame/compat/cblas/src/cblas_zherk.c index 630376414..5ddb45184 100644 --- a/frame/compat/cblas/src/cblas_zherk.c +++ b/frame/compat/cblas/src/cblas_zherk.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * @@ -15,10 +11,10 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_zherk(const enum CBLAS_ORDER Order, const enum CBLAS_UPLO Uplo, - const enum CBLAS_TRANSPOSE Trans, const int N, const int K, - const double alpha, const void *A, const int lda, - const double beta, void *C, const int ldc) +void cblas_zherk(enum CBLAS_ORDER Order, enum CBLAS_UPLO Uplo, + enum CBLAS_TRANSPOSE Trans, f77_int N, f77_int K, + double alpha, const void *A, f77_int lda, + double beta, void *C, f77_int ldc) { char UL, TR; #ifdef F77_CHAR @@ -71,8 +67,8 @@ void cblas_zherk(const enum CBLAS_ORDER Order, const enum CBLAS_UPLO Uplo, F77_TR = C2F_CHAR(&TR); #endif - F77_zherk(F77_UL, F77_TR, &F77_N, &F77_K, &alpha, A, &F77_lda, - &beta, C, &F77_ldc); + F77_zherk(F77_UL, F77_TR, &F77_N, &F77_K, &alpha, (dcomplex*)A, &F77_lda, + &beta, (dcomplex*)C, &F77_ldc); } else if (Order == CblasRowMajor) { RowMajorStrg = 1; @@ -101,8 +97,8 @@ void cblas_zherk(const enum CBLAS_ORDER Order, const enum CBLAS_UPLO Uplo, F77_SD = C2F_CHAR(&SD); #endif - F77_zherk(F77_UL, F77_TR, &F77_N, &F77_K, &alpha, A, &F77_lda, - &beta, C, &F77_ldc); + F77_zherk(F77_UL, F77_TR, &F77_N, &F77_K, &alpha, (dcomplex*)A, &F77_lda, + &beta, (dcomplex*)C, &F77_ldc); } else cblas_xerbla(1, "cblas_zherk", "Illegal Order setting, %d\n", Order); CBLAS_CallFromC = 0; diff --git a/frame/compat/cblas/src/cblas_zhpmv.c b/frame/compat/cblas/src/cblas_zhpmv.c index 17dc943fd..912300d44 100644 --- a/frame/compat/cblas/src/cblas_zhpmv.c +++ b/frame/compat/cblas/src/cblas_zhpmv.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_zhpmv.c @@ -15,11 +11,11 @@ #include #include "cblas.h" #include "cblas_f77.h" -void cblas_zhpmv(const enum CBLAS_ORDER order, - const enum CBLAS_UPLO Uplo,const int N, +void cblas_zhpmv(enum CBLAS_ORDER order, + enum CBLAS_UPLO Uplo,f77_int N, const void *alpha, const void *AP, - const void *X, const int incX, const void *beta, - void *Y, const int incY) + const void *X, f77_int incX, const void *beta, + void *Y, f77_int incY) { char UL; #ifdef F77_CHAR @@ -31,7 +27,7 @@ void cblas_zhpmv(const enum CBLAS_ORDER order, F77_INT F77_N=N, F77_incX=incX, F77_incY=incY; #else #define F77_N N - #define F77_incX incx + #define F77_incX incX #define F77_incY incY #endif int n, i=0; @@ -58,8 +54,8 @@ void cblas_zhpmv(const enum CBLAS_ORDER order, #ifdef F77_CHAR F77_UL = C2F_CHAR(&UL); #endif - F77_zhpmv(F77_UL, &F77_N, alpha, AP, X, - &F77_incX, beta, Y, &F77_incY); + F77_zhpmv(F77_UL, &F77_N, (dcomplex*)alpha, (dcomplex*)AP, (dcomplex*)X, + &F77_incX, (dcomplex*)beta, (dcomplex*)Y, &F77_incY); } else if (order == CblasRowMajor) { @@ -100,7 +96,7 @@ void cblas_zhpmv(const enum CBLAS_ORDER order, #ifdef F77_INT F77_incX = 1; #else - incx = 1; + incX = 1; #endif if(incY > 0) @@ -134,8 +130,8 @@ void cblas_zhpmv(const enum CBLAS_ORDER order, F77_UL = C2F_CHAR(&UL); #endif - F77_zhpmv(F77_UL, &F77_N, ALPHA, - AP, x, &F77_incX, BETA, Y, &F77_incY); + F77_zhpmv(F77_UL, &F77_N, (dcomplex*)ALPHA, + (dcomplex*)AP, (dcomplex*)x, &F77_incX, (dcomplex*)BETA, (dcomplex*)Y, &F77_incY); } else { diff --git a/frame/compat/cblas/src/cblas_zhpr.c b/frame/compat/cblas/src/cblas_zhpr.c index ae0a6cc4c..80d238170 100644 --- a/frame/compat/cblas/src/cblas_zhpr.c +++ b/frame/compat/cblas/src/cblas_zhpr.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_zhpr.c @@ -15,9 +11,9 @@ #include #include "cblas.h" #include "cblas_f77.h" -void cblas_zhpr(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const int N, const double alpha, const void *X, - const int incX, void *A) +void cblas_zhpr(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + f77_int N, double alpha, const void *X, + f77_int incX, void *A) { char UL; #ifdef F77_CHAR @@ -30,7 +26,7 @@ void cblas_zhpr(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, F77_INT F77_N=N, F77_incX=incX; #else #define F77_N N - #define F77_incX incx + #define F77_incX incX #endif int n, i, tincx; double *x=(double *)X, *xx=(double *)X, *tx, *st; @@ -55,7 +51,7 @@ void cblas_zhpr(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, F77_UL = C2F_CHAR(&UL); #endif - F77_zhpr(F77_UL, &F77_N, &alpha, X, &F77_incX, A); + F77_zhpr(F77_UL, &F77_N, &alpha, (dcomplex*)X, &F77_incX, (dcomplex*)A); } else if (order == CblasRowMajor) { @@ -99,12 +95,12 @@ void cblas_zhpr(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, #ifdef F77_INT F77_incX = 1; #else - incx = 1; + incX = 1; #endif } else x = (double *) X; - F77_zhpr(F77_UL, &F77_N, &alpha, x, &F77_incX, A); + F77_zhpr(F77_UL, &F77_N, &alpha, (dcomplex*)x, &F77_incX, (dcomplex*)A); } else { diff --git a/frame/compat/cblas/src/cblas_zhpr2.c b/frame/compat/cblas/src/cblas_zhpr2.c index 124a43cfc..2aa46062a 100644 --- a/frame/compat/cblas/src/cblas_zhpr2.c +++ b/frame/compat/cblas/src/cblas_zhpr2.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_zhpr2.c @@ -15,9 +11,9 @@ #include #include "cblas.h" #include "cblas_f77.h" -void cblas_zhpr2(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const int N,const void *alpha, const void *X, - const int incX,const void *Y, const int incY, void *Ap) +void cblas_zhpr2(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + f77_int N,const void *alpha, const void *X, + f77_int incX,const void *Y, f77_int incY, void *Ap) { char UL; @@ -31,8 +27,8 @@ void cblas_zhpr2(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, F77_INT F77_N=N, F77_incX=incX, F77_incY=incY; #else #define F77_N N - #define F77_incX incx - #define F77_incY incy + #define F77_incX incX + #define F77_incY incY #endif int n, i, j; double *x=(double *)X, *xx=(double *)X, *y=(double *)Y, @@ -58,7 +54,7 @@ void cblas_zhpr2(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, F77_UL = C2F_CHAR(&UL); #endif - F77_zhpr2(F77_UL, &F77_N, alpha, X, &F77_incX, Y, &F77_incY, Ap); + F77_zhpr2(F77_UL, &F77_N, (dcomplex*)alpha, (dcomplex*)X, &F77_incX, (dcomplex*)Y, &F77_incY, (dcomplex*)Ap); } else if (order == CblasRowMajor) { @@ -122,14 +118,14 @@ void cblas_zhpr2(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, #else if(incX > 0 ) - incx = 1; + incX = 1; else - incx = -1; + incX = -1; if(incY > 0 ) - incy = 1; + incY = 1; else - incy = -1; + incY = -1; #endif } else @@ -137,7 +133,7 @@ void cblas_zhpr2(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, x = (double *) X; y = (void *) Y; } - F77_zhpr2(F77_UL, &F77_N, alpha, y, &F77_incY, x, &F77_incX, Ap); + F77_zhpr2(F77_UL, &F77_N, (dcomplex*)alpha, (dcomplex*)y, &F77_incY, (dcomplex*)x, &F77_incX, (dcomplex*)Ap); } else { diff --git a/frame/compat/cblas/src/cblas_zscal.c b/frame/compat/cblas/src/cblas_zscal.c index 3a45cfece..a66ea6f9d 100644 --- a/frame/compat/cblas/src/cblas_zscal.c +++ b/frame/compat/cblas/src/cblas_zscal.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_zscal.c @@ -14,8 +10,8 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_zscal( const int N, const void *alpha, void *X, - const int incX) +void cblas_zscal( f77_int N, const void *alpha, void *X, + f77_int incX) { #ifdef F77_INT F77_INT F77_N=N, F77_incX=incX; @@ -23,6 +19,6 @@ void cblas_zscal( const int N, const void *alpha, void *X, #define F77_N N #define F77_incX incX #endif - F77_zscal( &F77_N, alpha, X, &F77_incX); + F77_zscal( &F77_N, (dcomplex*)alpha, (dcomplex*)X, &F77_incX); } #endif diff --git a/frame/compat/cblas/src/cblas_zswap.c b/frame/compat/cblas/src/cblas_zswap.c index 4b30c6d6c..6b2eb1a20 100644 --- a/frame/compat/cblas/src/cblas_zswap.c +++ b/frame/compat/cblas/src/cblas_zswap.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_zswap.c @@ -14,8 +10,8 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_zswap( const int N, void *X, const int incX, void *Y, - const int incY) +void cblas_zswap( f77_int N, void *X, f77_int incX, void *Y, + f77_int incY) { #ifdef F77_INT F77_INT F77_N=N, F77_incX=incX, F77_incY=incY; @@ -24,6 +20,6 @@ void cblas_zswap( const int N, void *X, const int incX, void *Y, #define F77_incX incX #define F77_incY incY #endif - F77_zswap( &F77_N, X, &F77_incX, Y, &F77_incY); + F77_zswap( &F77_N, (dcomplex*)X, &F77_incX, (dcomplex*)Y, &F77_incY); } #endif diff --git a/frame/compat/cblas/src/cblas_zsymm.c b/frame/compat/cblas/src/cblas_zsymm.c index 12dbe513a..9303c5921 100644 --- a/frame/compat/cblas/src/cblas_zsymm.c +++ b/frame/compat/cblas/src/cblas_zsymm.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * @@ -15,11 +11,11 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_zsymm(const enum CBLAS_ORDER Order, const enum CBLAS_SIDE Side, - const enum CBLAS_UPLO Uplo, const int M, const int N, - const void *alpha, const void *A, const int lda, - const void *B, const int ldb, const void *beta, - void *C, const int ldc) +void cblas_zsymm(enum CBLAS_ORDER Order, enum CBLAS_SIDE Side, + enum CBLAS_UPLO Uplo, f77_int M, f77_int N, + const void *alpha, const void *A, f77_int lda, + const void *B, f77_int ldb, const void *beta, + void *C, f77_int ldc) { char SD, UL; #ifdef F77_CHAR @@ -72,8 +68,8 @@ void cblas_zsymm(const enum CBLAS_ORDER Order, const enum CBLAS_SIDE Side, F77_SD = C2F_CHAR(&SD); #endif - F77_zsymm(F77_SD, F77_UL, &F77_M, &F77_N, alpha, A, &F77_lda, - B, &F77_ldb, beta, C, &F77_ldc); + F77_zsymm(F77_SD, F77_UL, &F77_M, &F77_N, (dcomplex*)alpha, (dcomplex*)A, &F77_lda, + (dcomplex*)B, &F77_ldb, (dcomplex*)beta, (dcomplex*)C, &F77_ldc); } else if (Order == CblasRowMajor) { RowMajorStrg = 1; @@ -102,8 +98,8 @@ void cblas_zsymm(const enum CBLAS_ORDER Order, const enum CBLAS_SIDE Side, F77_SD = C2F_CHAR(&SD); #endif - F77_zsymm(F77_SD, F77_UL, &F77_N, &F77_M, alpha, A, &F77_lda, - B, &F77_ldb, beta, C, &F77_ldc); + F77_zsymm(F77_SD, F77_UL, &F77_N, &F77_M, (dcomplex*)alpha, (dcomplex*)A, &F77_lda, + (dcomplex*)B, &F77_ldb, (dcomplex*)beta, (dcomplex*)C, &F77_ldc); } else cblas_xerbla(1, "cblas_zsymm", "Illegal Order setting, %d\n", Order); CBLAS_CallFromC = 0; diff --git a/frame/compat/cblas/src/cblas_zsyr2k.c b/frame/compat/cblas/src/cblas_zsyr2k.c index 02c402d46..c275cc693 100644 --- a/frame/compat/cblas/src/cblas_zsyr2k.c +++ b/frame/compat/cblas/src/cblas_zsyr2k.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * @@ -15,11 +11,11 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_zsyr2k(const enum CBLAS_ORDER Order, const enum CBLAS_UPLO Uplo, - const enum CBLAS_TRANSPOSE Trans, const int N, const int K, - const void *alpha, const void *A, const int lda, - const void *B, const int ldb, const void *beta, - void *C, const int ldc) +void cblas_zsyr2k(enum CBLAS_ORDER Order, enum CBLAS_UPLO Uplo, + enum CBLAS_TRANSPOSE Trans, f77_int N, f77_int K, + const void *alpha, const void *A, f77_int lda, + const void *B, f77_int ldb, const void *beta, + void *C, f77_int ldc) { char UL, TR; #ifdef F77_CHAR @@ -75,8 +71,8 @@ void cblas_zsyr2k(const enum CBLAS_ORDER Order, const enum CBLAS_UPLO Uplo, F77_TR = C2F_CHAR(&TR); #endif - F77_zsyr2k(F77_UL, F77_TR, &F77_N, &F77_K, alpha, A, &F77_lda, - B, &F77_ldb, beta, C, &F77_ldc); + F77_zsyr2k(F77_UL, F77_TR, &F77_N, &F77_K, (dcomplex*)alpha, (dcomplex*)A, &F77_lda, + (dcomplex*)B, &F77_ldb, (dcomplex*)beta, (dcomplex*)C, &F77_ldc); } else if (Order == CblasRowMajor) { RowMajorStrg = 1; @@ -105,7 +101,7 @@ void cblas_zsyr2k(const enum CBLAS_ORDER Order, const enum CBLAS_UPLO Uplo, F77_TR = C2F_CHAR(&TR); #endif - F77_zsyr2k(F77_UL, F77_TR, &F77_N, &F77_K, alpha, A, &F77_lda, B, &F77_ldb, beta, C, &F77_ldc); + F77_zsyr2k(F77_UL, F77_TR, &F77_N, &F77_K, (dcomplex*)alpha, (dcomplex*)A, &F77_lda, (dcomplex*)B, &F77_ldb, (dcomplex*)beta, (dcomplex*)C, &F77_ldc); } else cblas_xerbla(1, "cblas_zsyr2k", "Illegal Order setting, %d\n", Order); CBLAS_CallFromC = 0; diff --git a/frame/compat/cblas/src/cblas_zsyrk.c b/frame/compat/cblas/src/cblas_zsyrk.c index 320a35cde..ce2c0e1c8 100644 --- a/frame/compat/cblas/src/cblas_zsyrk.c +++ b/frame/compat/cblas/src/cblas_zsyrk.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * @@ -15,10 +11,10 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_zsyrk(const enum CBLAS_ORDER Order, const enum CBLAS_UPLO Uplo, - const enum CBLAS_TRANSPOSE Trans, const int N, const int K, - const void *alpha, const void *A, const int lda, - const void *beta, void *C, const int ldc) +void cblas_zsyrk(enum CBLAS_ORDER Order, enum CBLAS_UPLO Uplo, + enum CBLAS_TRANSPOSE Trans, f77_int N, f77_int K, + const void *alpha, const void *A, f77_int lda, + const void *beta, void *C, f77_int ldc) { char UL, TR; #ifdef F77_CHAR @@ -73,8 +69,8 @@ void cblas_zsyrk(const enum CBLAS_ORDER Order, const enum CBLAS_UPLO Uplo, F77_TR = C2F_CHAR(&TR); #endif - F77_zsyrk(F77_UL, F77_TR, &F77_N, &F77_K, alpha, A, &F77_lda, - beta, C, &F77_ldc); + F77_zsyrk(F77_UL, F77_TR, &F77_N, &F77_K, (dcomplex*)alpha, (dcomplex*)A, &F77_lda, + (dcomplex*)beta, (dcomplex*)C, &F77_ldc); } else if (Order == CblasRowMajor) { RowMajorStrg = 1; @@ -103,8 +99,8 @@ void cblas_zsyrk(const enum CBLAS_ORDER Order, const enum CBLAS_UPLO Uplo, F77_TR = C2F_CHAR(&TR); #endif - F77_zsyrk(F77_UL, F77_TR, &F77_N, &F77_K, alpha, A, &F77_lda, - beta, C, &F77_ldc); + F77_zsyrk(F77_UL, F77_TR, &F77_N, &F77_K, (dcomplex*)alpha, (dcomplex*)A, &F77_lda, + (dcomplex*)beta, (dcomplex*)C, &F77_ldc); } else cblas_xerbla(1, "cblas_zsyrk", "Illegal Order setting, %d\n", Order); CBLAS_CallFromC = 0; diff --git a/frame/compat/cblas/src/cblas_ztbmv.c b/frame/compat/cblas/src/cblas_ztbmv.c index 3bb6fe7ad..3c7f58b96 100644 --- a/frame/compat/cblas/src/cblas_ztbmv.c +++ b/frame/compat/cblas/src/cblas_ztbmv.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_ztbmv.c @@ -13,10 +9,10 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_ztbmv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const enum CBLAS_TRANSPOSE TransA, const enum CBLAS_DIAG Diag, - const int N, const int K, const void *A, const int lda, - void *X, const int incX) +void cblas_ztbmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, + f77_int N, f77_int K, const void *A, f77_int lda, + void *X, f77_int incX) { char TA; char UL; @@ -78,7 +74,7 @@ void cblas_ztbmv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, F77_TA = C2F_CHAR(&TA); F77_DI = C2F_CHAR(&DI); #endif - F77_ztbmv( F77_UL, F77_TA, F77_DI, &F77_N, &F77_K, A, &F77_lda, X, + F77_ztbmv( F77_UL, F77_TA, F77_DI, &F77_N, &F77_K, (dcomplex*)A, &F77_lda, (dcomplex*)X, &F77_incX); } else if (order == CblasRowMajor) @@ -141,7 +137,7 @@ void cblas_ztbmv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, F77_DI = C2F_CHAR(&DI); #endif - F77_ztbmv( F77_UL, F77_TA, F77_DI, &F77_N, &F77_K, A, &F77_lda, X, + F77_ztbmv( F77_UL, F77_TA, F77_DI, &F77_N, &F77_K, (dcomplex*)A, &F77_lda, (dcomplex*)X, &F77_incX); if (TransA == CblasConjTrans) diff --git a/frame/compat/cblas/src/cblas_ztbsv.c b/frame/compat/cblas/src/cblas_ztbsv.c index f08faf044..56d936e1b 100644 --- a/frame/compat/cblas/src/cblas_ztbsv.c +++ b/frame/compat/cblas/src/cblas_ztbsv.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_ztbsv.c @@ -13,10 +9,10 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_ztbsv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const enum CBLAS_TRANSPOSE TransA, const enum CBLAS_DIAG Diag, - const int N, const int K, const void *A, const int lda, - void *X, const int incX) +void cblas_ztbsv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, + f77_int N, f77_int K, const void *A, f77_int lda, + void *X, f77_int incX) { char TA; char UL; @@ -78,7 +74,7 @@ void cblas_ztbsv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, F77_TA = C2F_CHAR(&TA); F77_DI = C2F_CHAR(&DI); #endif - F77_ztbsv( F77_UL, F77_TA, F77_DI, &F77_N, &F77_K, A, &F77_lda, X, + F77_ztbsv( F77_UL, F77_TA, F77_DI, &F77_N, &F77_K, (dcomplex*)A, &F77_lda, (dcomplex*)X, &F77_incX); } else if (order == CblasRowMajor) @@ -145,7 +141,7 @@ void cblas_ztbsv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, F77_DI = C2F_CHAR(&DI); #endif - F77_ztbsv( F77_UL, F77_TA, F77_DI, &F77_N, &F77_K, A, &F77_lda, X, + F77_ztbsv( F77_UL, F77_TA, F77_DI, &F77_N, &F77_K, (dcomplex*)A, &F77_lda, (dcomplex*)X, &F77_incX); if (TransA == CblasConjTrans) diff --git a/frame/compat/cblas/src/cblas_ztpmv.c b/frame/compat/cblas/src/cblas_ztpmv.c index 2a6dfd97a..a8717ccc5 100644 --- a/frame/compat/cblas/src/cblas_ztpmv.c +++ b/frame/compat/cblas/src/cblas_ztpmv.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_ztpmv.c @@ -13,9 +9,9 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_ztpmv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const enum CBLAS_TRANSPOSE TransA, const enum CBLAS_DIAG Diag, - const int N, const void *Ap, void *X, const int incX) +void cblas_ztpmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, + f77_int N, const void *Ap, void *X, f77_int incX) { char TA; char UL; @@ -75,7 +71,7 @@ void cblas_ztpmv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, F77_TA = C2F_CHAR(&TA); F77_DI = C2F_CHAR(&DI); #endif - F77_ztpmv( F77_UL, F77_TA, F77_DI, &F77_N, Ap, X, &F77_incX); + F77_ztpmv( F77_UL, F77_TA, F77_DI, &F77_N, (dcomplex*)Ap, (dcomplex*)X, &F77_incX); } else if (order == CblasRowMajor) { @@ -137,7 +133,7 @@ void cblas_ztpmv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, F77_DI = C2F_CHAR(&DI); #endif - F77_ztpmv( F77_UL, F77_TA, F77_DI, &F77_N, Ap, X,&F77_incX); + F77_ztpmv( F77_UL, F77_TA, F77_DI, &F77_N, (dcomplex*)Ap, (dcomplex*)X,&F77_incX); if (TransA == CblasConjTrans) { if (N > 0) diff --git a/frame/compat/cblas/src/cblas_ztpsv.c b/frame/compat/cblas/src/cblas_ztpsv.c index 0ccc60faa..4aa3706cc 100644 --- a/frame/compat/cblas/src/cblas_ztpsv.c +++ b/frame/compat/cblas/src/cblas_ztpsv.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_ztpsv.c @@ -13,9 +9,9 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_ztpsv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const enum CBLAS_TRANSPOSE TransA, const enum CBLAS_DIAG Diag, - const int N, const void *Ap, void *X, const int incX) +void cblas_ztpsv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, + f77_int N, const void *Ap, void *X, f77_int incX) { char TA; char UL; @@ -75,7 +71,7 @@ void cblas_ztpsv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, F77_TA = C2F_CHAR(&TA); F77_DI = C2F_CHAR(&DI); #endif - F77_ztpsv( F77_UL, F77_TA, F77_DI, &F77_N, Ap, X, &F77_incX); + F77_ztpsv( F77_UL, F77_TA, F77_DI, &F77_N, (dcomplex*)Ap, (dcomplex*)X, &F77_incX); } else if (order == CblasRowMajor) { @@ -141,7 +137,7 @@ void cblas_ztpsv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, F77_DI = C2F_CHAR(&DI); #endif - F77_ztpsv( F77_UL, F77_TA, F77_DI, &F77_N, Ap, X,&F77_incX); + F77_ztpsv( F77_UL, F77_TA, F77_DI, &F77_N, (dcomplex*)Ap, (dcomplex*)X,&F77_incX); if (TransA == CblasConjTrans) { diff --git a/frame/compat/cblas/src/cblas_ztrmm.c b/frame/compat/cblas/src/cblas_ztrmm.c index df5905eda..6fa8a2ca9 100644 --- a/frame/compat/cblas/src/cblas_ztrmm.c +++ b/frame/compat/cblas/src/cblas_ztrmm.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * @@ -15,11 +11,11 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_ztrmm(const enum CBLAS_ORDER Order, const enum CBLAS_SIDE Side, - const enum CBLAS_UPLO Uplo, const enum CBLAS_TRANSPOSE TransA, - const enum CBLAS_DIAG Diag, const int M, const int N, - const void *alpha, const void *A, const int lda, - void *B, const int ldb) +void cblas_ztrmm(enum CBLAS_ORDER Order, enum CBLAS_SIDE Side, + enum CBLAS_UPLO Uplo, const enum CBLAS_TRANSPOSE TransA, + enum CBLAS_DIAG Diag, f77_int M, f77_int N, + const void *alpha, const void *A, f77_int lda, + void *B, f77_int ldb) { char UL, TA, SD, DI; #ifdef F77_CHAR @@ -94,7 +90,7 @@ void cblas_ztrmm(const enum CBLAS_ORDER Order, const enum CBLAS_SIDE Side, F77_DI = C2F_CHAR(&DI); #endif - F77_ztrmm(F77_SD, F77_UL, F77_TA, F77_DI, &F77_M, &F77_N, alpha, A, &F77_lda, B, &F77_ldb); + F77_ztrmm(F77_SD, F77_UL, F77_TA, F77_DI, &F77_M, &F77_N, (dcomplex*)alpha, (dcomplex*)A, &F77_lda, (dcomplex*)B, &F77_ldb); } else if (Order == CblasRowMajor) { RowMajorStrg = 1; @@ -146,7 +142,7 @@ void cblas_ztrmm(const enum CBLAS_ORDER Order, const enum CBLAS_SIDE Side, F77_DI = C2F_CHAR(&DI); #endif - F77_ztrmm(F77_SD, F77_UL, F77_TA, F77_DI, &F77_N, &F77_M, alpha, A, &F77_lda, B, &F77_ldb); + F77_ztrmm(F77_SD, F77_UL, F77_TA, F77_DI, &F77_N, &F77_M, (dcomplex*)alpha, (dcomplex*)A, &F77_lda, (dcomplex*)B, &F77_ldb); } else cblas_xerbla(1, "cblas_ztrmm", "Illegal Order setting, %d\n", Order); CBLAS_CallFromC = 0; diff --git a/frame/compat/cblas/src/cblas_ztrmv.c b/frame/compat/cblas/src/cblas_ztrmv.c index 02c0c8685..590105d62 100644 --- a/frame/compat/cblas/src/cblas_ztrmv.c +++ b/frame/compat/cblas/src/cblas_ztrmv.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_ztrmv.c @@ -13,10 +9,10 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_ztrmv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const enum CBLAS_TRANSPOSE TransA, const enum CBLAS_DIAG Diag, - const int N, const void *A, const int lda, - void *X, const int incX) +void cblas_ztrmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, + f77_int N, const void *A, f77_int lda, + void *X, f77_int incX) { char TA; @@ -78,7 +74,7 @@ void cblas_ztrmv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, F77_TA = C2F_CHAR(&TA); F77_DI = C2F_CHAR(&DI); #endif - F77_ztrmv( F77_UL, F77_TA, F77_DI, &F77_N, A, &F77_lda, X, + F77_ztrmv( F77_UL, F77_TA, F77_DI, &F77_N, (dcomplex*)A, &F77_lda, (dcomplex*)X, &F77_incX); } else if (order == CblasRowMajor) @@ -140,7 +136,7 @@ void cblas_ztrmv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, F77_TA = C2F_CHAR(&TA); F77_DI = C2F_CHAR(&DI); #endif - F77_ztrmv( F77_UL, F77_TA, F77_DI, &F77_N, A, &F77_lda, X, + F77_ztrmv( F77_UL, F77_TA, F77_DI, &F77_N, (dcomplex*)A, &F77_lda, (dcomplex*)X, &F77_incX); if (TransA == CblasConjTrans) { diff --git a/frame/compat/cblas/src/cblas_ztrsm.c b/frame/compat/cblas/src/cblas_ztrsm.c index a0c6da8a1..a68c70e1c 100644 --- a/frame/compat/cblas/src/cblas_ztrsm.c +++ b/frame/compat/cblas/src/cblas_ztrsm.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * @@ -15,11 +11,11 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_ztrsm(const enum CBLAS_ORDER Order, const enum CBLAS_SIDE Side, - const enum CBLAS_UPLO Uplo, const enum CBLAS_TRANSPOSE TransA, - const enum CBLAS_DIAG Diag, const int M, const int N, - const void *alpha, const void *A, const int lda, - void *B, const int ldb) +void cblas_ztrsm(enum CBLAS_ORDER Order, enum CBLAS_SIDE Side, + enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE TransA, + enum CBLAS_DIAG Diag, f77_int M, f77_int N, + const void *alpha, const void *A, f77_int lda, + void *B, f77_int ldb) { char UL, TA, SD, DI; #ifdef F77_CHAR @@ -96,8 +92,8 @@ void cblas_ztrsm(const enum CBLAS_ORDER Order, const enum CBLAS_SIDE Side, F77_DI = C2F_CHAR(&DI); #endif - F77_ztrsm(F77_SD, F77_UL, F77_TA, F77_DI, &F77_M, &F77_N, alpha, A, - &F77_lda, B, &F77_ldb); + F77_ztrsm(F77_SD, F77_UL, F77_TA, F77_DI, &F77_M, &F77_N, (dcomplex*)alpha, (dcomplex*)A, + &F77_lda, (dcomplex*)B, &F77_ldb); } else if (Order == CblasRowMajor) { RowMajorStrg = 1; @@ -151,8 +147,8 @@ void cblas_ztrsm(const enum CBLAS_ORDER Order, const enum CBLAS_SIDE Side, #endif - F77_ztrsm(F77_SD, F77_UL, F77_TA, F77_DI, &F77_N, &F77_M, alpha, A, - &F77_lda, B, &F77_ldb); + F77_ztrsm(F77_SD, F77_UL, F77_TA, F77_DI, &F77_N, &F77_M, (dcomplex*)alpha, (dcomplex*)A, + &F77_lda, (dcomplex*)B, &F77_ldb); } else cblas_xerbla(1, "cblas_ztrsm", "Illegal Order setting, %d\n", Order); CBLAS_CallFromC = 0; diff --git a/frame/compat/cblas/src/cblas_ztrsv.c b/frame/compat/cblas/src/cblas_ztrsv.c index 63afc7ea0..1a541f7b1 100644 --- a/frame/compat/cblas/src/cblas_ztrsv.c +++ b/frame/compat/cblas/src/cblas_ztrsv.c @@ -1,8 +1,4 @@ -#include "bli_config.h" -#include "bli_config_macro_defs.h" -#include "bli_system.h" -#include "bli_type_defs.h" -#include "bli_cblas.h" +#include "blis.h" #ifdef BLIS_ENABLE_CBLAS /* * cblas_ztrsv.c @@ -13,10 +9,10 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_ztrsv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, - const enum CBLAS_TRANSPOSE TransA, const enum CBLAS_DIAG Diag, - const int N, const void *A, const int lda, void *X, - const int incX) +void cblas_ztrsv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, + enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, + f77_int N, const void *A, f77_int lda, void *X, + f77_int incX) { char TA; char UL; @@ -77,7 +73,7 @@ void cblas_ztrsv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, F77_TA = C2F_CHAR(&TA); F77_DI = C2F_CHAR(&DI); #endif - F77_ztrsv( F77_UL, F77_TA, F77_DI, &F77_N, A, &F77_lda, X, + F77_ztrsv( F77_UL, F77_TA, F77_DI, &F77_N, (dcomplex*)A, &F77_lda, (dcomplex*)X, &F77_incX); } else if (order == CblasRowMajor) @@ -140,7 +136,7 @@ void cblas_ztrsv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, F77_TA = C2F_CHAR(&TA); F77_DI = C2F_CHAR(&DI); #endif - F77_ztrsv( F77_UL, F77_TA, F77_DI, &F77_N, A, &F77_lda, X, + F77_ztrsv( F77_UL, F77_TA, F77_DI, &F77_N, (dcomplex*)A, &F77_lda, (dcomplex*)X, &F77_incX); if (TransA == CblasConjTrans) { diff --git a/frame/compat/check/bla_gemm_check.c b/frame/compat/check/bla_gemm_check.c index aa454e9e5..63ed6d09b 100644 --- a/frame/compat/check/bla_gemm_check.c +++ b/frame/compat/check/bla_gemm_check.c @@ -38,16 +38,16 @@ void bla_gemm_check ( - char* dt_str, - char* op_str, - f77_char* transa, - f77_char* transb, - f77_int* m, - f77_int* n, - f77_int* k, - f77_int* lda, - f77_int* ldb, - f77_int* ldc + const char* dt_str, + const char* op_str, + const f77_char* transa, + const f77_char* transb, + const f77_int* m, + const f77_int* n, + const f77_int* k, + const f77_int* lda, + const f77_int* ldb, + const f77_int* ldc ) { f77_int info = 0; diff --git a/frame/compat/check/bla_gemm_check.h b/frame/compat/check/bla_gemm_check.h index 338bc36a7..08daf5848 100644 --- a/frame/compat/check/bla_gemm_check.h +++ b/frame/compat/check/bla_gemm_check.h @@ -36,16 +36,16 @@ void bla_gemm_check ( - char* dt_str, - char* op_str, - f77_char* transa, - f77_char* transb, - f77_int* m, - f77_int* n, - f77_int* k, - f77_int* lda, - f77_int* ldb, - f77_int* ldc + const char* dt_str, + const char* op_str, + const f77_char* transa, + const f77_char* transb, + const f77_int* m, + const f77_int* n, + const f77_int* k, + const f77_int* lda, + const f77_int* ldb, + const f77_int* ldc ); #endif diff --git a/frame/compat/check/bla_gemv_check.c b/frame/compat/check/bla_gemv_check.c index bd135ac52..a731c6f62 100644 --- a/frame/compat/check/bla_gemv_check.c +++ b/frame/compat/check/bla_gemv_check.c @@ -38,14 +38,14 @@ void bla_gemv_check ( - char* dt_str, - char* op_str, - f77_char* transa, - f77_int* m, - f77_int* n, - f77_int* lda, - f77_int* incx, - f77_int* incy + const char* dt_str, + const char* op_str, + const f77_char* transa, + const f77_int* m, + const f77_int* n, + const f77_int* lda, + const f77_int* incx, + const f77_int* incy ) { f77_int info = 0; diff --git a/frame/compat/check/bla_gemv_check.h b/frame/compat/check/bla_gemv_check.h index 452d900cc..1fae167d3 100644 --- a/frame/compat/check/bla_gemv_check.h +++ b/frame/compat/check/bla_gemv_check.h @@ -36,14 +36,14 @@ void bla_gemv_check ( - char* dt_str, - char* op_str, - f77_char* transa, - f77_int* m, - f77_int* n, - f77_int* lda, - f77_int* incx, - f77_int* incy + const char* dt_str, + const char* op_str, + const f77_char* transa, + const f77_int* m, + const f77_int* n, + const f77_int* lda, + const f77_int* incx, + const f77_int* incy ); #endif diff --git a/frame/compat/check/bla_ger_check.c b/frame/compat/check/bla_ger_check.c index 7f8190c80..54656b873 100644 --- a/frame/compat/check/bla_ger_check.c +++ b/frame/compat/check/bla_ger_check.c @@ -38,13 +38,13 @@ void bla_ger_check ( - char* dt_str, - char* op_str, - f77_int* m, - f77_int* n, - f77_int* incx, - f77_int* incy, - f77_int* lda + const char* dt_str, + const char* op_str, + const f77_int* m, + const f77_int* n, + const f77_int* incx, + const f77_int* incy, + const f77_int* lda ) { f77_int info = 0; diff --git a/frame/compat/check/bla_ger_check.h b/frame/compat/check/bla_ger_check.h index a2733b570..ae4b5f295 100644 --- a/frame/compat/check/bla_ger_check.h +++ b/frame/compat/check/bla_ger_check.h @@ -36,13 +36,13 @@ void bla_ger_check ( - char* dt_str, - char* op_str, - f77_int* m, - f77_int* n, - f77_int* lda, - f77_int* incx, - f77_int* incy + const char* dt_str, + const char* op_str, + const f77_int* m, + const f77_int* n, + const f77_int* lda, + const f77_int* incx, + const f77_int* incy ); #endif diff --git a/frame/compat/check/bla_hemm_check.c b/frame/compat/check/bla_hemm_check.c index 9dd8b6500..6f8ffa07b 100644 --- a/frame/compat/check/bla_hemm_check.c +++ b/frame/compat/check/bla_hemm_check.c @@ -38,15 +38,15 @@ void bla_hemm_check ( - char* dt_str, - char* op_str, - f77_char* sidea, - f77_char* uploa, - f77_int* m, - f77_int* n, - f77_int* lda, - f77_int* ldb, - f77_int* ldc + const char* dt_str, + const char* op_str, + const f77_char* sidea, + const f77_char* uploa, + const f77_int* m, + const f77_int* n, + const f77_int* lda, + const f77_int* ldb, + const f77_int* ldc ) { f77_int info = 0; diff --git a/frame/compat/check/bla_hemm_check.h b/frame/compat/check/bla_hemm_check.h index 0a5323e4c..b99c9641b 100644 --- a/frame/compat/check/bla_hemm_check.h +++ b/frame/compat/check/bla_hemm_check.h @@ -36,15 +36,15 @@ void bla_hemm_check ( - char* dt_str, - char* op_str, - f77_char* sidea, - f77_char* uploa, - f77_int* m, - f77_int* n, - f77_int* lda, - f77_int* ldb, - f77_int* ldc + const char* dt_str, + const char* op_str, + const f77_char* sidea, + const f77_char* uploa, + const f77_int* m, + const f77_int* n, + const f77_int* lda, + const f77_int* ldb, + const f77_int* ldc ); #endif diff --git a/frame/compat/check/bla_hemv_check.c b/frame/compat/check/bla_hemv_check.c index ad6209890..c671f6f4d 100644 --- a/frame/compat/check/bla_hemv_check.c +++ b/frame/compat/check/bla_hemv_check.c @@ -38,13 +38,13 @@ void bla_hemv_check ( - char* dt_str, - char* op_str, - f77_char* uploa, - f77_int* m, - f77_int* lda, - f77_int* incx, - f77_int* incy + const char* dt_str, + const char* op_str, + const f77_char* uploa, + const f77_int* m, + const f77_int* lda, + const f77_int* incx, + const f77_int* incy ) { f77_int info = 0; diff --git a/frame/compat/check/bla_hemv_check.h b/frame/compat/check/bla_hemv_check.h index 742abd8cb..e203c8340 100644 --- a/frame/compat/check/bla_hemv_check.h +++ b/frame/compat/check/bla_hemv_check.h @@ -36,13 +36,13 @@ void bla_hemv_check ( - char* dt_str, - char* op_str, - f77_char* uploa, - f77_int* m, - f77_int* lda, - f77_int* incx, - f77_int* incy + const char* dt_str, + const char* op_str, + const f77_char* uploa, + const f77_int* m, + const f77_int* lda, + const f77_int* incx, + const f77_int* incy ); #endif diff --git a/frame/compat/check/bla_her2_check.c b/frame/compat/check/bla_her2_check.c index 7b989fbe0..7e1f41fde 100644 --- a/frame/compat/check/bla_her2_check.c +++ b/frame/compat/check/bla_her2_check.c @@ -38,13 +38,13 @@ void bla_her2_check ( - char* dt_str, - char* op_str, - f77_char* uploc, - f77_int* m, - f77_int* incx, - f77_int* incy, - f77_int* lda + const char* dt_str, + const char* op_str, + const f77_char* uploc, + const f77_int* m, + const f77_int* incx, + const f77_int* incy, + const f77_int* lda ) { f77_int info = 0; diff --git a/frame/compat/check/bla_her2_check.h b/frame/compat/check/bla_her2_check.h index 684080768..f90ccae06 100644 --- a/frame/compat/check/bla_her2_check.h +++ b/frame/compat/check/bla_her2_check.h @@ -36,13 +36,13 @@ void bla_her2_check ( - char* dt_str, - char* op_str, - f77_char* uploa, - f77_int* m, - f77_int* incx, - f77_int* incy, - f77_int* lda + const char* dt_str, + const char* op_str, + const f77_char* uploa, + const f77_int* m, + const f77_int* incx, + const f77_int* incy, + const f77_int* lda ); #endif diff --git a/frame/compat/check/bla_her2k_check.c b/frame/compat/check/bla_her2k_check.c index 151c18308..61b8ce7d4 100644 --- a/frame/compat/check/bla_her2k_check.c +++ b/frame/compat/check/bla_her2k_check.c @@ -38,15 +38,15 @@ void bla_her2k_check ( - char* dt_str, - char* op_str, - f77_char* uploa, - f77_char* trans, - f77_int* m, - f77_int* k, - f77_int* lda, - f77_int* ldb, - f77_int* ldc + const char* dt_str, + const char* op_str, + const f77_char* uploa, + const f77_char* trans, + const f77_int* m, + const f77_int* k, + const f77_int* lda, + const f77_int* ldb, + const f77_int* ldc ) { f77_int info = 0; diff --git a/frame/compat/check/bla_her2k_check.h b/frame/compat/check/bla_her2k_check.h index 9b5657481..e5276d215 100644 --- a/frame/compat/check/bla_her2k_check.h +++ b/frame/compat/check/bla_her2k_check.h @@ -36,15 +36,15 @@ void bla_her2k_check ( - char* dt_str, - char* op_str, - f77_char* uploa, - f77_char* transa, - f77_int* m, - f77_int* k, - f77_int* lda, - f77_int* ldb, - f77_int* ldc + const char* dt_str, + const char* op_str, + const f77_char* uploa, + const f77_char* transa, + const f77_int* m, + const f77_int* k, + const f77_int* lda, + const f77_int* ldb, + const f77_int* ldc ); #endif diff --git a/frame/compat/check/bla_her_check.c b/frame/compat/check/bla_her_check.c index 9ebde741c..9a42a71c0 100644 --- a/frame/compat/check/bla_her_check.c +++ b/frame/compat/check/bla_her_check.c @@ -38,12 +38,12 @@ void bla_her_check ( - char* dt_str, - char* op_str, - f77_char* uploc, - f77_int* m, - f77_int* incx, - f77_int* lda + const char* dt_str, + const char* op_str, + const f77_char* uploc, + const f77_int* m, + const f77_int* incx, + const f77_int* lda ) { f77_int info = 0; diff --git a/frame/compat/check/bla_her_check.h b/frame/compat/check/bla_her_check.h index 18a9fbb89..90869e757 100644 --- a/frame/compat/check/bla_her_check.h +++ b/frame/compat/check/bla_her_check.h @@ -36,12 +36,12 @@ void bla_her_check ( - char* dt_str, - char* op_str, - f77_char* uploa, - f77_int* m, - f77_int* incx, - f77_int* lda + const char* dt_str, + const char* op_str, + const f77_char* uploa, + const f77_int* m, + const f77_int* incx, + const f77_int* lda ); #endif diff --git a/frame/compat/check/bla_herk_check.c b/frame/compat/check/bla_herk_check.c index 65195cd88..836c4dcdf 100644 --- a/frame/compat/check/bla_herk_check.c +++ b/frame/compat/check/bla_herk_check.c @@ -38,14 +38,14 @@ void bla_herk_check ( - char* dt_str, - char* op_str, - f77_char* uploc, - f77_char* transa, - f77_int* m, - f77_int* k, - f77_int* lda, - f77_int* ldc + const char* dt_str, + const char* op_str, + const f77_char* uploc, + const f77_char* transa, + const f77_int* m, + const f77_int* k, + const f77_int* lda, + const f77_int* ldc ) { f77_int info = 0; diff --git a/frame/compat/check/bla_herk_check.h b/frame/compat/check/bla_herk_check.h index 7abc9cceb..4b518399e 100644 --- a/frame/compat/check/bla_herk_check.h +++ b/frame/compat/check/bla_herk_check.h @@ -36,14 +36,14 @@ void bla_herk_check ( - char* dt_str, - char* op_str, - f77_char* uploc, - f77_char* transa, - f77_int* m, - f77_int* k, - f77_int* lda, - f77_int* ldc + const char* dt_str, + const char* op_str, + const f77_char* uploc, + const f77_char* transa, + const f77_int* m, + const f77_int* k, + const f77_int* lda, + const f77_int* ldc ); #endif diff --git a/frame/compat/check/bla_symm_check.c b/frame/compat/check/bla_symm_check.c index e62540c39..4576a2387 100644 --- a/frame/compat/check/bla_symm_check.c +++ b/frame/compat/check/bla_symm_check.c @@ -38,15 +38,15 @@ void bla_symm_check ( - char* dt_str, - char* op_str, - f77_char* sidea, - f77_char* uploa, - f77_int* m, - f77_int* n, - f77_int* lda, - f77_int* ldb, - f77_int* ldc + const char* dt_str, + const char* op_str, + const f77_char* sidea, + const f77_char* uploa, + const f77_int* m, + const f77_int* n, + const f77_int* lda, + const f77_int* ldb, + const f77_int* ldc ) { bla_hemm_check diff --git a/frame/compat/check/bla_symm_check.h b/frame/compat/check/bla_symm_check.h index 2bf18d085..faf6db548 100644 --- a/frame/compat/check/bla_symm_check.h +++ b/frame/compat/check/bla_symm_check.h @@ -36,15 +36,15 @@ void bla_symm_check ( - char* dt_str, - char* op_str, - f77_char* sidea, - f77_char* uploa, - f77_int* m, - f77_int* n, - f77_int* lda, - f77_int* ldb, - f77_int* ldc + const char* dt_str, + const char* op_str, + const f77_char* sidea, + const f77_char* uploa, + const f77_int* m, + const f77_int* n, + const f77_int* lda, + const f77_int* ldb, + const f77_int* ldc ); #endif diff --git a/frame/compat/check/bla_symv_check.c b/frame/compat/check/bla_symv_check.c index 355a16766..25875c234 100644 --- a/frame/compat/check/bla_symv_check.c +++ b/frame/compat/check/bla_symv_check.c @@ -38,13 +38,13 @@ void bla_symv_check ( - char* dt_str, - char* op_str, - f77_char* uploa, - f77_int* m, - f77_int* lda, - f77_int* incx, - f77_int* incy + const char* dt_str, + const char* op_str, + const f77_char* uploa, + const f77_int* m, + const f77_int* lda, + const f77_int* incx, + const f77_int* incy ) { bla_hemv_check diff --git a/frame/compat/check/bla_symv_check.h b/frame/compat/check/bla_symv_check.h index 8149cdf54..8134a84c0 100644 --- a/frame/compat/check/bla_symv_check.h +++ b/frame/compat/check/bla_symv_check.h @@ -36,13 +36,13 @@ void bla_symv_check ( - char* dt_str, - char* op_str, - f77_char* uploa, - f77_int* m, - f77_int* lda, - f77_int* incx, - f77_int* incy + const char* dt_str, + const char* op_str, + const f77_char* uploa, + const f77_int* m, + const f77_int* lda, + const f77_int* incx, + const f77_int* incy ); #endif diff --git a/frame/compat/check/bla_syr2_check.c b/frame/compat/check/bla_syr2_check.c index 82ffcc4e7..0f56b9796 100644 --- a/frame/compat/check/bla_syr2_check.c +++ b/frame/compat/check/bla_syr2_check.c @@ -38,13 +38,13 @@ void bla_syr2_check ( - char* dt_str, - char* op_str, - f77_char* uploc, - f77_int* m, - f77_int* incx, - f77_int* incy, - f77_int* lda + const char* dt_str, + const char* op_str, + const f77_char* uploc, + const f77_int* m, + const f77_int* incx, + const f77_int* incy, + const f77_int* lda ) { bla_her2_check diff --git a/frame/compat/check/bla_syr2_check.h b/frame/compat/check/bla_syr2_check.h index 782a32149..01b8a24b9 100644 --- a/frame/compat/check/bla_syr2_check.h +++ b/frame/compat/check/bla_syr2_check.h @@ -36,13 +36,13 @@ void bla_syr2_check ( - char* dt_str, - char* op_str, - f77_char* uploa, - f77_int* m, - f77_int* incx, - f77_int* incy, - f77_int* lda + const char* dt_str, + const char* op_str, + const f77_char* uploa, + const f77_int* m, + const f77_int* incx, + const f77_int* incy, + const f77_int* lda ); #endif diff --git a/frame/compat/check/bla_syr2k_check.c b/frame/compat/check/bla_syr2k_check.c index 78386fbab..f47ed6358 100644 --- a/frame/compat/check/bla_syr2k_check.c +++ b/frame/compat/check/bla_syr2k_check.c @@ -38,15 +38,15 @@ void bla_syr2k_check ( - char* dt_str, - char* op_str, - f77_char* uploa, - f77_char* trans, - f77_int* m, - f77_int* k, - f77_int* lda, - f77_int* ldb, - f77_int* ldc + const char* dt_str, + const char* op_str, + const f77_char* uploa, + const f77_char* trans, + const f77_int* m, + const f77_int* k, + const f77_int* lda, + const f77_int* ldb, + const f77_int* ldc ) { f77_int info = 0; diff --git a/frame/compat/check/bla_syr2k_check.h b/frame/compat/check/bla_syr2k_check.h index d9a3cd0f3..752af0c32 100644 --- a/frame/compat/check/bla_syr2k_check.h +++ b/frame/compat/check/bla_syr2k_check.h @@ -36,15 +36,15 @@ void bla_syr2k_check ( - char* dt_str, - char* op_str, - f77_char* uploa, - f77_char* trans, - f77_int* m, - f77_int* k, - f77_int* lda, - f77_int* ldb, - f77_int* ldc + const char* dt_str, + const char* op_str, + const f77_char* uploa, + const f77_char* trans, + const f77_int* m, + const f77_int* k, + const f77_int* lda, + const f77_int* ldb, + const f77_int* ldc ); #endif diff --git a/frame/compat/check/bla_syr_check.c b/frame/compat/check/bla_syr_check.c index 12647837c..af4a76f12 100644 --- a/frame/compat/check/bla_syr_check.c +++ b/frame/compat/check/bla_syr_check.c @@ -38,12 +38,12 @@ void bla_syr_check ( - char* dt_str, - char* op_str, - f77_char* uploc, - f77_int* m, - f77_int* incx, - f77_int* lda + const char* dt_str, + const char* op_str, + const f77_char* uploc, + const f77_int* m, + const f77_int* incx, + const f77_int* lda ) { bla_her_check diff --git a/frame/compat/check/bla_syr_check.h b/frame/compat/check/bla_syr_check.h index 93d368d11..9c28dd1b1 100644 --- a/frame/compat/check/bla_syr_check.h +++ b/frame/compat/check/bla_syr_check.h @@ -36,12 +36,12 @@ void bla_syr_check ( - char* dt_str, - char* op_str, - f77_char* uploa, - f77_int* m, - f77_int* incx, - f77_int* lda + const char* dt_str, + const char* op_str, + const f77_char* uploa, + const f77_int* m, + const f77_int* incx, + const f77_int* lda ); #endif diff --git a/frame/compat/check/bla_syrk_check.c b/frame/compat/check/bla_syrk_check.c index cbc9eb59e..2addb151e 100644 --- a/frame/compat/check/bla_syrk_check.c +++ b/frame/compat/check/bla_syrk_check.c @@ -38,14 +38,14 @@ void bla_syrk_check ( - char* dt_str, - char* op_str, - f77_char* uploc, - f77_char* transa, - f77_int* m, - f77_int* k, - f77_int* lda, - f77_int* ldc + const char* dt_str, + const char* op_str, + const f77_char* uploc, + const f77_char* transa, + const f77_int* m, + const f77_int* k, + const f77_int* lda, + const f77_int* ldc ) { f77_int info = 0; diff --git a/frame/compat/check/bla_syrk_check.h b/frame/compat/check/bla_syrk_check.h index 7ed796e15..c44f68440 100644 --- a/frame/compat/check/bla_syrk_check.h +++ b/frame/compat/check/bla_syrk_check.h @@ -36,14 +36,14 @@ void bla_syrk_check ( - char* dt_str, - char* op_str, - f77_char* uploc, - f77_char* transa, - f77_int* m, - f77_int* k, - f77_int* lda, - f77_int* ldc + const char* dt_str, + const char* op_str, + const f77_char* uploc, + const f77_char* transa, + const f77_int* m, + const f77_int* k, + const f77_int* lda, + const f77_int* ldc ); #endif diff --git a/frame/compat/check/bla_trmm_check.c b/frame/compat/check/bla_trmm_check.c index e5f73f051..6f1568eaf 100644 --- a/frame/compat/check/bla_trmm_check.c +++ b/frame/compat/check/bla_trmm_check.c @@ -38,16 +38,16 @@ void bla_trmm_check ( - char* dt_str, - char* op_str, - f77_char* sidea, - f77_char* uploa, - f77_char* transa, - f77_char* diaga, - f77_int* m, - f77_int* n, - f77_int* lda, - f77_int* ldb + const char* dt_str, + const char* op_str, + const f77_char* sidea, + const f77_char* uploa, + const f77_char* transa, + const f77_char* diaga, + const f77_int* m, + const f77_int* n, + const f77_int* lda, + const f77_int* ldb ) { f77_int info = 0; diff --git a/frame/compat/check/bla_trmm_check.h b/frame/compat/check/bla_trmm_check.h index f004c2534..6b68102ef 100644 --- a/frame/compat/check/bla_trmm_check.h +++ b/frame/compat/check/bla_trmm_check.h @@ -36,16 +36,16 @@ void bla_trmm_check ( - char* dt_str, - char* op_str, - f77_char* sidea, - f77_char* uploa, - f77_char* transa, - f77_char* diaga, - f77_int* m, - f77_int* n, - f77_int* lda, - f77_int* ldb + const char* dt_str, + const char* op_str, + const f77_char* sidea, + const f77_char* uploa, + const f77_char* transa, + const f77_char* diaga, + const f77_int* m, + const f77_int* n, + const f77_int* lda, + const f77_int* ldb ); #endif diff --git a/frame/compat/check/bla_trmv_check.c b/frame/compat/check/bla_trmv_check.c index 04ea061ef..9f8a8ba36 100644 --- a/frame/compat/check/bla_trmv_check.c +++ b/frame/compat/check/bla_trmv_check.c @@ -38,14 +38,14 @@ void bla_trmv_check ( - char* dt_str, - char* op_str, - f77_char* uploa, - f77_char* transa, - f77_char* diaga, - f77_int* m, - f77_int* lda, - f77_int* incx + const char* dt_str, + const char* op_str, + const f77_char* uploa, + const f77_char* transa, + const f77_char* diaga, + const f77_int* m, + const f77_int* lda, + const f77_int* incx ) { f77_int info = 0; diff --git a/frame/compat/check/bla_trmv_check.h b/frame/compat/check/bla_trmv_check.h index 81d2be9d5..6ac6fb88f 100644 --- a/frame/compat/check/bla_trmv_check.h +++ b/frame/compat/check/bla_trmv_check.h @@ -36,14 +36,14 @@ void bla_trmv_check ( - char* dt_str, - char* op_str, - f77_char* uploa, - f77_char* transa, - f77_char* diaga, - f77_int* m, - f77_int* lda, - f77_int* incx + const char* dt_str, + const char* op_str, + const f77_char* uploa, + const f77_char* transa, + const f77_char* diaga, + const f77_int* m, + const f77_int* lda, + const f77_int* incx ); #endif diff --git a/frame/compat/check/bla_trsm_check.c b/frame/compat/check/bla_trsm_check.c index f3e878c4e..2f200baa7 100644 --- a/frame/compat/check/bla_trsm_check.c +++ b/frame/compat/check/bla_trsm_check.c @@ -38,16 +38,16 @@ void bla_trsm_check ( - char* dt_str, - char* op_str, - f77_char* sidea, - f77_char* uploa, - f77_char* transa, - f77_char* diaga, - f77_int* m, - f77_int* n, - f77_int* lda, - f77_int* ldb + const char* dt_str, + const char* op_str, + const f77_char* sidea, + const f77_char* uploa, + const f77_char* transa, + const f77_char* diaga, + const f77_int* m, + const f77_int* n, + const f77_int* lda, + const f77_int* ldb ) { bla_trmm_check diff --git a/frame/compat/check/bla_trsm_check.h b/frame/compat/check/bla_trsm_check.h index dd45cce05..d5f303951 100644 --- a/frame/compat/check/bla_trsm_check.h +++ b/frame/compat/check/bla_trsm_check.h @@ -36,16 +36,16 @@ void bla_trsm_check ( - char* dt_str, - char* op_str, - f77_char* sidea, - f77_char* uploa, - f77_char* transa, - f77_char* diaga, - f77_int* m, - f77_int* n, - f77_int* lda, - f77_int* ldb + const char* dt_str, + const char* op_str, + const f77_char* sidea, + const f77_char* uploa, + const f77_char* transa, + const f77_char* diaga, + const f77_int* m, + const f77_int* n, + const f77_int* lda, + const f77_int* ldb ); #endif diff --git a/frame/compat/check/bla_trsv_check.c b/frame/compat/check/bla_trsv_check.c index 913ac502d..0b6b66062 100644 --- a/frame/compat/check/bla_trsv_check.c +++ b/frame/compat/check/bla_trsv_check.c @@ -38,14 +38,14 @@ void bla_trsv_check ( - char* dt_str, - char* op_str, - f77_char* uploa, - f77_char* transa, - f77_char* diaga, - f77_int* m, - f77_int* lda, - f77_int* incx + const char* dt_str, + const char* op_str, + const f77_char* uploa, + const f77_char* transa, + const f77_char* diaga, + const f77_int* m, + const f77_int* lda, + const f77_int* incx ) { bla_trmv_check diff --git a/frame/compat/check/bla_trsv_check.h b/frame/compat/check/bla_trsv_check.h index 42cd00689..a4e9e7d6c 100644 --- a/frame/compat/check/bla_trsv_check.h +++ b/frame/compat/check/bla_trsv_check.h @@ -36,14 +36,14 @@ void bla_trsv_check ( - char* dt_str, - char* op_str, - f77_char* uploa, - f77_char* transa, - f77_char* diaga, - f77_int* m, - f77_int* lda, - f77_int* incx + const char* dt_str, + const char* op_str, + const f77_char* uploa, + const f77_char* transa, + const f77_char* diaga, + const f77_int* m, + const f77_int* lda, + const f77_int* incx ); #endif diff --git a/frame/compat/f2c/bla_gbmv.c b/frame/compat/f2c/bla_gbmv.c index 0c66786d7..d3db8a618 100644 --- a/frame/compat/f2c/bla_gbmv.c +++ b/frame/compat/f2c/bla_gbmv.c @@ -41,22 +41,22 @@ -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(c,gbmv)(bla_character *trans, bla_integer *m, bla_integer *n, bla_integer *kl, bla_integer *ku, bla_scomplex *alpha, bla_scomplex *a, bla_integer *lda, bla_scomplex *x, bla_integer *incx, bla_scomplex *beta, bla_scomplex *y, bla_integer *incy) +/* Subroutine */ int PASTEF77(c,gbmv)(const bla_character *trans, const bla_integer *m, const bla_integer *n, const bla_integer *kl, const bla_integer *ku, const bla_scomplex *alpha, const bla_scomplex *a, const bla_integer *lda, const bla_scomplex *x, const bla_integer *incx, const bla_scomplex *beta, bla_scomplex *y, const bla_integer *incy) { /* System generated locals */ bla_integer a_dim1, a_offset, i__1, i__2, i__3, i__4, i__5, i__6; bla_scomplex q__1, q__2, q__3; /* Builtin functions */ - void bla_r_cnjg(bla_scomplex *, bla_scomplex *); + //void bla_r_cnjg(bla_scomplex *, bla_scomplex *); /* Local variables */ bla_integer info; bla_scomplex temp; bla_integer lenx, leny, i__, j, k; - extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); + //extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); bla_integer ix, iy, jx, jy, kx, ky; - extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); + //extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); bla_logical noconj; bla_integer kup1; @@ -482,7 +482,7 @@ -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(d,gbmv)(bla_character *trans, bla_integer *m, bla_integer *n, bla_integer *kl, bla_integer *ku, bla_double *alpha, bla_double *a, bla_integer *lda, bla_double *x, bla_integer *incx, bla_double *beta, bla_double *y, bla_integer *incy) +/* Subroutine */ int PASTEF77(d,gbmv)(const bla_character *trans, const bla_integer *m, const bla_integer *n, const bla_integer *kl, const bla_integer *ku, const bla_double *alpha, const bla_double *a, const bla_integer *lda, const bla_double *x, const bla_integer *incx, const bla_double *beta, bla_double *y, const bla_integer *incy) { /* System generated locals */ bla_integer a_dim1, a_offset, i__1, i__2, i__3, i__4, i__5, i__6; @@ -491,9 +491,9 @@ bla_integer info; bla_double temp; bla_integer lenx, leny, i__, j, k; - extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); + //extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); bla_integer ix, iy, jx, jy, kx, ky; - extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); + //extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); bla_integer kup1; /* .. Scalar Arguments .. */ @@ -838,7 +838,7 @@ -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(s,gbmv)(bla_character *trans, bla_integer *m, bla_integer *n, bla_integer *kl, bla_integer *ku, bla_real *alpha, bla_real *a, bla_integer *lda, bla_real *x, bla_integer * incx, bla_real *beta, bla_real *y, bla_integer *incy) +/* Subroutine */ int PASTEF77(s,gbmv)(const bla_character *trans, const bla_integer *m, const bla_integer *n, const bla_integer *kl, const bla_integer *ku, const bla_real *alpha, const bla_real *a, const bla_integer *lda, const bla_real *x, const bla_integer * incx, const bla_real *beta, bla_real *y, const bla_integer *incy) { /* System generated locals */ bla_integer a_dim1, a_offset, i__1, i__2, i__3, i__4, i__5, i__6; @@ -847,9 +847,9 @@ bla_integer info; bla_real temp; bla_integer lenx, leny, i__, j, k; - extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); + //extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); bla_integer ix, iy, jx, jy, kx, ky; - extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); + //extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); bla_integer kup1; /* .. Scalar Arguments .. */ @@ -1194,22 +1194,22 @@ -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(z,gbmv)(bla_character *trans, bla_integer *m, bla_integer *n, bla_integer *kl, bla_integer *ku, bla_dcomplex *alpha, bla_dcomplex *a, bla_integer *lda, bla_dcomplex *x, bla_integer *incx, bla_dcomplex *beta, bla_dcomplex * y, bla_integer *incy) +/* Subroutine */ int PASTEF77(z,gbmv)(const bla_character *trans, const bla_integer *m, const bla_integer *n, const bla_integer *kl, const bla_integer *ku, const bla_dcomplex *alpha, const bla_dcomplex *a, const bla_integer *lda, const bla_dcomplex *x, const bla_integer *incx, const bla_dcomplex *beta, bla_dcomplex * y, const bla_integer *incy) { /* System generated locals */ bla_integer a_dim1, a_offset, i__1, i__2, i__3, i__4, i__5, i__6; bla_dcomplex z__1, z__2, z__3; /* Builtin functions */ - void bla_d_cnjg(bla_dcomplex *, bla_dcomplex *); + //void bla_d_cnjg(bla_dcomplex *, bla_dcomplex *); /* Local variables */ bla_integer info; bla_dcomplex temp; bla_integer lenx, leny, i__, j, k; - extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); + //extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); bla_integer ix, iy, jx, jy, kx, ky; - extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); + //extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); bla_logical noconj; bla_integer kup1; diff --git a/frame/compat/f2c/bla_gbmv.h b/frame/compat/f2c/bla_gbmv.h index ec2bffe17..a060a0438 100644 --- a/frame/compat/f2c/bla_gbmv.h +++ b/frame/compat/f2c/bla_gbmv.h @@ -34,9 +34,9 @@ #ifdef BLIS_ENABLE_BLAS2BLIS -int PASTEF77(c,gbmv)(bla_character *trans, bla_integer *m, bla_integer *n, bla_integer *kl, bla_integer *ku, bla_scomplex *alpha, bla_scomplex *a, bla_integer *lda, bla_scomplex *x, bla_integer *incx, bla_scomplex *beta, bla_scomplex *y, bla_integer *incy); -int PASTEF77(d,gbmv)(bla_character *trans, bla_integer *m, bla_integer *n, bla_integer *kl, bla_integer *ku, bla_double *alpha, bla_double *a, bla_integer *lda, bla_double *x, bla_integer *incx, bla_double *beta, bla_double *y, bla_integer *incy); -int PASTEF77(s,gbmv)(bla_character *trans, bla_integer *m, bla_integer *n, bla_integer *kl, bla_integer *ku, bla_real *alpha, bla_real *a, bla_integer *lda, bla_real *x, bla_integer * incx, bla_real *beta, bla_real *y, bla_integer *incy); -int PASTEF77(z,gbmv)(bla_character *trans, bla_integer *m, bla_integer *n, bla_integer *kl, bla_integer *ku, bla_dcomplex *alpha, bla_dcomplex *a, bla_integer *lda, bla_dcomplex *x, bla_integer *incx, bla_dcomplex *beta, bla_dcomplex * y, bla_integer *incy); +int PASTEF77(c,gbmv)(const bla_character *trans, const bla_integer *m, const bla_integer *n, const bla_integer *kl, const bla_integer *ku, const bla_scomplex *alpha, const bla_scomplex *a, const bla_integer *lda, const bla_scomplex *x, const bla_integer *incx, const bla_scomplex *beta, bla_scomplex *y, const bla_integer *incy); +int PASTEF77(d,gbmv)(const bla_character *trans, const bla_integer *m, const bla_integer *n, const bla_integer *kl, const bla_integer *ku, const bla_double *alpha, const bla_double *a, const bla_integer *lda, const bla_double *x, const bla_integer *incx, const bla_double *beta, bla_double *y, const bla_integer *incy); +int PASTEF77(s,gbmv)(const bla_character *trans, const bla_integer *m, const bla_integer *n, const bla_integer *kl, const bla_integer *ku, const bla_real *alpha, const bla_real *a, const bla_integer *lda, const bla_real *x, const bla_integer * incx, const bla_real *beta, bla_real *y, const bla_integer *incy); +int PASTEF77(z,gbmv)(const bla_character *trans, const bla_integer *m, const bla_integer *n, const bla_integer *kl, const bla_integer *ku, const bla_dcomplex *alpha, const bla_dcomplex *a, const bla_integer *lda, const bla_dcomplex *x, const bla_integer *incx, const bla_dcomplex *beta, bla_dcomplex * y, const bla_integer *incy); #endif diff --git a/frame/compat/f2c/bla_hbmv.c b/frame/compat/f2c/bla_hbmv.c index 33ee628fb..ca32c5e06 100644 --- a/frame/compat/f2c/bla_hbmv.c +++ b/frame/compat/f2c/bla_hbmv.c @@ -41,7 +41,7 @@ -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(c,hbmv)(bla_character *uplo, bla_integer *n, bla_integer *k, bla_scomplex * alpha, bla_scomplex *a, bla_integer *lda, bla_scomplex *x, bla_integer *incx, bla_scomplex *beta, bla_scomplex *y, bla_integer *incy) +/* Subroutine */ int PASTEF77(c,hbmv)(const bla_character *uplo, const bla_integer *n, const bla_integer *k, const bla_scomplex * alpha, const bla_scomplex *a, const bla_integer *lda, const bla_scomplex *x, const bla_integer *incx, const bla_scomplex *beta, bla_scomplex *y, const bla_integer *incy) { /* System generated locals */ bla_integer a_dim1, a_offset, i__1, i__2, i__3, i__4, i__5; @@ -49,15 +49,15 @@ bla_scomplex q__1, q__2, q__3, q__4; /* Builtin functions */ - void bla_r_cnjg(bla_scomplex *, bla_scomplex *); + //void bla_r_cnjg(bla_scomplex *, bla_scomplex *); /* Local variables */ bla_integer info; bla_scomplex temp1, temp2; bla_integer i__, j, l; - extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); + //extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); bla_integer kplus1, ix, iy, jx, jy, kx, ky; - extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); + //extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); /* .. Scalar Arguments .. */ /* .. Array Arguments .. */ @@ -487,7 +487,7 @@ -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(z,hbmv)(bla_character *uplo, bla_integer *n, bla_integer *k, bla_dcomplex *alpha, bla_dcomplex *a, bla_integer *lda, bla_dcomplex *x, bla_integer * incx, bla_dcomplex *beta, bla_dcomplex *y, bla_integer *incy) +/* Subroutine */ int PASTEF77(z,hbmv)(const bla_character *uplo, const bla_integer *n, const bla_integer *k, const bla_dcomplex *alpha, const bla_dcomplex *a, const bla_integer *lda, const bla_dcomplex *x, const bla_integer * incx, const bla_dcomplex *beta, bla_dcomplex *y, const bla_integer *incy) { /* System generated locals */ bla_integer a_dim1, a_offset, i__1, i__2, i__3, i__4, i__5; @@ -495,15 +495,15 @@ bla_dcomplex z__1, z__2, z__3, z__4; /* Builtin functions */ - void bla_d_cnjg(bla_dcomplex *, bla_dcomplex *); + //void bla_d_cnjg(bla_dcomplex *, bla_dcomplex *); /* Local variables */ bla_integer info; bla_dcomplex temp1, temp2; bla_integer i__, j, l; - extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); + //extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); bla_integer kplus1, ix, iy, jx, jy, kx, ky; - extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); + //extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); /* .. Scalar Arguments .. */ /* .. Array Arguments .. */ diff --git a/frame/compat/f2c/bla_hbmv.h b/frame/compat/f2c/bla_hbmv.h index 406e7d1a9..b43ac9c08 100644 --- a/frame/compat/f2c/bla_hbmv.h +++ b/frame/compat/f2c/bla_hbmv.h @@ -34,7 +34,7 @@ #ifdef BLIS_ENABLE_BLAS2BLIS -int PASTEF77(c,hbmv)(bla_character *uplo, bla_integer *n, bla_integer *k, bla_scomplex * alpha, bla_scomplex *a, bla_integer *lda, bla_scomplex *x, bla_integer *incx, bla_scomplex *beta, bla_scomplex *y, bla_integer *incy); -int PASTEF77(z,hbmv)(bla_character *uplo, bla_integer *n, bla_integer *k, bla_dcomplex *alpha, bla_dcomplex *a, bla_integer *lda, bla_dcomplex *x, bla_integer * incx, bla_dcomplex *beta, bla_dcomplex *y, bla_integer *incy); +int PASTEF77(c,hbmv)(const bla_character *uplo, const bla_integer *n, const bla_integer *k, const bla_scomplex *alpha, const bla_scomplex *a, const bla_integer *lda, const bla_scomplex *x, const bla_integer *incx, const bla_scomplex *beta, bla_scomplex *y, const bla_integer *incy); +int PASTEF77(z,hbmv)(const bla_character *uplo, const bla_integer *n, const bla_integer *k, const bla_dcomplex *alpha, const bla_dcomplex *a, const bla_integer *lda, const bla_dcomplex *x, const bla_integer *incx, const bla_dcomplex *beta, bla_dcomplex *y, const bla_integer *incy); #endif diff --git a/frame/compat/f2c/bla_hpmv.c b/frame/compat/f2c/bla_hpmv.c index e43508fd6..8914db754 100644 --- a/frame/compat/f2c/bla_hpmv.c +++ b/frame/compat/f2c/bla_hpmv.c @@ -41,7 +41,7 @@ -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(c,hpmv)(bla_character *uplo, bla_integer *n, bla_scomplex *alpha, bla_scomplex * ap, bla_scomplex *x, bla_integer *incx, bla_scomplex *beta, bla_scomplex *y, bla_integer *incy) +/* Subroutine */ int PASTEF77(c,hpmv)(const bla_character *uplo, const bla_integer *n, const bla_scomplex *alpha, const bla_scomplex * ap, const bla_scomplex *x, const bla_integer *incx, const bla_scomplex *beta, bla_scomplex *y, const bla_integer *incy) { /* System generated locals */ bla_integer i__1, i__2, i__3, i__4, i__5; @@ -49,15 +49,15 @@ bla_scomplex q__1, q__2, q__3, q__4; /* Builtin functions */ - void bla_r_cnjg(bla_scomplex *, bla_scomplex *); + //void bla_r_cnjg(bla_scomplex *, bla_scomplex *); /* Local variables */ bla_integer info; bla_scomplex temp1, temp2; bla_integer i__, j, k; - extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); + //extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); bla_integer kk, ix, iy, jx, jy, kx, ky; - extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); + //extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); /* .. Scalar Arguments .. */ /* .. Array Arguments .. */ @@ -439,7 +439,7 @@ -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(z,hpmv)(bla_character *uplo, bla_integer *n, bla_dcomplex *alpha, bla_dcomplex *ap, bla_dcomplex *x, bla_integer *incx, bla_dcomplex *beta, bla_dcomplex *y, bla_integer *incy) +/* Subroutine */ int PASTEF77(z,hpmv)(const bla_character *uplo, const bla_integer *n, const bla_dcomplex *alpha, const bla_dcomplex *ap, const bla_dcomplex *x, const bla_integer *incx, const bla_dcomplex *beta, bla_dcomplex *y, const bla_integer *incy) { /* System generated locals */ bla_integer i__1, i__2, i__3, i__4, i__5; @@ -447,15 +447,15 @@ bla_dcomplex z__1, z__2, z__3, z__4; /* Builtin functions */ - void bla_d_cnjg(bla_dcomplex *, bla_dcomplex *); + //void bla_d_cnjg(bla_dcomplex *, bla_dcomplex *); /* Local variables */ bla_integer info; bla_dcomplex temp1, temp2; bla_integer i__, j, k; - extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); + //extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); bla_integer kk, ix, iy, jx, jy, kx, ky; - extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); + //extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); /* .. Scalar Arguments .. */ /* .. Array Arguments .. */ diff --git a/frame/compat/f2c/bla_hpmv.h b/frame/compat/f2c/bla_hpmv.h index 0878c8e4c..2adf446c9 100644 --- a/frame/compat/f2c/bla_hpmv.h +++ b/frame/compat/f2c/bla_hpmv.h @@ -34,7 +34,7 @@ #ifdef BLIS_ENABLE_BLAS2BLIS -int PASTEF77(c,hpmv)(bla_character *uplo, bla_integer *n, bla_scomplex *alpha, bla_scomplex * ap, bla_scomplex *x, bla_integer *incx, bla_scomplex *beta, bla_scomplex *y, bla_integer *incy); -int PASTEF77(z,hpmv)(bla_character *uplo, bla_integer *n, bla_dcomplex *alpha, bla_dcomplex *ap, bla_dcomplex *x, bla_integer *incx, bla_dcomplex *beta, bla_dcomplex *y, bla_integer *incy); +int PASTEF77(c,hpmv)(const bla_character *uplo, const bla_integer *n, const bla_scomplex *alpha, const bla_scomplex *ap, const bla_scomplex *x, const bla_integer *incx, const bla_scomplex *beta, bla_scomplex *y, const bla_integer *incy); +int PASTEF77(z,hpmv)(const bla_character *uplo, const bla_integer *n, const bla_dcomplex *alpha, const bla_dcomplex *ap, const bla_dcomplex *x, const bla_integer *incx, const bla_dcomplex *beta, bla_dcomplex *y, const bla_integer *incy); #endif diff --git a/frame/compat/f2c/bla_hpr.c b/frame/compat/f2c/bla_hpr.c index 7d110170c..cdf3f016f 100644 --- a/frame/compat/f2c/bla_hpr.c +++ b/frame/compat/f2c/bla_hpr.c @@ -41,7 +41,7 @@ -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(c,hpr)(bla_character *uplo, bla_integer *n, bla_real *alpha, bla_scomplex *x, bla_integer *incx, bla_scomplex *ap) +/* Subroutine */ int PASTEF77(c,hpr)(const bla_character *uplo, const bla_integer *n, const bla_real *alpha, const bla_scomplex *x, const bla_integer *incx, bla_scomplex *ap) { /* System generated locals */ bla_integer i__1, i__2, i__3, i__4, i__5; @@ -49,15 +49,15 @@ bla_scomplex q__1, q__2; /* Builtin functions */ - void bla_r_cnjg(bla_scomplex *, bla_scomplex *); + //void bla_r_cnjg(bla_scomplex *, bla_scomplex *); /* Local variables */ bla_integer info; bla_scomplex temp; bla_integer i__, j, k; - extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); + //extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); bla_integer kk, ix, jx, kx = 0; - extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); + //extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); /* .. Scalar Arguments .. */ /* .. Array Arguments .. */ @@ -353,7 +353,7 @@ -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(z,hpr)(bla_character *uplo, bla_integer *n, bla_double *alpha, bla_dcomplex *x, bla_integer *incx, bla_dcomplex *ap) +/* Subroutine */ int PASTEF77(z,hpr)(const bla_character *uplo, const bla_integer *n, const bla_double *alpha, const bla_dcomplex *x, const bla_integer *incx, bla_dcomplex *ap) { /* System generated locals */ bla_integer i__1, i__2, i__3, i__4, i__5; @@ -361,15 +361,15 @@ bla_dcomplex z__1, z__2; /* Builtin functions */ - void bla_d_cnjg(bla_dcomplex *, bla_dcomplex *); + //void bla_d_cnjg(bla_dcomplex *, bla_dcomplex *); /* Local variables */ bla_integer info; bla_dcomplex temp; bla_integer i__, j, k; - extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); + //extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); bla_integer kk, ix, jx, kx = 0; - extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); + //extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); /* .. Scalar Arguments .. */ /* .. Array Arguments .. */ diff --git a/frame/compat/f2c/bla_hpr.h b/frame/compat/f2c/bla_hpr.h index 036538f21..448c04bc0 100644 --- a/frame/compat/f2c/bla_hpr.h +++ b/frame/compat/f2c/bla_hpr.h @@ -34,7 +34,7 @@ #ifdef BLIS_ENABLE_BLAS2BLIS -int PASTEF77(c,hpr)(bla_character *uplo, bla_integer *n, bla_real *alpha, bla_scomplex *x, bla_integer *incx, bla_scomplex *ap); -int PASTEF77(z,hpr)(bla_character *uplo, bla_integer *n, bla_double *alpha, bla_dcomplex *x, bla_integer *incx, bla_dcomplex *ap); +int PASTEF77(c,hpr)(const bla_character *uplo, const bla_integer *n, const bla_real *alpha, const bla_scomplex *x, const bla_integer *incx, bla_scomplex *ap); +int PASTEF77(z,hpr)(const bla_character *uplo, const bla_integer *n, const bla_double *alpha, const bla_dcomplex *x, const bla_integer *incx, bla_dcomplex *ap); #endif diff --git a/frame/compat/f2c/bla_hpr2.c b/frame/compat/f2c/bla_hpr2.c index c1563fc56..432a67b4b 100644 --- a/frame/compat/f2c/bla_hpr2.c +++ b/frame/compat/f2c/bla_hpr2.c @@ -41,7 +41,7 @@ -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(c,hpr2)(bla_character *uplo, bla_integer *n, bla_scomplex *alpha, bla_scomplex *x, bla_integer *incx, bla_scomplex *y, bla_integer *incy, bla_scomplex *ap) +/* Subroutine */ int PASTEF77(c,hpr2)(const bla_character *uplo, const bla_integer *n, const bla_scomplex *alpha, const bla_scomplex *x, const bla_integer *incx, const bla_scomplex *y, const bla_integer *incy, bla_scomplex *ap) { /* System generated locals */ bla_integer i__1, i__2, i__3, i__4, i__5, i__6; @@ -49,15 +49,15 @@ bla_scomplex q__1, q__2, q__3, q__4; /* Builtin functions */ - void bla_r_cnjg(bla_scomplex *, bla_scomplex *); + //void bla_r_cnjg(bla_scomplex *, bla_scomplex *); /* Local variables */ bla_integer info; bla_scomplex temp1, temp2; bla_integer i__, j, k; - extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); + //extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); bla_integer kk, ix, iy, jx = 0, jy = 0, kx = 0, ky = 0; - extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); + //extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); /* .. Scalar Arguments .. */ /* .. Array Arguments .. */ @@ -429,7 +429,7 @@ -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(z,hpr2)(bla_character *uplo, bla_integer *n, bla_dcomplex *alpha, bla_dcomplex *x, bla_integer *incx, bla_dcomplex *y, bla_integer *incy, bla_dcomplex *ap) +/* Subroutine */ int PASTEF77(z,hpr2)(const bla_character *uplo, const bla_integer *n, const bla_dcomplex *alpha, const bla_dcomplex *x, const bla_integer *incx, const bla_dcomplex *y, const bla_integer *incy, bla_dcomplex *ap) { /* System generated locals */ bla_integer i__1, i__2, i__3, i__4, i__5, i__6; @@ -437,15 +437,15 @@ bla_dcomplex z__1, z__2, z__3, z__4; /* Builtin functions */ - void bla_d_cnjg(bla_dcomplex *, bla_dcomplex *); + //void bla_d_cnjg(bla_dcomplex *, bla_dcomplex *); /* Local variables */ bla_integer info; bla_dcomplex temp1, temp2; bla_integer i__, j, k; - extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); + //extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); bla_integer kk, ix, iy, jx = 0, jy = 0, kx = 0, ky = 0; - extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); + //extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); /* .. Scalar Arguments .. */ /* .. Array Arguments .. */ diff --git a/frame/compat/f2c/bla_hpr2.h b/frame/compat/f2c/bla_hpr2.h index 0b1e254b7..8e7db190c 100644 --- a/frame/compat/f2c/bla_hpr2.h +++ b/frame/compat/f2c/bla_hpr2.h @@ -34,7 +34,7 @@ #ifdef BLIS_ENABLE_BLAS2BLIS -int PASTEF77(c,hpr2)(bla_character *uplo, bla_integer *n, bla_scomplex *alpha, bla_scomplex *x, bla_integer *incx, bla_scomplex *y, bla_integer *incy, bla_scomplex *ap); -int PASTEF77(z,hpr2)(bla_character *uplo, bla_integer *n, bla_dcomplex *alpha, bla_dcomplex *x, bla_integer *incx, bla_dcomplex *y, bla_integer *incy, bla_dcomplex *ap); +int PASTEF77(c,hpr2)(const bla_character *uplo, const bla_integer *n, const bla_scomplex *alpha, const bla_scomplex *x, const bla_integer *incx, const bla_scomplex *y, const bla_integer *incy, bla_scomplex *ap); +int PASTEF77(z,hpr2)(const bla_character *uplo, const bla_integer *n, const bla_dcomplex *alpha, const bla_dcomplex *x, const bla_integer *incx, const bla_dcomplex *y, const bla_integer *incy, bla_dcomplex *ap); #endif diff --git a/frame/compat/f2c/bla_lsame.c b/frame/compat/f2c/bla_lsame.c index 9bd91bdc6..04f8caad0 100644 --- a/frame/compat/f2c/bla_lsame.c +++ b/frame/compat/f2c/bla_lsame.c @@ -41,7 +41,7 @@ -lf2c -lm (in that order) */ -bla_logical PASTEF770(lsame)(bla_character *ca, bla_character *cb, ftnlen ca_len, ftnlen cb_len) +bla_logical PASTEF770(lsame)(const bla_character *ca, const bla_character *cb, ftnlen ca_len, ftnlen cb_len) { /* System generated locals */ bla_logical ret_val; diff --git a/frame/compat/f2c/bla_lsame.h b/frame/compat/f2c/bla_lsame.h index 0b5eb175e..7e2f92389 100644 --- a/frame/compat/f2c/bla_lsame.h +++ b/frame/compat/f2c/bla_lsame.h @@ -34,6 +34,6 @@ #ifdef BLIS_ENABLE_BLAS2BLIS -bla_logical PASTEF770(lsame)(bla_character *ca, bla_character *cb, ftnlen ca_len, ftnlen cb_len); +bla_logical PASTEF770(lsame)(const bla_character *ca, const bla_character *cb, ftnlen ca_len, ftnlen cb_len); #endif diff --git a/frame/compat/f2c/bla_rot.c b/frame/compat/f2c/bla_rot.c index 18618ee5e..4b291cc9c 100644 --- a/frame/compat/f2c/bla_rot.c +++ b/frame/compat/f2c/bla_rot.c @@ -41,7 +41,7 @@ -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(s,rot)(bla_integer *n, bla_real *sx, bla_integer *incx, bla_real *sy, bla_integer *incy, bla_real *c__, bla_real *s) +/* Subroutine */ int PASTEF77(s,rot)(const bla_integer *n, bla_real *sx, const bla_integer *incx, bla_real *sy, const bla_integer *incy, const bla_real *c__, const bla_real *s) { /* System generated locals */ bla_integer i__1; @@ -109,7 +109,7 @@ L20: -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(d,rot)(bla_integer *n, bla_double *dx, bla_integer *incx, bla_double *dy, bla_integer *incy, bla_double *c__, bla_double *s) +/* Subroutine */ int PASTEF77(d,rot)(const bla_integer *n, bla_double *dx, const bla_integer *incx, bla_double *dy, const bla_integer *incy, const bla_double *c__, const bla_double *s) { /* System generated locals */ bla_integer i__1; @@ -177,7 +177,7 @@ L20: -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(cs,rot)(bla_integer *n, bla_scomplex *cx, bla_integer *incx, bla_scomplex *cy, bla_integer *incy, bla_real *c__, bla_real *s) +/* Subroutine */ int PASTEF77(cs,rot)(const bla_integer *n, bla_scomplex *cx, const bla_integer *incx, bla_scomplex *cy, const bla_integer *incy, const bla_real *c__, const bla_real *s) { /* System generated locals */ bla_integer i__1, i__2, i__3, i__4; @@ -270,7 +270,7 @@ L20: -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(zd,rot)(bla_integer *n, bla_dcomplex *zx, bla_integer *incx, bla_dcomplex *zy, bla_integer *incy, bla_double *c__, bla_double *s) +/* Subroutine */ int PASTEF77(zd,rot)(const bla_integer *n, bla_dcomplex *zx, const bla_integer *incx, bla_dcomplex *zy, const bla_integer *incy, const bla_double *c__, const bla_double *s) { /* System generated locals */ bla_integer i__1, i__2, i__3, i__4; diff --git a/frame/compat/f2c/bla_rot.h b/frame/compat/f2c/bla_rot.h index f55b5492b..fd8d8991b 100644 --- a/frame/compat/f2c/bla_rot.h +++ b/frame/compat/f2c/bla_rot.h @@ -34,9 +34,9 @@ #ifdef BLIS_ENABLE_BLAS2BLIS -int PASTEF77(s,rot)(bla_integer *n, bla_real *sx, bla_integer *incx, bla_real *sy, bla_integer *incy, bla_real *c__, bla_real *s); -int PASTEF77(d,rot)(bla_integer *n, bla_double *dx, bla_integer *incx, bla_double *dy, bla_integer *incy, bla_double *c__, bla_double *s); -int PASTEF77(cs,rot)(bla_integer *n, bla_scomplex *cx, bla_integer *incx, bla_scomplex *cy, bla_integer *incy, bla_real *c__, bla_real *s); -int PASTEF77(zd,rot)(bla_integer *n, bla_dcomplex *zx, bla_integer *incx, bla_dcomplex *zy, bla_integer *incy, bla_double *c__, bla_double *s); +int PASTEF77(s,rot)(const bla_integer *n, bla_real *sx, const bla_integer *incx, bla_real *sy, const bla_integer *incy, const bla_real *c__, const bla_real *s); +int PASTEF77(d,rot)(const bla_integer *n, bla_double *dx, const bla_integer *incx, bla_double *dy, const bla_integer *incy, const bla_double *c__, const bla_double *s); +int PASTEF77(cs,rot)(const bla_integer *n, bla_scomplex *cx, const bla_integer *incx, bla_scomplex *cy, const bla_integer *incy, const bla_real *c__, const bla_real *s); +int PASTEF77(zd,rot)(const bla_integer *n, bla_dcomplex *zx, const bla_integer *incx, bla_dcomplex *zy, const bla_integer *incy, const bla_double *c__, const bla_double *s); #endif diff --git a/frame/compat/f2c/bla_rotg.c b/frame/compat/f2c/bla_rotg.c index 490b01a59..ff6cc239d 100644 --- a/frame/compat/f2c/bla_rotg.c +++ b/frame/compat/f2c/bla_rotg.c @@ -51,7 +51,7 @@ static bla_real sc_b4 = 1.f; bla_real r__1, r__2; /* Builtin functions */ - double sqrt(bla_double), bla_r_sign(bla_real *, bla_real *); + //double sqrt(bla_double), bla_r_sign(bla_real *, bla_real *); /* Local variables */ bla_real r__, scale, z__, roe; @@ -111,7 +111,7 @@ static bla_double dc_b4 = 1.; bla_double d__1, d__2; /* Builtin functions */ - double sqrt(bla_double), bla_d_sign(bla_double *, bla_double *); + //double sqrt(bla_double), bla_d_sign(bla_double *, bla_double *); /* Local variables */ bla_double r__, scale, z__, roe; @@ -168,8 +168,8 @@ L20: bla_scomplex q__1, q__2, q__3; /* Builtin functions */ - double bla_c_abs(bla_scomplex *), sqrt(bla_double); - void bla_r_cnjg(bla_scomplex *, bla_scomplex *); + //double bla_c_abs(bla_scomplex *), sqrt(bla_double); + //void bla_r_cnjg(bla_scomplex *, bla_scomplex *); /* Local variables */ bla_real norm; @@ -218,10 +218,10 @@ L20: bla_dcomplex z__1, z__2, z__3, z__4; /* Builtin functions */ - double bla_z_abs(bla_dcomplex *); - void bla_z_div(bla_dcomplex *, bla_dcomplex *, bla_dcomplex *); - double sqrt(bla_double); - void bla_d_cnjg(bla_dcomplex *, bla_dcomplex *); + //double bla_z_abs(bla_dcomplex *); + //void bla_z_div(bla_dcomplex *, bla_dcomplex *, bla_dcomplex *); + //double sqrt(bla_double); + //void bla_d_cnjg(bla_dcomplex *, bla_dcomplex *); /* Local variables */ bla_double norm; diff --git a/frame/compat/f2c/bla_rotm.c b/frame/compat/f2c/bla_rotm.c index 240c42bb7..db40cbbff 100644 --- a/frame/compat/f2c/bla_rotm.c +++ b/frame/compat/f2c/bla_rotm.c @@ -41,7 +41,7 @@ -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(s,rotm)(bla_integer *n, bla_real *sx, bla_integer *incx, bla_real *sy, bla_integer *incy, bla_real *sparam) +/* Subroutine */ int PASTEF77(s,rotm)(const bla_integer *n, bla_real *sx, const bla_integer *incx, bla_real *sy, const bla_integer *incy, const bla_real *sparam) { /* Initialized data */ @@ -207,7 +207,7 @@ L140: -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(d,rotm)(bla_integer *n, bla_double *dx, bla_integer *incx, bla_double *dy, bla_integer *incy, bla_double *dparam) +/* Subroutine */ int PASTEF77(d,rotm)(const bla_integer *n, bla_double *dx, const bla_integer *incx, bla_double *dy, const bla_integer *incy, const bla_double *dparam) { /* Initialized data */ diff --git a/frame/compat/f2c/bla_rotm.h b/frame/compat/f2c/bla_rotm.h index 28cf8ec25..b8fc07453 100644 --- a/frame/compat/f2c/bla_rotm.h +++ b/frame/compat/f2c/bla_rotm.h @@ -34,7 +34,7 @@ #ifdef BLIS_ENABLE_BLAS2BLIS -int PASTEF77(s,rotm)(bla_integer *n, bla_real *sx, bla_integer *incx, bla_real *sy, bla_integer *incy, bla_real *sparam); -int PASTEF77(d,rotm)(bla_integer *n, bla_double *dx, bla_integer *incx, bla_double *dy, bla_integer *incy, bla_double *dparam); +int PASTEF77(s,rotm)(const bla_integer *n, bla_real *sx, const bla_integer *incx, bla_real *sy, const bla_integer *incy, const bla_real *sparam); +int PASTEF77(d,rotm)(const bla_integer *n, bla_double *dx, const bla_integer *incx, bla_double *dy, const bla_integer *incy, const bla_double *dparam); #endif diff --git a/frame/compat/f2c/bla_rotmg.c b/frame/compat/f2c/bla_rotmg.c index b3c734628..46bd149d2 100644 --- a/frame/compat/f2c/bla_rotmg.c +++ b/frame/compat/f2c/bla_rotmg.c @@ -41,7 +41,7 @@ -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(s,rotmg)(bla_real *sd1, bla_real *sd2, bla_real *sx1, bla_real *sy1, bla_real *sparam) +/* Subroutine */ int PASTEF77(s,rotmg)(bla_real *sd1, bla_real *sd2, bla_real *sx1, const bla_real *sy1, bla_real *sparam) { /* Initialized data */ @@ -281,7 +281,7 @@ L260: -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(d,rotmg)(bla_double *dd1, bla_double *dd2, bla_double *dx1, bla_double *dy1, bla_double *dparam) +/* Subroutine */ int PASTEF77(d,rotmg)(bla_double *dd1, bla_double *dd2, bla_double *dx1, const bla_double *dy1, bla_double *dparam) { /* Initialized data */ diff --git a/frame/compat/f2c/bla_rotmg.h b/frame/compat/f2c/bla_rotmg.h index e6cccf8b7..512d46562 100644 --- a/frame/compat/f2c/bla_rotmg.h +++ b/frame/compat/f2c/bla_rotmg.h @@ -34,7 +34,7 @@ #ifdef BLIS_ENABLE_BLAS2BLIS -int PASTEF77(s,rotmg)(bla_real *sd1, bla_real *sd2, bla_real *sx1, bla_real *sy1, bla_real *sparam); -int PASTEF77(d,rotmg)(bla_double *dd1, bla_double *dd2, bla_double *dx1, bla_double *dy1, bla_double *dparam); +int PASTEF77(s,rotmg)(bla_real *sd1, bla_real *sd2, bla_real *sx1, const bla_real *sy1, bla_real *sparam); +int PASTEF77(d,rotmg)(bla_double *dd1, bla_double *dd2, bla_double *dx1, const bla_double *dy1, bla_double *dparam); #endif diff --git a/frame/compat/f2c/bla_sbmv.c b/frame/compat/f2c/bla_sbmv.c index 421233d0f..7f2cf4beb 100644 --- a/frame/compat/f2c/bla_sbmv.c +++ b/frame/compat/f2c/bla_sbmv.c @@ -41,7 +41,7 @@ -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(d,sbmv)(bla_character *uplo, bla_integer *n, bla_integer *k, bla_double *alpha, bla_double *a, bla_integer *lda, bla_double *x, bla_integer *incx, bla_double *beta, bla_double *y, bla_integer *incy) +/* Subroutine */ int PASTEF77(d,sbmv)(const bla_character *uplo, const bla_integer *n, const bla_integer *k, const bla_double *alpha, const bla_double *a, const bla_integer *lda, const bla_double *x, const bla_integer *incx, const bla_double *beta, bla_double *y, const bla_integer *incy) { /* System generated locals */ bla_integer a_dim1, a_offset, i__1, i__2, i__3, i__4; @@ -50,9 +50,9 @@ bla_integer info; bla_double temp1, temp2; bla_integer i__, j, l; - extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); + //extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); bla_integer kplus1, ix, iy, jx, jy, kx, ky; - extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); + //extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); /* .. Scalar Arguments .. */ /* .. Array Arguments .. */ @@ -392,7 +392,7 @@ -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(s,sbmv)(bla_character *uplo, bla_integer *n, bla_integer *k, bla_real *alpha, bla_real *a, bla_integer *lda, bla_real *x, bla_integer *incx, bla_real *beta, bla_real *y, bla_integer *incy) +/* Subroutine */ int PASTEF77(s,sbmv)(const bla_character *uplo, const bla_integer *n, const bla_integer *k, const bla_real *alpha, const bla_real *a, const bla_integer *lda, const bla_real *x, const bla_integer *incx, const bla_real *beta, bla_real *y, const bla_integer *incy) { /* System generated locals */ bla_integer a_dim1, a_offset, i__1, i__2, i__3, i__4; @@ -401,9 +401,9 @@ bla_integer info; bla_real temp1, temp2; bla_integer i__, j, l; - extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); + //extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); bla_integer kplus1, ix, iy, jx, jy, kx, ky; - extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); + //extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); /* .. Scalar Arguments .. */ /* .. Array Arguments .. */ diff --git a/frame/compat/f2c/bla_sbmv.h b/frame/compat/f2c/bla_sbmv.h index 16f0dbb37..8258ac4a8 100644 --- a/frame/compat/f2c/bla_sbmv.h +++ b/frame/compat/f2c/bla_sbmv.h @@ -34,7 +34,7 @@ #ifdef BLIS_ENABLE_BLAS2BLIS -int PASTEF77(d,sbmv)(bla_character *uplo, bla_integer *n, bla_integer *k, bla_double *alpha, bla_double *a, bla_integer *lda, bla_double *x, bla_integer *incx, bla_double *beta, bla_double *y, bla_integer *incy); -int PASTEF77(s,sbmv)(bla_character *uplo, bla_integer *n, bla_integer *k, bla_real *alpha, bla_real *a, bla_integer *lda, bla_real *x, bla_integer *incx, bla_real *beta, bla_real *y, bla_integer *incy); +int PASTEF77(d,sbmv)(const bla_character *uplo, const bla_integer *n, const bla_integer *k, const bla_double *alpha, const bla_double *a, const bla_integer *lda, const bla_double *x, const bla_integer *incx, const bla_double *beta, bla_double *y, const bla_integer *incy); +int PASTEF77(s,sbmv)(const bla_character *uplo, const bla_integer *n, const bla_integer *k, const bla_real *alpha, const bla_real *a, const bla_integer *lda, const bla_real *x, const bla_integer *incx, const bla_real *beta, bla_real *y, const bla_integer *incy); #endif diff --git a/frame/compat/f2c/bla_spmv.c b/frame/compat/f2c/bla_spmv.c index 360124203..b0c1f7f8a 100644 --- a/frame/compat/f2c/bla_spmv.c +++ b/frame/compat/f2c/bla_spmv.c @@ -41,7 +41,7 @@ -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(d,spmv)(bla_character *uplo, bla_integer *n, bla_double *alpha, bla_double *ap, bla_double *x, bla_integer *incx, bla_double *beta, bla_double *y, bla_integer *incy) +/* Subroutine */ int PASTEF77(d,spmv)(const bla_character *uplo, const bla_integer *n, const bla_double *alpha, const bla_double *ap, const bla_double *x, const bla_integer *incx, const bla_double *beta, bla_double *y, const bla_integer *incy) { /* System generated locals */ bla_integer i__1, i__2; @@ -50,9 +50,9 @@ bla_integer info; bla_double temp1, temp2; bla_integer i__, j, k; - extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); + //extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); bla_integer kk, ix, iy, jx, jy, kx, ky; - extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); + //extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); /* .. Scalar Arguments .. */ /* .. Array Arguments .. */ @@ -342,7 +342,7 @@ -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(s,spmv)(bla_character *uplo, bla_integer *n, bla_real *alpha, bla_real *ap, bla_real *x, bla_integer *incx, bla_real *beta, bla_real *y, bla_integer *incy) +/* Subroutine */ int PASTEF77(s,spmv)(const bla_character *uplo, const bla_integer *n, const bla_real *alpha, const bla_real *ap, const bla_real *x, const bla_integer *incx, const bla_real *beta, bla_real *y, const bla_integer *incy) { /* System generated locals */ bla_integer i__1, i__2; @@ -351,9 +351,9 @@ bla_integer info; bla_real temp1, temp2; bla_integer i__, j, k; - extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); + //extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); bla_integer kk, ix, iy, jx, jy, kx, ky; - extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); + //extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); /* .. Scalar Arguments .. */ /* .. Array Arguments .. */ diff --git a/frame/compat/f2c/bla_spmv.h b/frame/compat/f2c/bla_spmv.h index d58349345..8da683bb9 100644 --- a/frame/compat/f2c/bla_spmv.h +++ b/frame/compat/f2c/bla_spmv.h @@ -34,7 +34,7 @@ #ifdef BLIS_ENABLE_BLAS2BLIS -int PASTEF77(d,spmv)(bla_character *uplo, bla_integer *n, bla_double *alpha, bla_double *ap, bla_double *x, bla_integer *incx, bla_double *beta, bla_double *y, bla_integer *incy); -int PASTEF77(s,spmv)(bla_character *uplo, bla_integer *n, bla_real *alpha, bla_real *ap, bla_real *x, bla_integer *incx, bla_real *beta, bla_real *y, bla_integer *incy); +int PASTEF77(d,spmv)(const bla_character *uplo, const bla_integer *n, const bla_double *alpha, const bla_double *ap, const bla_double *x, const bla_integer *incx, const bla_double *beta, bla_double *y, const bla_integer *incy); +int PASTEF77(s,spmv)(const bla_character *uplo, const bla_integer *n, const bla_real *alpha, const bla_real *ap, const bla_real *x, const bla_integer *incx, const bla_real *beta, bla_real *y, const bla_integer *incy); #endif diff --git a/frame/compat/f2c/bla_spr.c b/frame/compat/f2c/bla_spr.c index 9b4be0d91..8fb0b4d50 100644 --- a/frame/compat/f2c/bla_spr.c +++ b/frame/compat/f2c/bla_spr.c @@ -41,7 +41,7 @@ -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(d,spr)(bla_character *uplo, bla_integer *n, bla_double *alpha, bla_double *x, bla_integer *incx, bla_double *ap) +/* Subroutine */ int PASTEF77(d,spr)(const bla_character *uplo, const bla_integer *n, const bla_double *alpha, const bla_double *x, const bla_integer *incx, bla_double *ap) { /* System generated locals */ bla_integer i__1, i__2; @@ -50,9 +50,9 @@ bla_integer info; bla_double temp; bla_integer i__, j, k; - extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); + //extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); bla_integer kk, ix, jx, kx = 0; - extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); + //extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); /* .. Scalar Arguments .. */ /* .. Array Arguments .. */ @@ -268,7 +268,7 @@ -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(s,spr)(bla_character *uplo, bla_integer *n, bla_real *alpha, bla_real *x, bla_integer *incx, bla_real *ap) +/* Subroutine */ int PASTEF77(s,spr)(const bla_character *uplo, const bla_integer *n, const bla_real *alpha, const bla_real *x, const bla_integer *incx, bla_real *ap) { /* System generated locals */ bla_integer i__1, i__2; @@ -277,9 +277,9 @@ bla_integer info; bla_real temp; bla_integer i__, j, k; - extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); + //extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); bla_integer kk, ix, jx, kx = 0; - extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); + //extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); /* .. Scalar Arguments .. */ /* .. Array Arguments .. */ diff --git a/frame/compat/f2c/bla_spr.h b/frame/compat/f2c/bla_spr.h index 2e9d4523a..68593758a 100644 --- a/frame/compat/f2c/bla_spr.h +++ b/frame/compat/f2c/bla_spr.h @@ -34,7 +34,7 @@ #ifdef BLIS_ENABLE_BLAS2BLIS -int PASTEF77(d,spr)(bla_character *uplo, bla_integer *n, bla_double *alpha, bla_double *x, bla_integer *incx, bla_double *ap); -int PASTEF77(s,spr)(bla_character *uplo, bla_integer *n, bla_real *alpha, bla_real *x, bla_integer *incx, bla_real *ap); +int PASTEF77(d,spr)(const bla_character *uplo, const bla_integer *n, const bla_double *alpha, const bla_double *x, const bla_integer *incx, bla_double *ap); +int PASTEF77(s,spr)(const bla_character *uplo, const bla_integer *n, const bla_real *alpha, const bla_real *x, const bla_integer *incx, bla_real *ap); #endif diff --git a/frame/compat/f2c/bla_spr2.c b/frame/compat/f2c/bla_spr2.c index 3ec64f672..bb4f50ec8 100644 --- a/frame/compat/f2c/bla_spr2.c +++ b/frame/compat/f2c/bla_spr2.c @@ -41,7 +41,7 @@ -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(d,spr2)(bla_character *uplo, bla_integer *n, bla_double *alpha, bla_double *x, bla_integer *incx, bla_double *y, bla_integer *incy, bla_double *ap) +/* Subroutine */ int PASTEF77(d,spr2)(const bla_character *uplo, const bla_integer *n, const bla_double *alpha, const bla_double *x, const bla_integer *incx, const bla_double *y, const bla_integer *incy, bla_double *ap) { /* System generated locals */ bla_integer i__1, i__2; @@ -50,9 +50,9 @@ bla_integer info; bla_double temp1, temp2; bla_integer i__, j, k; - extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); + //extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); bla_integer kk, ix, iy, jx = 0, jy = 0, kx = 0, ky = 0; - extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); + //extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); /* .. Scalar Arguments .. */ /* .. Array Arguments .. */ @@ -300,7 +300,7 @@ -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(s,spr2)(bla_character *uplo, bla_integer *n, bla_real *alpha, bla_real *x, bla_integer *incx, bla_real *y, bla_integer *incy, bla_real *ap) +/* Subroutine */ int PASTEF77(s,spr2)(const bla_character *uplo, const bla_integer *n, const bla_real *alpha, const bla_real *x, const bla_integer *incx, const bla_real *y, const bla_integer *incy, bla_real *ap) { /* System generated locals */ bla_integer i__1, i__2; @@ -309,9 +309,9 @@ bla_integer info; bla_real temp1, temp2; bla_integer i__, j, k; - extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); + //extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); bla_integer kk, ix, iy, jx = 0, jy = 0, kx = 0, ky = 0; - extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); + //extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); /* .. Scalar Arguments .. */ /* .. Array Arguments .. */ diff --git a/frame/compat/f2c/bla_spr2.h b/frame/compat/f2c/bla_spr2.h index 50f18d928..79516c128 100644 --- a/frame/compat/f2c/bla_spr2.h +++ b/frame/compat/f2c/bla_spr2.h @@ -34,7 +34,7 @@ #ifdef BLIS_ENABLE_BLAS2BLIS -int PASTEF77(d,spr2)(bla_character *uplo, bla_integer *n, bla_double *alpha, bla_double *x, bla_integer *incx, bla_double *y, bla_integer *incy, bla_double *ap); -int PASTEF77(s,spr2)(bla_character *uplo, bla_integer *n, bla_real *alpha, bla_real *x, bla_integer *incx, bla_real *y, bla_integer *incy, bla_real *ap); +int PASTEF77(d,spr2)(const bla_character *uplo, const bla_integer *n, const bla_double *alpha, const bla_double *x, const bla_integer *incx, const bla_double *y, const bla_integer *incy, bla_double *ap); +int PASTEF77(s,spr2)(const bla_character *uplo, const bla_integer *n, const bla_real *alpha, const bla_real *x, const bla_integer *incx, const bla_real *y, const bla_integer *incy, bla_real *ap); #endif diff --git a/frame/compat/f2c/bla_tbmv.c b/frame/compat/f2c/bla_tbmv.c index 82d963348..563f50ba3 100644 --- a/frame/compat/f2c/bla_tbmv.c +++ b/frame/compat/f2c/bla_tbmv.c @@ -41,22 +41,22 @@ -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(c,tbmv)(bla_character *uplo, bla_character *trans, bla_character *diag, bla_integer *n, bla_integer *k, bla_scomplex *a, bla_integer *lda, bla_scomplex *x, bla_integer *incx) +/* Subroutine */ int PASTEF77(c,tbmv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_integer *k, const bla_scomplex *a, const bla_integer *lda, bla_scomplex *x, const bla_integer *incx) { /* System generated locals */ bla_integer a_dim1, a_offset, i__1, i__2, i__3, i__4, i__5; bla_scomplex q__1, q__2, q__3; /* Builtin functions */ - void bla_r_cnjg(bla_scomplex *, bla_scomplex *); + //void bla_r_cnjg(bla_scomplex *, bla_scomplex *); /* Local variables */ bla_integer info; bla_scomplex temp; bla_integer i__, j, l; - extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); + //extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); bla_integer kplus1, ix, jx, kx = 0; - extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); + //extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); bla_logical noconj, nounit; /* .. Scalar Arguments .. */ @@ -611,7 +611,7 @@ -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(d,tbmv)(bla_character *uplo, bla_character *trans, bla_character *diag, bla_integer *n, bla_integer *k, bla_double *a, bla_integer *lda, bla_double *x, bla_integer *incx) +/* Subroutine */ int PASTEF77(d,tbmv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_integer *k, const bla_double *a, const bla_integer *lda, bla_double *x, const bla_integer *incx) { /* System generated locals */ bla_integer a_dim1, a_offset, i__1, i__2, i__3, i__4; @@ -620,9 +620,9 @@ bla_integer info; bla_double temp; bla_integer i__, j, l; - extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); + //extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); bla_integer kplus1, ix, jx, kx = 0; - extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); + //extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); bla_logical nounit; /* .. Scalar Arguments .. */ @@ -1022,7 +1022,7 @@ -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(s,tbmv)(bla_character *uplo, bla_character *trans, bla_character *diag, bla_integer *n, bla_integer *k, bla_real *a, bla_integer *lda, bla_real *x, bla_integer *incx) +/* Subroutine */ int PASTEF77(s,tbmv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_integer *k, const bla_real *a, const bla_integer *lda, bla_real *x, const bla_integer *incx) { /* System generated locals */ bla_integer a_dim1, a_offset, i__1, i__2, i__3, i__4; @@ -1031,9 +1031,9 @@ bla_integer info; bla_real temp; bla_integer i__, j, l; - extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); + //extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); bla_integer kplus1, ix, jx, kx = 0; - extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); + //extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); bla_logical nounit; /* .. Scalar Arguments .. */ @@ -1433,22 +1433,22 @@ -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(z,tbmv)(bla_character *uplo, bla_character *trans, bla_character *diag, bla_integer *n, bla_integer *k, bla_dcomplex *a, bla_integer *lda, bla_dcomplex *x, bla_integer *incx) +/* Subroutine */ int PASTEF77(z,tbmv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_integer *k, const bla_dcomplex *a, const bla_integer *lda, bla_dcomplex *x, const bla_integer *incx) { /* System generated locals */ bla_integer a_dim1, a_offset, i__1, i__2, i__3, i__4, i__5; bla_dcomplex z__1, z__2, z__3; /* Builtin functions */ - void bla_d_cnjg(bla_dcomplex *, bla_dcomplex *); + //void bla_d_cnjg(bla_dcomplex *, bla_dcomplex *); /* Local variables */ bla_integer info; bla_dcomplex temp; bla_integer i__, j, l; - extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); + //extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); bla_integer kplus1, ix, jx, kx = 0; - extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); + //extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); bla_logical noconj, nounit; /* .. Scalar Arguments .. */ diff --git a/frame/compat/f2c/bla_tbmv.h b/frame/compat/f2c/bla_tbmv.h index e73cdaa3b..f09c4ac2a 100644 --- a/frame/compat/f2c/bla_tbmv.h +++ b/frame/compat/f2c/bla_tbmv.h @@ -34,9 +34,9 @@ #ifdef BLIS_ENABLE_BLAS2BLIS -int PASTEF77(c,tbmv)(bla_character *uplo, bla_character *trans, bla_character *diag, bla_integer *n, bla_integer *k, bla_scomplex *a, bla_integer *lda, bla_scomplex *x, bla_integer *incx); -int PASTEF77(d,tbmv)(bla_character *uplo, bla_character *trans, bla_character *diag, bla_integer *n, bla_integer *k, bla_double *a, bla_integer *lda, bla_double *x, bla_integer *incx); -int PASTEF77(s,tbmv)(bla_character *uplo, bla_character *trans, bla_character *diag, bla_integer *n, bla_integer *k, bla_real *a, bla_integer *lda, bla_real *x, bla_integer *incx); -int PASTEF77(z,tbmv)(bla_character *uplo, bla_character *trans, bla_character *diag, bla_integer *n, bla_integer *k, bla_dcomplex *a, bla_integer *lda, bla_dcomplex *x, bla_integer *incx); +int PASTEF77(c,tbmv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_integer *k, const bla_scomplex *a, const bla_integer *lda, bla_scomplex *x, const bla_integer *incx); +int PASTEF77(d,tbmv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_integer *k, const bla_double *a, const bla_integer *lda, bla_double *x, const bla_integer *incx); +int PASTEF77(s,tbmv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_integer *k, const bla_real *a, const bla_integer *lda, bla_real *x, const bla_integer *incx); +int PASTEF77(z,tbmv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_integer *k, const bla_dcomplex *a, const bla_integer *lda, bla_dcomplex *x, const bla_integer *incx); #endif diff --git a/frame/compat/f2c/bla_tbsv.c b/frame/compat/f2c/bla_tbsv.c index 848c19aaf..f4fda885c 100644 --- a/frame/compat/f2c/bla_tbsv.c +++ b/frame/compat/f2c/bla_tbsv.c @@ -41,22 +41,22 @@ -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(c,tbsv)(bla_character *uplo, bla_character *trans, bla_character *diag, bla_integer *n, bla_integer *k, bla_scomplex *a, bla_integer *lda, bla_scomplex *x, bla_integer *incx) +/* Subroutine */ int PASTEF77(c,tbsv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_integer *k, const bla_scomplex *a, const bla_integer *lda, bla_scomplex *x, const bla_integer *incx) { /* System generated locals */ bla_integer a_dim1, a_offset, i__1, i__2, i__3, i__4, i__5; bla_scomplex q__1, q__2, q__3; /* Builtin functions */ - void bla_c_div(bla_scomplex *, bla_scomplex *, bla_scomplex *), bla_r_cnjg(bla_scomplex *, bla_scomplex *); + //void bla_c_div(bla_scomplex *, bla_scomplex *, bla_scomplex *), bla_r_cnjg(bla_scomplex *, bla_scomplex *); /* Local variables */ bla_integer info; bla_scomplex temp; bla_integer i__, j, l; - extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); + //extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); bla_integer kplus1, ix, jx, kx = 0; - extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); + //extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); bla_logical noconj, nounit; /* .. Scalar Arguments .. */ @@ -603,7 +603,7 @@ -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(d,tbsv)(bla_character *uplo, bla_character *trans, bla_character *diag, bla_integer *n, bla_integer *k, bla_double *a, bla_integer *lda, bla_double *x, bla_integer *incx) +/* Subroutine */ int PASTEF77(d,tbsv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_integer *k, const bla_double *a, const bla_integer *lda, bla_double *x, const bla_integer *incx) { /* System generated locals */ bla_integer a_dim1, a_offset, i__1, i__2, i__3, i__4; @@ -612,9 +612,9 @@ bla_integer info; bla_double temp; bla_integer i__, j, l; - extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); + //extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); bla_integer kplus1, ix, jx, kx = 0; - extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); + //extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); bla_logical nounit; /* .. Scalar Arguments .. */ @@ -1018,7 +1018,7 @@ -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(s,tbsv)(bla_character *uplo, bla_character *trans, bla_character *diag, bla_integer *n, bla_integer *k, bla_real *a, bla_integer *lda, bla_real *x, bla_integer *incx) +/* Subroutine */ int PASTEF77(s,tbsv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_integer *k, const bla_real *a, const bla_integer *lda, bla_real *x, const bla_integer *incx) { /* System generated locals */ bla_integer a_dim1, a_offset, i__1, i__2, i__3, i__4; @@ -1027,9 +1027,9 @@ bla_integer info; bla_real temp; bla_integer i__, j, l; - extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); + //extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); bla_integer kplus1, ix, jx, kx = 0; - extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); + //extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); bla_logical nounit; /* .. Scalar Arguments .. */ @@ -1433,23 +1433,23 @@ -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(z,tbsv)(bla_character *uplo, bla_character *trans, bla_character *diag, bla_integer *n, bla_integer *k, bla_dcomplex *a, bla_integer *lda, bla_dcomplex *x, bla_integer *incx) +/* Subroutine */ int PASTEF77(z,tbsv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_integer *k, const bla_dcomplex *a, const bla_integer *lda, bla_dcomplex *x, const bla_integer *incx) { /* System generated locals */ bla_integer a_dim1, a_offset, i__1, i__2, i__3, i__4, i__5; bla_dcomplex z__1, z__2, z__3; /* Builtin functions */ - void bla_z_div(bla_dcomplex *, bla_dcomplex *, bla_dcomplex *), bla_d_cnjg( - bla_dcomplex *, bla_dcomplex *); + //void bla_z_div(bla_dcomplex *, bla_dcomplex *, bla_dcomplex *), bla_d_cnjg( + // bla_dcomplex *, bla_dcomplex *); /* Local variables */ bla_integer info; bla_dcomplex temp; bla_integer i__, j, l; - extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); + //extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); bla_integer kplus1, ix, jx, kx = 0; - extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); + //extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); bla_logical noconj, nounit; /* .. Scalar Arguments .. */ diff --git a/frame/compat/f2c/bla_tbsv.h b/frame/compat/f2c/bla_tbsv.h index 8fc6b2772..2c4a31f7a 100644 --- a/frame/compat/f2c/bla_tbsv.h +++ b/frame/compat/f2c/bla_tbsv.h @@ -34,9 +34,9 @@ #ifdef BLIS_ENABLE_BLAS2BLIS -int PASTEF77(c,tbsv)(bla_character *uplo, bla_character *trans, bla_character *diag, bla_integer *n, bla_integer *k, bla_scomplex *a, bla_integer *lda, bla_scomplex *x, bla_integer *incx); -int PASTEF77(d,tbsv)(bla_character *uplo, bla_character *trans, bla_character *diag, bla_integer *n, bla_integer *k, bla_double *a, bla_integer *lda, bla_double *x, bla_integer *incx); -int PASTEF77(s,tbsv)(bla_character *uplo, bla_character *trans, bla_character *diag, bla_integer *n, bla_integer *k, bla_real *a, bla_integer *lda, bla_real *x, bla_integer *incx); -int PASTEF77(z,tbsv)(bla_character *uplo, bla_character *trans, bla_character *diag, bla_integer *n, bla_integer *k, bla_dcomplex *a, bla_integer *lda, bla_dcomplex *x, bla_integer *incx); +int PASTEF77(c,tbsv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_integer *k, const bla_scomplex *a, const bla_integer *lda, bla_scomplex *x, const bla_integer *incx); +int PASTEF77(d,tbsv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_integer *k, const bla_double *a, const bla_integer *lda, bla_double *x, const bla_integer *incx); +int PASTEF77(s,tbsv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_integer *k, const bla_real *a, const bla_integer *lda, bla_real *x, const bla_integer *incx); +int PASTEF77(z,tbsv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_integer *k, const bla_dcomplex *a, const bla_integer *lda, bla_dcomplex *x, const bla_integer *incx); #endif diff --git a/frame/compat/f2c/bla_tpmv.c b/frame/compat/f2c/bla_tpmv.c index 5cafe7941..a13be84fb 100644 --- a/frame/compat/f2c/bla_tpmv.c +++ b/frame/compat/f2c/bla_tpmv.c @@ -41,22 +41,22 @@ -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(c,tpmv)(bla_character *uplo, bla_character *trans, bla_character *diag, bla_integer *n, bla_scomplex *ap, bla_scomplex *x, bla_integer *incx) +/* Subroutine */ int PASTEF77(c,tpmv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_scomplex *ap, bla_scomplex *x, const bla_integer *incx) { /* System generated locals */ bla_integer i__1, i__2, i__3, i__4, i__5; bla_scomplex q__1, q__2, q__3; /* Builtin functions */ - void bla_r_cnjg(bla_scomplex *, bla_scomplex *); + //void bla_r_cnjg(bla_scomplex *, bla_scomplex *); /* Local variables */ bla_integer info; bla_scomplex temp; bla_integer i__, j, k; - extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); + //extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); bla_integer kk, ix, jx, kx = 0; - extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); + //extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); bla_logical noconj, nounit; /* .. Scalar Arguments .. */ @@ -542,7 +542,7 @@ -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(d,tpmv)(bla_character *uplo, bla_character *trans, bla_character *diag, bla_integer *n, bla_double *ap, bla_double *x, bla_integer *incx) +/* Subroutine */ int PASTEF77(d,tpmv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_double *ap, bla_double *x, const bla_integer *incx) { /* System generated locals */ bla_integer i__1, i__2; @@ -551,9 +551,9 @@ bla_integer info; bla_double temp; bla_integer i__, j, k; - extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); + //extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); bla_integer kk, ix, jx, kx = 0; - extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); + //extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); bla_logical nounit; /* .. Scalar Arguments .. */ @@ -890,7 +890,7 @@ -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(s,tpmv)(bla_character *uplo, bla_character *trans, bla_character *diag, bla_integer *n, bla_real *ap, bla_real *x, bla_integer *incx) +/* Subroutine */ int PASTEF77(s,tpmv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_real *ap, bla_real *x, const bla_integer *incx) { /* System generated locals */ bla_integer i__1, i__2; @@ -899,9 +899,9 @@ bla_integer info; bla_real temp; bla_integer i__, j, k; - extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); + //extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); bla_integer kk, ix, jx, kx = 0; - extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); + //extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); bla_logical nounit; /* .. Scalar Arguments .. */ @@ -1238,22 +1238,22 @@ -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(z,tpmv)(bla_character *uplo, bla_character *trans, bla_character *diag, bla_integer *n, bla_dcomplex *ap, bla_dcomplex *x, bla_integer *incx) +/* Subroutine */ int PASTEF77(z,tpmv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_dcomplex *ap, bla_dcomplex *x, const bla_integer *incx) { /* System generated locals */ bla_integer i__1, i__2, i__3, i__4, i__5; bla_dcomplex z__1, z__2, z__3; /* Builtin functions */ - void bla_d_cnjg(bla_dcomplex *, bla_dcomplex *); + //void bla_d_cnjg(bla_dcomplex *, bla_dcomplex *); /* Local variables */ bla_integer info; bla_dcomplex temp; bla_integer i__, j, k; - extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); + //extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); bla_integer kk, ix, jx, kx = 0; - extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); + //extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); bla_logical noconj, nounit; /* .. Scalar Arguments .. */ diff --git a/frame/compat/f2c/bla_tpmv.h b/frame/compat/f2c/bla_tpmv.h index 68c841dd0..75be91681 100644 --- a/frame/compat/f2c/bla_tpmv.h +++ b/frame/compat/f2c/bla_tpmv.h @@ -34,9 +34,9 @@ #ifdef BLIS_ENABLE_BLAS2BLIS -int PASTEF77(c,tpmv)(bla_character *uplo, bla_character *trans, bla_character *diag, bla_integer *n, bla_scomplex *ap, bla_scomplex *x, bla_integer *incx); -int PASTEF77(d,tpmv)(bla_character *uplo, bla_character *trans, bla_character *diag, bla_integer *n, bla_double *ap, bla_double *x, bla_integer *incx); -int PASTEF77(s,tpmv)(bla_character *uplo, bla_character *trans, bla_character *diag, bla_integer *n, bla_real *ap, bla_real *x, bla_integer *incx); -int PASTEF77(z,tpmv)(bla_character *uplo, bla_character *trans, bla_character *diag, bla_integer *n, bla_dcomplex *ap, bla_dcomplex *x, bla_integer *incx); +int PASTEF77(c,tpmv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_scomplex *ap, bla_scomplex *x, const bla_integer *incx); +int PASTEF77(d,tpmv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_double *ap, bla_double *x, const bla_integer *incx); +int PASTEF77(s,tpmv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_real *ap, bla_real *x, const bla_integer *incx); +int PASTEF77(z,tpmv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_dcomplex *ap, bla_dcomplex *x, const bla_integer *incx); #endif diff --git a/frame/compat/f2c/bla_tpsv.c b/frame/compat/f2c/bla_tpsv.c index 2ff23575d..cad8d12c8 100644 --- a/frame/compat/f2c/bla_tpsv.c +++ b/frame/compat/f2c/bla_tpsv.c @@ -41,22 +41,22 @@ -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(c,tpsv)(bla_character *uplo, bla_character *trans, bla_character *diag, bla_integer *n, bla_scomplex *ap, bla_scomplex *x, bla_integer *incx) +/* Subroutine */ int PASTEF77(c,tpsv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_scomplex *ap, bla_scomplex *x, const bla_integer *incx) { /* System generated locals */ bla_integer i__1, i__2, i__3, i__4, i__5; bla_scomplex q__1, q__2, q__3; /* Builtin functions */ - void bla_c_div(bla_scomplex *, bla_scomplex *, bla_scomplex *), bla_r_cnjg(bla_scomplex *, bla_scomplex *); + //void bla_c_div(bla_scomplex *, bla_scomplex *, bla_scomplex *), bla_r_cnjg(bla_scomplex *, bla_scomplex *); /* Local variables */ bla_integer info; bla_scomplex temp; bla_integer i__, j, k; - extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); + //extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); bla_integer kk, ix, jx, kx = 0; - extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); + //extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); bla_logical noconj, nounit; /* .. Scalar Arguments .. */ @@ -534,7 +534,7 @@ -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(d,tpsv)(bla_character *uplo, bla_character *trans, bla_character *diag, bla_integer *n, bla_double *ap, bla_double *x, bla_integer *incx) +/* Subroutine */ int PASTEF77(d,tpsv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_double *ap, bla_double *x, const bla_integer *incx) { /* System generated locals */ bla_integer i__1, i__2; @@ -543,9 +543,9 @@ bla_integer info; bla_double temp; bla_integer i__, j, k; - extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); + //extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); bla_integer kk, ix, jx, kx = 0; - extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); + //extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); bla_logical nounit; /* .. Scalar Arguments .. */ @@ -885,7 +885,7 @@ -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(s,tpsv)(bla_character *uplo, bla_character *trans, bla_character *diag, bla_integer *n, bla_real *ap, bla_real *x, bla_integer *incx) +/* Subroutine */ int PASTEF77(s,tpsv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_real *ap, bla_real *x, const bla_integer *incx) { /* System generated locals */ bla_integer i__1, i__2; @@ -894,9 +894,9 @@ bla_integer info; bla_real temp; bla_integer i__, j, k; - extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); + //extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); bla_integer kk, ix, jx, kx = 0; - extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); + //extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); bla_logical nounit; /* .. Scalar Arguments .. */ @@ -1236,23 +1236,23 @@ -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(z,tpsv)(bla_character *uplo, bla_character *trans, bla_character *diag, bla_integer *n, bla_dcomplex *ap, bla_dcomplex *x, bla_integer *incx) +/* Subroutine */ int PASTEF77(z,tpsv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_dcomplex *ap, bla_dcomplex *x, const bla_integer *incx) { /* System generated locals */ bla_integer i__1, i__2, i__3, i__4, i__5; bla_dcomplex z__1, z__2, z__3; /* Builtin functions */ - void bla_z_div(bla_dcomplex *, bla_dcomplex *, bla_dcomplex *), bla_d_cnjg( - bla_dcomplex *, bla_dcomplex *); + //void bla_z_div(bla_dcomplex *, bla_dcomplex *, bla_dcomplex *), bla_d_cnjg( + // bla_dcomplex *, bla_dcomplex *); /* Local variables */ bla_integer info; bla_dcomplex temp; bla_integer i__, j, k; - extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); + //extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); bla_integer kk, ix, jx, kx = 0; - extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); + //extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); bla_logical noconj, nounit; /* .. Scalar Arguments .. */ diff --git a/frame/compat/f2c/bla_tpsv.h b/frame/compat/f2c/bla_tpsv.h index 1dcbeebfe..fa94399ed 100644 --- a/frame/compat/f2c/bla_tpsv.h +++ b/frame/compat/f2c/bla_tpsv.h @@ -34,9 +34,9 @@ #ifdef BLIS_ENABLE_BLAS2BLIS -int PASTEF77(c,tpsv)(bla_character *uplo, bla_character *trans, bla_character *diag, bla_integer *n, bla_scomplex *ap, bla_scomplex *x, bla_integer *incx); -int PASTEF77(d,tpsv)(bla_character *uplo, bla_character *trans, bla_character *diag, bla_integer *n, bla_double *ap, bla_double *x, bla_integer *incx); -int PASTEF77(s,tpsv)(bla_character *uplo, bla_character *trans, bla_character *diag, bla_integer *n, bla_real *ap, bla_real *x, bla_integer *incx); -int PASTEF77(z,tpsv)(bla_character *uplo, bla_character *trans, bla_character *diag, bla_integer *n, bla_dcomplex *ap, bla_dcomplex *x, bla_integer *incx); +int PASTEF77(c,tpsv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_scomplex *ap, bla_scomplex *x, const bla_integer *incx); +int PASTEF77(d,tpsv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_double *ap, bla_double *x, const bla_integer *incx); +int PASTEF77(s,tpsv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_real *ap, bla_real *x, const bla_integer *incx); +int PASTEF77(z,tpsv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_dcomplex *ap, bla_dcomplex *x, const bla_integer *incx); #endif diff --git a/frame/compat/f2c/bla_xerbla.c b/frame/compat/f2c/bla_xerbla.c index 20a14702c..3968e2f44 100644 --- a/frame/compat/f2c/bla_xerbla.c +++ b/frame/compat/f2c/bla_xerbla.c @@ -43,7 +43,7 @@ /* Table of constant values */ -/* Subroutine */ int PASTEF770(xerbla)(bla_character *srname, bla_integer *info, ftnlen srname_len) +/* Subroutine */ int PASTEF770(xerbla)(const bla_character *srname, const bla_integer *info, ftnlen srname_len) { /* -- LAPACK auxiliary routine (preliminary version) -- */ /* Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd., */ @@ -72,10 +72,10 @@ /* INFO (input) INTEGER */ /* The position of the invalid parameter in the parameter list */ /* of the calling routine. */ - int i; + //int i; - for ( i = 0; i < srname_len; ++i ) - srname[i] = toupper( srname[i] ); + //for ( i = 0; i < srname_len; ++i ) + // srname[i] = toupper( srname[i] ); printf("** On entry to %6s, parameter number %2i had an illegal value\n", srname, (int)*info); diff --git a/frame/compat/f2c/bla_xerbla.h b/frame/compat/f2c/bla_xerbla.h index 597f467b8..7d1d814a4 100644 --- a/frame/compat/f2c/bla_xerbla.h +++ b/frame/compat/f2c/bla_xerbla.h @@ -34,6 +34,6 @@ #ifdef BLIS_ENABLE_BLAS2BLIS -int PASTEF770(xerbla)(bla_character *srname, bla_integer *info, ftnlen srname_len); +int PASTEF770(xerbla)(const bla_character *srname, const bla_integer *info, ftnlen srname_len); #endif diff --git a/frame/compat/f2c/util/bla_c_abs.c b/frame/compat/f2c/util/bla_c_abs.c index 0e941f358..03b245384 100644 --- a/frame/compat/f2c/util/bla_c_abs.c +++ b/frame/compat/f2c/util/bla_c_abs.c @@ -36,7 +36,7 @@ #ifdef BLIS_ENABLE_BLAS2BLIS -double bla_c_abs(bla_scomplex *z) +double bla_c_abs(const bla_scomplex *z) { return( bla_f__cabs( bli_creal( *z ), bli_cimag( *z ) ) ); diff --git a/frame/compat/f2c/util/bla_c_abs.h b/frame/compat/f2c/util/bla_c_abs.h index 5531e2cea..3d3a01ddc 100644 --- a/frame/compat/f2c/util/bla_c_abs.h +++ b/frame/compat/f2c/util/bla_c_abs.h @@ -34,7 +34,7 @@ #ifdef BLIS_ENABLE_BLAS2BLIS -double bla_c_abs(bla_scomplex *z); +double bla_c_abs(const bla_scomplex *z); #endif diff --git a/frame/compat/f2c/util/bla_c_div.c b/frame/compat/f2c/util/bla_c_div.c index d358218c2..cf1412646 100644 --- a/frame/compat/f2c/util/bla_c_div.c +++ b/frame/compat/f2c/util/bla_c_div.c @@ -36,7 +36,7 @@ #ifdef BLIS_ENABLE_BLAS2BLIS -void bla_c_div(bla_scomplex *cp, bla_scomplex *ap, bla_scomplex *bp) +void bla_c_div(bla_scomplex *cp, const bla_scomplex *ap, const bla_scomplex *bp) { bli_ccopys( *ap, *cp ); bli_cinvscals( *bp, *cp ); diff --git a/frame/compat/f2c/util/bla_c_div.h b/frame/compat/f2c/util/bla_c_div.h index fdfdb177a..9b2103a5c 100644 --- a/frame/compat/f2c/util/bla_c_div.h +++ b/frame/compat/f2c/util/bla_c_div.h @@ -34,7 +34,7 @@ #ifdef BLIS_ENABLE_BLAS2BLIS -void bla_c_div(bla_scomplex *cp, bla_scomplex *ap, bla_scomplex *bp); +void bla_c_div(bla_scomplex *cp, const bla_scomplex *ap, const bla_scomplex *bp); #endif diff --git a/frame/compat/f2c/util/bla_d_abs.c b/frame/compat/f2c/util/bla_d_abs.c index 90519cce9..741eca66e 100644 --- a/frame/compat/f2c/util/bla_d_abs.c +++ b/frame/compat/f2c/util/bla_d_abs.c @@ -36,7 +36,7 @@ #ifdef BLIS_ENABLE_BLAS2BLIS -double bla_d_abs(bla_double *x) +double bla_d_abs(const bla_double *x) { if(*x >= 0.0) return(*x); diff --git a/frame/compat/f2c/util/bla_d_abs.h b/frame/compat/f2c/util/bla_d_abs.h index 6166f8c83..fd634cb66 100644 --- a/frame/compat/f2c/util/bla_d_abs.h +++ b/frame/compat/f2c/util/bla_d_abs.h @@ -34,7 +34,7 @@ #ifdef BLIS_ENABLE_BLAS2BLIS -double bla_d_abs(bla_double *x); +double bla_d_abs(const bla_double *x); #endif diff --git a/frame/compat/f2c/util/bla_d_cnjg.c b/frame/compat/f2c/util/bla_d_cnjg.c index 05b76f963..e72523d60 100644 --- a/frame/compat/f2c/util/bla_d_cnjg.c +++ b/frame/compat/f2c/util/bla_d_cnjg.c @@ -36,7 +36,7 @@ #ifdef BLIS_ENABLE_BLAS2BLIS -void bla_d_cnjg(bla_dcomplex *dest, bla_dcomplex *src) +void bla_d_cnjg(bla_dcomplex *dest, const bla_dcomplex *src) { bli_zcopyjs( *src, *dest ); } diff --git a/frame/compat/f2c/util/bla_d_cnjg.h b/frame/compat/f2c/util/bla_d_cnjg.h index 1e8b9129b..a318c0737 100644 --- a/frame/compat/f2c/util/bla_d_cnjg.h +++ b/frame/compat/f2c/util/bla_d_cnjg.h @@ -34,7 +34,7 @@ #ifdef BLIS_ENABLE_BLAS2BLIS -void bla_d_cnjg(bla_dcomplex *dest, bla_dcomplex *src); +void bla_d_cnjg(bla_dcomplex *dest, const bla_dcomplex *src); #endif diff --git a/frame/compat/f2c/util/bla_d_imag.c b/frame/compat/f2c/util/bla_d_imag.c index 2a5c5dba3..350124399 100644 --- a/frame/compat/f2c/util/bla_d_imag.c +++ b/frame/compat/f2c/util/bla_d_imag.c @@ -36,7 +36,7 @@ #ifdef BLIS_ENABLE_BLAS2BLIS -double bla_d_imag(bla_dcomplex *z) +double bla_d_imag(const bla_dcomplex *z) { return bli_zimag( *z ); } diff --git a/frame/compat/f2c/util/bla_d_imag.h b/frame/compat/f2c/util/bla_d_imag.h index 5e2fa0c14..180e344f3 100644 --- a/frame/compat/f2c/util/bla_d_imag.h +++ b/frame/compat/f2c/util/bla_d_imag.h @@ -34,7 +34,7 @@ #ifdef BLIS_ENABLE_BLAS2BLIS -double bla_d_imag(bla_dcomplex *z); +double bla_d_imag(const bla_dcomplex *z); #endif diff --git a/frame/compat/f2c/util/bla_d_sign.c b/frame/compat/f2c/util/bla_d_sign.c index f7b19b89f..926db5508 100644 --- a/frame/compat/f2c/util/bla_d_sign.c +++ b/frame/compat/f2c/util/bla_d_sign.c @@ -36,7 +36,7 @@ #ifdef BLIS_ENABLE_BLAS2BLIS -double bla_d_sign(bla_double *a, bla_double *b) +double bla_d_sign(const bla_double *a, const bla_double *b) { double x = (*a >= 0.0 ? *a : - *a); diff --git a/frame/compat/f2c/util/bla_d_sign.h b/frame/compat/f2c/util/bla_d_sign.h index 74f4b015f..f2054a71b 100644 --- a/frame/compat/f2c/util/bla_d_sign.h +++ b/frame/compat/f2c/util/bla_d_sign.h @@ -34,7 +34,7 @@ #ifdef BLIS_ENABLE_BLAS2BLIS -double bla_d_sign(bla_double *a, bla_double *b); +double bla_d_sign(const bla_double *a, const bla_double *b); #endif diff --git a/frame/compat/f2c/util/bla_f__cabs.h b/frame/compat/f2c/util/bla_f__cabs.h index 56c7faec2..6864b6ef4 100644 --- a/frame/compat/f2c/util/bla_f__cabs.h +++ b/frame/compat/f2c/util/bla_f__cabs.h @@ -34,7 +34,7 @@ #ifdef BLIS_ENABLE_BLAS2BLIS -double bla_f__cabs(double bla_real, double imag); +double bla_f__cabs(double real, double imag); #endif diff --git a/frame/compat/f2c/util/bla_r_abs.c b/frame/compat/f2c/util/bla_r_abs.c index d65b83096..bb008ffa8 100644 --- a/frame/compat/f2c/util/bla_r_abs.c +++ b/frame/compat/f2c/util/bla_r_abs.c @@ -36,7 +36,7 @@ #ifdef BLIS_ENABLE_BLAS2BLIS -double bla_r_abs(bla_real *x) +double bla_r_abs(const bla_real *x) { if(*x >= 0.0) return(*x); diff --git a/frame/compat/f2c/util/bla_r_abs.h b/frame/compat/f2c/util/bla_r_abs.h index 5f9f7416c..b985f15fa 100644 --- a/frame/compat/f2c/util/bla_r_abs.h +++ b/frame/compat/f2c/util/bla_r_abs.h @@ -34,7 +34,7 @@ #ifdef BLIS_ENABLE_BLAS2BLIS -double bla_r_abs(bla_real *x); +double bla_r_abs(const bla_real *x); #endif diff --git a/frame/compat/f2c/util/bla_r_cnjg.c b/frame/compat/f2c/util/bla_r_cnjg.c index ebfb136e4..a3c2320d3 100644 --- a/frame/compat/f2c/util/bla_r_cnjg.c +++ b/frame/compat/f2c/util/bla_r_cnjg.c @@ -36,7 +36,7 @@ #ifdef BLIS_ENABLE_BLAS2BLIS -void bla_r_cnjg(bla_scomplex *dest, bla_scomplex *src) +void bla_r_cnjg(bla_scomplex *dest, const bla_scomplex *src) { bli_ccopyjs( *src, *dest ); } diff --git a/frame/compat/f2c/util/bla_r_cnjg.h b/frame/compat/f2c/util/bla_r_cnjg.h index 9da9c8f87..a4c106d19 100644 --- a/frame/compat/f2c/util/bla_r_cnjg.h +++ b/frame/compat/f2c/util/bla_r_cnjg.h @@ -34,7 +34,7 @@ #ifdef BLIS_ENABLE_BLAS2BLIS -void bla_r_cnjg(bla_scomplex *dest, bla_scomplex *src); +void bla_r_cnjg(bla_scomplex *dest, const bla_scomplex *src); #endif diff --git a/frame/compat/f2c/util/bla_r_imag.c b/frame/compat/f2c/util/bla_r_imag.c index 754d23287..f48888895 100644 --- a/frame/compat/f2c/util/bla_r_imag.c +++ b/frame/compat/f2c/util/bla_r_imag.c @@ -36,7 +36,7 @@ #ifdef BLIS_ENABLE_BLAS2BLIS -bla_real bla_r_imag(bla_scomplex *z) +bla_real bla_r_imag(const bla_scomplex *z) { return bli_cimag( *z ); } diff --git a/frame/compat/f2c/util/bla_r_imag.h b/frame/compat/f2c/util/bla_r_imag.h index ecb5d0178..16903fe32 100644 --- a/frame/compat/f2c/util/bla_r_imag.h +++ b/frame/compat/f2c/util/bla_r_imag.h @@ -34,7 +34,7 @@ #ifdef BLIS_ENABLE_BLAS2BLIS -bla_real bla_r_imag(bla_scomplex *z); +bla_real bla_r_imag(const bla_scomplex *z); #endif diff --git a/frame/compat/f2c/util/bla_r_sign.c b/frame/compat/f2c/util/bla_r_sign.c index 29f4ae06d..777413495 100644 --- a/frame/compat/f2c/util/bla_r_sign.c +++ b/frame/compat/f2c/util/bla_r_sign.c @@ -36,7 +36,7 @@ #ifdef BLIS_ENABLE_BLAS2BLIS -double bla_r_sign(bla_real *a, bla_real *b) +double bla_r_sign(const bla_real *a, const bla_real *b) { double x = (*a >= 0.0 ? *a : - *a); diff --git a/frame/compat/f2c/util/bla_r_sign.h b/frame/compat/f2c/util/bla_r_sign.h index 595ad4b4d..6ade10790 100644 --- a/frame/compat/f2c/util/bla_r_sign.h +++ b/frame/compat/f2c/util/bla_r_sign.h @@ -34,7 +34,7 @@ #ifdef BLIS_ENABLE_BLAS2BLIS -double bla_r_sign(bla_real *a, bla_real *b); +double bla_r_sign(const bla_real *a, const bla_real *b); #endif diff --git a/frame/compat/f2c/util/bla_z_abs.c b/frame/compat/f2c/util/bla_z_abs.c index 0ad781aee..378aa9af0 100644 --- a/frame/compat/f2c/util/bla_z_abs.c +++ b/frame/compat/f2c/util/bla_z_abs.c @@ -36,7 +36,7 @@ #ifdef BLIS_ENABLE_BLAS2BLIS -double bla_z_abs(bla_dcomplex *z) +double bla_z_abs(const bla_dcomplex *z) { return( bla_f__cabs( bli_zreal( *z ), bli_zimag( *z ) ) ); diff --git a/frame/compat/f2c/util/bla_z_abs.h b/frame/compat/f2c/util/bla_z_abs.h index ba6236f40..9e29975cd 100644 --- a/frame/compat/f2c/util/bla_z_abs.h +++ b/frame/compat/f2c/util/bla_z_abs.h @@ -34,7 +34,7 @@ #ifdef BLIS_ENABLE_BLAS2BLIS -double bla_z_abs(bla_dcomplex *z); +double bla_z_abs(const bla_dcomplex *z); #endif diff --git a/frame/compat/f2c/util/bla_z_div.c b/frame/compat/f2c/util/bla_z_div.c index b32ef3524..6a16f3d2a 100644 --- a/frame/compat/f2c/util/bla_z_div.c +++ b/frame/compat/f2c/util/bla_z_div.c @@ -36,7 +36,7 @@ #ifdef BLIS_ENABLE_BLAS2BLIS -void bla_z_div(bla_dcomplex *cp, bla_dcomplex *ap, bla_dcomplex *bp) +void bla_z_div(bla_dcomplex *cp, const bla_dcomplex *ap, const bla_dcomplex *bp) { bli_zcopys( *ap, *cp ); bli_zinvscals( *bp, *cp ); diff --git a/frame/compat/f2c/util/bla_z_div.h b/frame/compat/f2c/util/bla_z_div.h index daca277e3..bfe0d85e0 100644 --- a/frame/compat/f2c/util/bla_z_div.h +++ b/frame/compat/f2c/util/bla_z_div.h @@ -34,7 +34,7 @@ #ifdef BLIS_ENABLE_BLAS2BLIS -void bla_z_div(bla_dcomplex *cp, bla_dcomplex *ap, bla_dcomplex *bp); +void bla_z_div(bla_dcomplex *cp, const bla_dcomplex *ap, const bla_dcomplex *bp); #endif diff --git a/frame/include/blis.h b/frame/include/blis.h index 9bfedd71a..86a8c0565 100644 --- a/frame/include/blis.h +++ b/frame/include/blis.h @@ -162,15 +162,16 @@ extern "C" { #include "bli_util.h" -// -- CBLAS compatibility layer -- - -#include "bli_cblas.h" - // -- BLAS compatibility layer -- #include "bli_blas.h" +// -- CBLAS compatibility layer -- + +#include "bli_cblas.h" + + // End extern "C" construct block. #ifdef __cplusplus }