From 9bd9472ae9ca4e55b65dbd59ec510fd8d12cbb7b Mon Sep 17 00:00:00 2001 From: wernsaar Date: Wed, 9 Jul 2014 16:08:19 +0200 Subject: [PATCH 1/3] Lapack-test: cleanup of x86 32bit KERNEL file --- kernel/x86/KERNEL | 501 +++++++++------------------------------------- 1 file changed, 91 insertions(+), 410 deletions(-) diff --git a/kernel/x86/KERNEL b/kernel/x86/KERNEL index c1a1195a1..924d869a4 100644 --- a/kernel/x86/KERNEL +++ b/kernel/x86/KERNEL @@ -1,414 +1,95 @@ -GEMVDEP = ../l2param.h +#SAMAXKERNEL = ../arm/amax.c +#DAMAXKERNEL = ../arm/amax.c +#CAMAXKERNEL = ../arm/zamax.c +#ZAMAXKERNEL = ../arm/zamax.c + +SAMINKERNEL = ../arm/amin.c +DAMINKERNEL = ../arm/amin.c +CAMINKERNEL = ../arm/zamin.c +ZAMINKERNEL = ../arm/zamin.c + +SMAXKERNEL = ../arm/max.c +DMAXKERNEL = ../arm/max.c + +SMINKERNEL = ../arm/min.c +DMINKERNEL = ../arm/min.c + +#ISAMAXKERNEL = ../arm/iamax.c +#IDAMAXKERNEL = ../arm/iamax.c +#ICAMAXKERNEL = ../arm/izamax.c +#IZAMAXKERNEL = ../arm/izamax.c + +ISAMINKERNEL = ../arm/iamin.c +IDAMINKERNEL = ../arm/iamin.c +ICAMINKERNEL = ../arm/izamin.c +IZAMINKERNEL = ../arm/izamin.c + +#ISMAXKERNEL = ../arm/imax.c +#IDMAXKERNEL = ../arm/imax.c + +ISMINKERNEL = ../arm/imin.c +IDMINKERNEL = ../arm/imin.c + +#SASUMKERNEL = ../arm/asum.c +#DASUMKERNEL = ../arm/asum.c +#CASUMKERNEL = ../arm/zasum.c +#ZASUMKERNEL = ../arm/zasum.c + +#SAXPYKERNEL = ../arm/axpy.c +#DAXPYKERNEL = ../arm/axpy.c +#CAXPYKERNEL = ../arm/zaxpy.c +#ZAXPYKERNEL = ../arm/zaxpy.c + +#SCOPYKERNEL = ../arm/copy.c +#DCOPYKERNEL = ../arm/copy.c +#CCOPYKERNEL = ../arm/zcopy.c +#ZCOPYKERNEL = ../arm/zcopy.c + +#SDOTKERNEL = ../arm/dot.c +#DDOTKERNEL = ../arm/dot.c +#CDOTKERNEL = ../arm/zdot.c +#ZDOTKERNEL = ../arm/zdot.c + +DSDOTKERNEL = ../arm/dot.c + +#SNRM2KERNEL = ../arm/nrm2.c +#DNRM2KERNEL = ../arm/nrm2.c +#CNRM2KERNEL = ../arm/znrm2.c +# Bug in znrm2 assembler kernel +ZNRM2KERNEL = ../arm/znrm2.c + + +#SROTKERNEL = ../arm/rot.c +#DROTKERNEL = ../arm/rot.c +#CROTKERNEL = ../arm/zrot.c +#ZROTKERNEL = ../arm/zrot.c + +#SSCALKERNEL = ../arm/scal.c +#DSCALKERNEL = ../arm/scal.c +#CSCALKERNEL = ../arm/zscal.c +#ZSCALKERNEL = ../arm/zscal.c + +#SSWAPKERNEL = ../arm/swap.c +#DSWAPKERNEL = ../arm/swap.c +#CSWAPKERNEL = ../arm/zswap.c +#ZSWAPKERNEL = ../arm/zswap.c + +#SGEMVNKERNEL = ../arm/gemv_n.c +#DGEMVNKERNEL = ../arm/gemv_n.c +#CGEMVNKERNEL = ../arm/zgemv_n.c +#ZGEMVNKERNEL = ../arm/zgemv_n.c + +#SGEMVTKERNEL = ../arm/gemv_t.c +#DGEMVTKERNEL = ../arm/gemv_t.c +#CGEMVTKERNEL = ../arm/zgemv_t.c +# Bug in zgemv_t assembler kernel +ZGEMVTKERNEL = ../arm/zgemv_t.c + +SGEMM_BETA = ../generic/gemm_beta.c +DGEMM_BETA = ../generic/gemm_beta.c +CGEMM_BETA = ../generic/zgemm_beta.c +ZGEMM_BETA = ../generic/zgemm_beta.c -ifdef HAVE_SSE - -ifndef SAMAXKERNEL -SAMAXKERNEL = amax_sse.S -endif - -ifndef CAMAXKERNEL -CAMAXKERNEL = zamax_sse.S -endif - -ifndef SAMINKERNEL -SAMINKERNEL = amax_sse.S -endif - -ifndef CAMINKERNEL -CAMINKERNEL = zamax_sse.S -endif - -ifndef ISAMAXKERNEL -ISAMAXKERNEL = iamax_sse.S -endif - -ifndef ICAMAXKERNEL -ICAMAXKERNEL = izamax_sse.S -endif - -ifndef ISAMINKERNEL -ISAMINKERNEL = iamax_sse.S -endif - -ifndef ICAMINKERNEL -ICAMINKERNEL = izamax_sse.S -endif - -ifndef ISMAXKERNEL -ISMAXKERNEL = iamax_sse.S -endif - -ifndef ISMINKERNEL -ISMINKERNEL = iamax_sse.S -endif - -ifndef SMAXKERNEL -SMAXKERNEL = amax_sse.S -endif - -ifndef SMINKERNEL -SMINKERNEL = amax_sse.S -endif - -ifndef SASUMKERNEL -SASUMKERNEL = asum_sse.S -endif - -ifndef CASUMKERNEL -CASUMKERNEL = zasum_sse.S -endif - -ifndef SDOTKERNEL -SDOTKERNEL = ../arm/dot.c -endif - -ifndef CDOTKERNEL -CDOTKERNEL = zdot_sse.S -endif - -ifndef SCOPYKERNEL -SCOPYKERNEL = copy_sse.S -endif - -ifndef CCOPYKERNEL -CCOPYKERNEL = zcopy_sse.S -endif - -ifndef SSACALKERNEL -SSCALKERNEL = scal_sse.S -endif - -ifndef CSACALKERNEL -CSCALKERNEL = zscal_sse.S -endif - -ifndef SAXPYKERNEL -SAXPYKERNEL = axpy_sse.S -endif - -ifndef CAXPYKERNEL -CAXPYKERNEL = zaxpy_sse.S -endif - -ifndef SROTKERNEL -SROTKERNEL = rot_sse.S -endif - -ifndef CROTKERNEL -CROTKERNEL = zrot_sse.S -endif - -ifndef SSWAPKERNEL -SSWAPKERNEL = swap_sse.S -endif - -ifndef CSWAPKERNEL -CSWAPKERNEL = zswap_sse.S -endif - -ifndef SGEMVNKERNEL -SGEMVNKERNEL = ../arm/gemv_n.c -endif - -ifndef SGEMVTKERNEL -SGEMVTKERNEL = ../arm/gemv_t.c -endif - -ifndef CGEMVNKERNEL -CGEMVNKERNEL = zgemv_n_sse.S -endif - -ifndef CGEMVTKERNEL -CGEMVTKERNEL = zgemv_t_sse.S -endif - -endif - - -ifdef HAVE_SSE2 - -ifndef DAMAXKERNEL -DAMAXKERNEL = amax_sse2.S -endif - -ifndef ZAMAXKERNEL -ZAMAXKERNEL = zamax_sse2.S -endif - -ifndef DAMINKERNEL -DAMINKERNEL = amax_sse2.S -endif - -ifndef ZAMINKERNEL -ZAMINKERNEL = zamax_sse2.S -endif - -ifndef IDAMAXKERNEL -IDAMAXKERNEL = iamax_sse2.S -endif - -ifndef IZAMAXKERNEL -IZAMAXKERNEL = izamax_sse2.S -endif - -ifndef IDAMINKERNEL -IDAMINKERNEL = iamax_sse2.S -endif - -ifndef IZAMINKERNEL -IZAMINKERNEL = izamax_sse2.S -endif - -ifndef IDMAXKERNEL -IDMAXKERNEL = iamax_sse2.S -endif - -ifndef IDMINKERNEL -IDMINKERNEL = iamax_sse2.S -endif - -ifndef DMAXKERNEL -DMAXKERNEL = amax_sse2.S -endif - -ifndef DMINKERNEL -DMINKERNEL = amax_sse2.S -endif - -ifndef DDOTKERNEL -DDOTKERNEL = dot_sse2.S -endif - -ifndef ZDOTKERNEL -ZDOTKERNEL = zdot_sse2.S -endif - -ifndef DCOPYKERNEL -# DCOPYKERNEL = copy_sse2.S -endif - -ifndef ZCOPYKERNEL -ZCOPYKERNEL = zcopy_sse2.S -endif - -ifndef DSACALKERNEL -DSCALKERNEL = scal_sse2.S -endif - -ifndef ZSACALKERNEL -ZSCALKERNEL = zscal_sse2.S -endif - -ifndef DASUMKERNEL -DASUMKERNEL = asum_sse2.S -endif - -ifndef ZASUMKERNEL -ZASUMKERNEL = zasum_sse2.S -endif - -ifndef DAXPYKERNEL -DAXPYKERNEL = axpy_sse2.S -endif - -ifndef ZAXPYKERNEL -ZAXPYKERNEL = zaxpy_sse2.S -endif - -ifndef SNRM2KERNEL -SNRM2KERNEL = nrm2_sse.S -endif - -ifndef CNRM2KERNEL -CNRM2KERNEL = znrm2_sse.S -endif - -ifndef DROTKERNEL -DROTKERNEL = rot_sse2.S -endif - -ifndef ZROTKERNEL -ZROTKERNEL = zrot_sse2.S -endif - -ifndef DSWAPKERNEL -DSWAPKERNEL = swap_sse2.S -endif - -ifndef ZSWAPKERNEL -ZSWAPKERNEL = zswap_sse2.S -endif - -ifndef DGEMVNKERNEL -DGEMVNKERNEL = gemv_n_sse2.S -endif - -ifndef DGEMVTKERNEL -DGEMVTKERNEL = gemv_t_sse2.S -endif - -ifndef ZGEMVNKERNEL -ZGEMVNKERNEL = zgemv_n_sse2.S -endif - -ifndef ZGEMVTKERNEL -ZGEMVTKERNEL = zgemv_t_sse2.S -endif - -endif - - -ifndef SAMINKERNEL -SAMINKERNEL = amax.S -endif - -ifndef DAMINKERNEL -DAMINKERNEL = amax.S -endif - -ifndef QAMINKERNEL -QAMINKERNEL = amax.S -endif - -ifndef CAMINKERNEL -CAMINKERNEL = zamax.S -endif - -ifndef ZAMINKERNEL -ZAMINKERNEL = zamax.S -endif - -ifndef XAMINKERNEL -XAMINKERNEL = zamax.S -endif - -ifndef SMAXKERNEL -SMAXKERNEL = amax.S -endif - -ifndef DMAXKERNEL -DMAXKERNEL = amax.S -endif - -ifndef QMAXKERNEL -QMAXKERNEL = amax.S -endif - -ifndef SMINKERNEL -SMINKERNEL = amax.S -endif - -ifndef DMINKERNEL -DMINKERNEL = amax.S -endif - -ifndef QMINKERNEL -QMINKERNEL = amax.S -endif - -ifndef ISAMINKERNEL -ISAMINKERNEL = iamax.S -endif - -ifndef IDAMINKERNEL -IDAMINKERNEL = iamax.S -endif - -ifndef IQAMINKERNEL -IQAMINKERNEL = iamax.S -endif - -ifndef ICAMINKERNEL -ICAMINKERNEL = izamax.S -endif - -ifndef IZAMINKERNEL -IZAMINKERNEL = izamax.S -endif - -ifndef IXAMINKERNEL -IXAMINKERNEL = izamax.S -endif - -ifndef ISMINKERNEL -ISMINKERNEL = iamax.S -endif - -ifndef IDMINKERNEL -IDMINKERNEL = iamax.S -endif - -ifndef IQMINKERNEL -IQMINKERNEL = iamax.S -endif - -ifndef QDOTKERNEL -QDOTKERNEL = qdot.S -endif - -ifndef XDOTKERNEL -XDOTKERNEL = xdot.S -endif - -ifndef QAXPYKERNEL -QAXPYKERNEL = qaxpy.S -endif - -ifndef XAXPYKERNEL -XAXPYKERNEL = xaxpy.S -endif - -ifndef QGEMVNKERNEL -QGEMVNKERNEL = qgemv_n.S -endif - -ifndef QGEMVTKERNEL -QGEMVTKERNEL = qgemv_t.S -endif - -ifndef XGEMVNKERNEL -XGEMVNKERNEL = xgemv_n.S -endif - -ifndef XGEMVTKERNEL -XGEMVTKERNEL = xgemv_t.S -endif - -QGEMMKERNEL = qgemm_kernel_2x2.S -QGEMMINCOPY = -QGEMMITCOPY = -QGEMMONCOPY = ../generic/gemm_ncopy_2.c -QGEMMOTCOPY = ../generic/gemm_tcopy_2.c -QGEMMINCOPYOBJ = -QGEMMITCOPYOBJ = -QGEMMONCOPYOBJ = qgemm_oncopy$(TSUFFIX).$(SUFFIX) -QGEMMOTCOPYOBJ = qgemm_otcopy$(TSUFFIX).$(SUFFIX) - -XGEMMKERNEL = xgemm_kernel_1x1.S -XGEMMINCOPY = -XGEMMITCOPY = -XGEMMONCOPY = ../generic/zgemm_ncopy_1.c -XGEMMOTCOPY = ../generic/zgemm_tcopy_1.c -XGEMMINCOPYOBJ = -XGEMMITCOPYOBJ = -XGEMMONCOPYOBJ = xgemm_oncopy$(TSUFFIX).$(SUFFIX) -XGEMMOTCOPYOBJ = xgemm_otcopy$(TSUFFIX).$(SUFFIX) - -SGEMM_BETA = gemm_beta.S -DGEMM_BETA = gemm_beta.S QGEMM_BETA = ../generic/gemm_beta.c -CGEMM_BETA = zgemm_beta.S -ZGEMM_BETA = zgemm_beta.S XGEMM_BETA = ../generic/zgemm_beta.c -QTRSMKERNEL_LN = qtrsm_kernel_LN_2x2.S -QTRSMKERNEL_LT = qtrsm_kernel_LT_2x2.S -QTRSMKERNEL_RN = qtrsm_kernel_LT_2x2.S -QTRSMKERNEL_RT = qtrsm_kernel_RT_2x2.S - -XTRSMKERNEL_LN = xtrsm_kernel_LT_1x1.S -XTRSMKERNEL_LT = xtrsm_kernel_LT_1x1.S -XTRSMKERNEL_RN = xtrsm_kernel_LT_1x1.S -XTRSMKERNEL_RT = xtrsm_kernel_LT_1x1.S - -XGEMM3MKERNEL = xgemm3m_kernel_2x2.S From 0884b73c69cdee104e7d87d16eb1fac14a2de650 Mon Sep 17 00:00:00 2001 From: wernsaar Date: Thu, 10 Jul 2014 11:01:47 +0200 Subject: [PATCH 2/3] Lapack-test Windows 32bit now error free --- kernel/x86/KERNEL | 213 +++++++++++++++++++++++++++++++--------------- 1 file changed, 146 insertions(+), 67 deletions(-) diff --git a/kernel/x86/KERNEL b/kernel/x86/KERNEL index 924d869a4..8b30355ec 100644 --- a/kernel/x86/KERNEL +++ b/kernel/x86/KERNEL @@ -1,89 +1,168 @@ -#SAMAXKERNEL = ../arm/amax.c -#DAMAXKERNEL = ../arm/amax.c -#CAMAXKERNEL = ../arm/zamax.c -#ZAMAXKERNEL = ../arm/zamax.c +ifndef SAMINKERNEL +SAMINKERNEL = amax.S +endif -SAMINKERNEL = ../arm/amin.c -DAMINKERNEL = ../arm/amin.c -CAMINKERNEL = ../arm/zamin.c -ZAMINKERNEL = ../arm/zamin.c +ifndef DAMINKERNEL +DAMINKERNEL = amax.S +endif -SMAXKERNEL = ../arm/max.c -DMAXKERNEL = ../arm/max.c +ifndef QAMINKERNEL +QAMINKERNEL = amax.S +endif -SMINKERNEL = ../arm/min.c -DMINKERNEL = ../arm/min.c +ifndef CAMINKERNEL +CAMINKERNEL = zamax.S +endif -#ISAMAXKERNEL = ../arm/iamax.c -#IDAMAXKERNEL = ../arm/iamax.c -#ICAMAXKERNEL = ../arm/izamax.c -#IZAMAXKERNEL = ../arm/izamax.c +ifndef ZAMINKERNEL +ZAMINKERNEL = zamax.S +endif -ISAMINKERNEL = ../arm/iamin.c -IDAMINKERNEL = ../arm/iamin.c -ICAMINKERNEL = ../arm/izamin.c -IZAMINKERNEL = ../arm/izamin.c +ifndef XAMINKERNEL +XAMINKERNEL = zamax.S +endif -#ISMAXKERNEL = ../arm/imax.c -#IDMAXKERNEL = ../arm/imax.c +ifndef SMAXKERNEL +SMAXKERNEL = amax.S +endif -ISMINKERNEL = ../arm/imin.c -IDMINKERNEL = ../arm/imin.c +ifndef DMAXKERNEL +DMAXKERNEL = amax.S +endif -#SASUMKERNEL = ../arm/asum.c -#DASUMKERNEL = ../arm/asum.c -#CASUMKERNEL = ../arm/zasum.c -#ZASUMKERNEL = ../arm/zasum.c +ifndef QMAXKERNEL +QMAXKERNEL = amax.S +endif -#SAXPYKERNEL = ../arm/axpy.c -#DAXPYKERNEL = ../arm/axpy.c -#CAXPYKERNEL = ../arm/zaxpy.c -#ZAXPYKERNEL = ../arm/zaxpy.c +ifndef SMINKERNEL +SMINKERNEL = amax.S +endif -#SCOPYKERNEL = ../arm/copy.c -#DCOPYKERNEL = ../arm/copy.c -#CCOPYKERNEL = ../arm/zcopy.c -#ZCOPYKERNEL = ../arm/zcopy.c +ifndef DMINKERNEL +DMINKERNEL = amax.S +endif -#SDOTKERNEL = ../arm/dot.c -#DDOTKERNEL = ../arm/dot.c -#CDOTKERNEL = ../arm/zdot.c -#ZDOTKERNEL = ../arm/zdot.c +ifndef QMINKERNEL +QMINKERNEL = amax.S +endif + +ifndef ISAMINKERNEL +ISAMINKERNEL = iamax.S +endif + +ifndef IDAMINKERNEL +IDAMINKERNEL = iamax.S +endif + +ifndef IQAMINKERNEL +IQAMINKERNEL = iamax.S +endif + +ifndef ICAMINKERNEL +ICAMINKERNEL = izamax.S +endif + +ifndef IZAMINKERNEL +IZAMINKERNEL = izamax.S +endif + +ifndef IXAMINKERNEL +IXAMINKERNEL = izamax.S +endif + +ifndef ISMINKERNEL +ISMINKERNEL = iamax.S +endif + +ifndef IDMINKERNEL +IDMINKERNEL = iamax.S +endif + +ifndef IQMINKERNEL +IQMINKERNEL = iamax.S +endif + +ifndef QDOTKERNEL +QDOTKERNEL = qdot.S +endif + +ifndef XDOTKERNEL +XDOTKERNEL = xdot.S +endif + +ifndef QAXPYKERNEL +QAXPYKERNEL = qaxpy.S +endif + +ifndef XAXPYKERNEL +XAXPYKERNEL = xaxpy.S +endif + +ifndef QGEMVNKERNEL +QGEMVNKERNEL = qgemv_n.S +endif + +ifndef QGEMVTKERNEL +QGEMVTKERNEL = qgemv_t.S +endif + +ifndef XGEMVNKERNEL +XGEMVNKERNEL = xgemv_n.S +endif + +ifndef XGEMVTKERNEL +XGEMVTKERNEL = xgemv_t.S +endif + +QGEMMKERNEL = qgemm_kernel_2x2.S +QGEMMINCOPY = +QGEMMITCOPY = +QGEMMONCOPY = ../generic/gemm_ncopy_2.c +QGEMMOTCOPY = ../generic/gemm_tcopy_2.c +QGEMMINCOPYOBJ = +QGEMMITCOPYOBJ = +QGEMMONCOPYOBJ = qgemm_oncopy$(TSUFFIX).$(SUFFIX) +QGEMMOTCOPYOBJ = qgemm_otcopy$(TSUFFIX).$(SUFFIX) + +XGEMMKERNEL = xgemm_kernel_1x1.S +XGEMMINCOPY = +XGEMMITCOPY = +XGEMMONCOPY = ../generic/zgemm_ncopy_1.c +XGEMMOTCOPY = ../generic/zgemm_tcopy_1.c +XGEMMINCOPYOBJ = +XGEMMITCOPYOBJ = +XGEMMONCOPYOBJ = xgemm_oncopy$(TSUFFIX).$(SUFFIX) +XGEMMOTCOPYOBJ = xgemm_otcopy$(TSUFFIX).$(SUFFIX) + +QTRSMKERNEL_LN = qtrsm_kernel_LN_2x2.S +QTRSMKERNEL_LT = qtrsm_kernel_LT_2x2.S +QTRSMKERNEL_RN = qtrsm_kernel_LT_2x2.S +QTRSMKERNEL_RT = qtrsm_kernel_RT_2x2.S + +XTRSMKERNEL_LN = xtrsm_kernel_LT_1x1.S +XTRSMKERNEL_LT = xtrsm_kernel_LT_1x1.S +XTRSMKERNEL_RN = xtrsm_kernel_LT_1x1.S +XTRSMKERNEL_RT = xtrsm_kernel_LT_1x1.S + +XGEMM3MKERNEL = xgemm3m_kernel_2x2.S + + +# bug in zdot assembler kernel +ifndef ZDOTKERNEL +ZDOTKERNEL = ../arm/zdot.c +endif DSDOTKERNEL = ../arm/dot.c -#SNRM2KERNEL = ../arm/nrm2.c -#DNRM2KERNEL = ../arm/nrm2.c -#CNRM2KERNEL = ../arm/znrm2.c # Bug in znrm2 assembler kernel +ifndef ZNRM2KERNEL ZNRM2KERNEL = ../arm/znrm2.c +endif - -#SROTKERNEL = ../arm/rot.c -#DROTKERNEL = ../arm/rot.c -#CROTKERNEL = ../arm/zrot.c -#ZROTKERNEL = ../arm/zrot.c - -#SSCALKERNEL = ../arm/scal.c -#DSCALKERNEL = ../arm/scal.c -#CSCALKERNEL = ../arm/zscal.c -#ZSCALKERNEL = ../arm/zscal.c - -#SSWAPKERNEL = ../arm/swap.c -#DSWAPKERNEL = ../arm/swap.c -#CSWAPKERNEL = ../arm/zswap.c -#ZSWAPKERNEL = ../arm/zswap.c - -#SGEMVNKERNEL = ../arm/gemv_n.c -#DGEMVNKERNEL = ../arm/gemv_n.c -#CGEMVNKERNEL = ../arm/zgemv_n.c -#ZGEMVNKERNEL = ../arm/zgemv_n.c - -#SGEMVTKERNEL = ../arm/gemv_t.c -#DGEMVTKERNEL = ../arm/gemv_t.c -#CGEMVTKERNEL = ../arm/zgemv_t.c # Bug in zgemv_t assembler kernel +ifndef ZGEMVTKERNEL ZGEMVTKERNEL = ../arm/zgemv_t.c +endif SGEMM_BETA = ../generic/gemm_beta.c DGEMM_BETA = ../generic/gemm_beta.c From cedc1f4b1483401235a48c941dd64dad31d8e200 Mon Sep 17 00:00:00 2001 From: wernsaar Date: Thu, 10 Jul 2014 13:42:32 +0200 Subject: [PATCH 3/3] Ref #410: disabled optimized potri functions ( single threading bug) --- interface/Makefile | 37 +++++++++++++++++++------------------ lapack-netlib/SRC/Makefile | 8 ++++---- 2 files changed, 23 insertions(+), 22 deletions(-) diff --git a/interface/Makefile b/interface/Makefile index a24702630..6992248ba 100644 --- a/interface/Makefile +++ b/interface/Makefile @@ -356,25 +356,25 @@ ZBLASOBJS = $(ZBLAS1OBJS) $(ZBLAS2OBJS) $(ZBLAS3OBJS) XBLASOBJS = $(XBLAS1OBJS) $(XBLAS2OBJS) $(XBLAS3OBJS) #SLAPACKOBJS = \ -# sgetf2.$(SUFFIX) sgetrf.$(SUFFIX) slauu2.$(SUFFIX) slauum.$(SUFFIX) \ -# spotf2.$(SUFFIX) spotrf.$(SUFFIX) strti2.$(SUFFIX) strtri.$(SUFFIX) \ -# slaswp.$(SUFFIX) sgetrs.$(SUFFIX) sgesv.$(SUFFIX) spotri.$(SUFFIX) \ +# sgetrf.$(SUFFIX) sgetrs.$(SUFFIX) spotrf.$(SUFFIX) sgetf2.$(SUFFIX) \ +# spotf2.$(SUFFIX) slaswp.$(SUFFIX) sgesv.$(SUFFIX) slauu2.$(SUFFIX) \ +# slauum.$(SUFFIX) strti2.$(SUFFIX) strtri.$(SUFFIX) spotri.$(SUFFIX) SLAPACKOBJS = \ sgetrf.$(SUFFIX) sgetrs.$(SUFFIX) spotrf.$(SUFFIX) sgetf2.$(SUFFIX) \ spotf2.$(SUFFIX) slaswp.$(SUFFIX) sgesv.$(SUFFIX) slauu2.$(SUFFIX) \ - slauum.$(SUFFIX) strti2.$(SUFFIX) strtri.$(SUFFIX) spotri.$(SUFFIX) + slauum.$(SUFFIX) strti2.$(SUFFIX) strtri.$(SUFFIX) #DLAPACKOBJS = \ -# dgetf2.$(SUFFIX) dgetrf.$(SUFFIX) dlauu2.$(SUFFIX) dlauum.$(SUFFIX) \ -# dpotf2.$(SUFFIX) dpotrf.$(SUFFIX) dtrti2.$(SUFFIX) dtrtri.$(SUFFIX) \ -# dlaswp.$(SUFFIX) dgetrs.$(SUFFIX) dgesv.$(SUFFIX) dpotri.$(SUFFIX) \ +# dgetrf.$(SUFFIX) dgetrs.$(SUFFIX) dpotrf.$(SUFFIX) dgetf2.$(SUFFIX) \ +# dpotf2.$(SUFFIX) dlaswp.$(SUFFIX) dgesv.$(SUFFIX) dlauu2.$(SUFFIX) \ +# dlauum.$(SUFFIX) dtrti2.$(SUFFIX) dtrtri.$(SUFFIX) dpotri.$(SUFFIX) DLAPACKOBJS = \ dgetrf.$(SUFFIX) dgetrs.$(SUFFIX) dpotrf.$(SUFFIX) dgetf2.$(SUFFIX) \ dpotf2.$(SUFFIX) dlaswp.$(SUFFIX) dgesv.$(SUFFIX) dlauu2.$(SUFFIX) \ - dlauum.$(SUFFIX) dtrti2.$(SUFFIX) dtrtri.$(SUFFIX) dpotri.$(SUFFIX) + dlauum.$(SUFFIX) dtrti2.$(SUFFIX) dtrtri.$(SUFFIX) QLAPACKOBJS = \ @@ -382,28 +382,29 @@ QLAPACKOBJS = \ qpotf2.$(SUFFIX) qpotrf.$(SUFFIX) qtrti2.$(SUFFIX) qtrtri.$(SUFFIX) \ qlaswp.$(SUFFIX) qgetrs.$(SUFFIX) qgesv.$(SUFFIX) qpotri.$(SUFFIX) \ + #CLAPACKOBJS = \ -# cgetf2.$(SUFFIX) cgetrf.$(SUFFIX) clauu2.$(SUFFIX) clauum.$(SUFFIX) \ -# cpotf2.$(SUFFIX) cpotrf.$(SUFFIX) ctrti2.$(SUFFIX) ctrtri.$(SUFFIX) \ -# claswp.$(SUFFIX) cgetrs.$(SUFFIX) cgesv.$(SUFFIX) cpotri.$(SUFFIX) \ +# cgetrf.$(SUFFIX) cgetrs.$(SUFFIX) cpotrf.$(SUFFIX) cgetf2.$(SUFFIX) \ +# cpotf2.$(SUFFIX) claswp.$(SUFFIX) cgesv.$(SUFFIX) clauu2.$(SUFFIX) \ +# clauum.$(SUFFIX) ctrti2.$(SUFFIX) ctrtri.$(SUFFIX) cpotri.$(SUFFIX) + CLAPACKOBJS = \ cgetrf.$(SUFFIX) cgetrs.$(SUFFIX) cpotrf.$(SUFFIX) cgetf2.$(SUFFIX) \ cpotf2.$(SUFFIX) claswp.$(SUFFIX) cgesv.$(SUFFIX) clauu2.$(SUFFIX) \ - clauum.$(SUFFIX) ctrti2.$(SUFFIX) ctrtri.$(SUFFIX) cpotri.$(SUFFIX) + clauum.$(SUFFIX) ctrti2.$(SUFFIX) ctrtri.$(SUFFIX) #ZLAPACKOBJS = \ -# zgetf2.$(SUFFIX) zgetrf.$(SUFFIX) zlauu2.$(SUFFIX) zlauum.$(SUFFIX) \ -# zpotf2.$(SUFFIX) zpotrf.$(SUFFIX) ztrti2.$(SUFFIX) ztrtri.$(SUFFIX) \ -# zlaswp.$(SUFFIX) zgetrs.$(SUFFIX) zgesv.$(SUFFIX) zpotri.$(SUFFIX) \ +# zgetrf.$(SUFFIX) zgetrs.$(SUFFIX) zpotrf.$(SUFFIX) zgetf2.$(SUFFIX) \ +# zpotf2.$(SUFFIX) zlaswp.$(SUFFIX) zgesv.$(SUFFIX) zlauu2.$(SUFFIX) \ +# zlauum.$(SUFFIX) ztrti2.$(SUFFIX) ztrtri.$(SUFFIX) zpotri.$(SUFFIX) + ZLAPACKOBJS = \ zgetrf.$(SUFFIX) zgetrs.$(SUFFIX) zpotrf.$(SUFFIX) zgetf2.$(SUFFIX) \ zpotf2.$(SUFFIX) zlaswp.$(SUFFIX) zgesv.$(SUFFIX) zlauu2.$(SUFFIX) \ - zlauum.$(SUFFIX) ztrti2.$(SUFFIX) ztrtri.$(SUFFIX) zpotri.$(SUFFIX) - - + zlauum.$(SUFFIX) ztrti2.$(SUFFIX) ztrtri.$(SUFFIX) XLAPACKOBJS = \ diff --git a/lapack-netlib/SRC/Makefile b/lapack-netlib/SRC/Makefile index 0db85763a..68a64c977 100644 --- a/lapack-netlib/SRC/Makefile +++ b/lapack-netlib/SRC/Makefile @@ -155,7 +155,7 @@ SLASRC = \ sbbcsd.o slapmr.o sorbdb.o sorbdb1.o sorbdb2.o sorbdb3.o sorbdb4.o \ sorbdb5.o sorbdb6.o sorcsd.o sorcsd2by1.o \ sgeqrt.o sgeqrt2.o sgeqrt3.o sgemqrt.o \ - stpqrt.o stpqrt2.o stpmqrt.o stprfb.o + stpqrt.o stpqrt2.o stpmqrt.o stprfb.o spotri.o DSLASRC = spotrs.o @@ -236,7 +236,7 @@ CLASRC = \ cbbcsd.o clapmr.o cunbdb.o cunbdb1.o cunbdb2.o cunbdb3.o cunbdb4.o \ cunbdb5.o cunbdb6.o cuncsd.o cuncsd2by1.o \ cgeqrt.o cgeqrt2.o cgeqrt3.o cgemqrt.o \ - ctpqrt.o ctpqrt2.o ctpmqrt.o ctprfb.o + ctpqrt.o ctpqrt2.o ctpmqrt.o ctprfb.o cpotri.o ifdef USEXBLAS CXLASRC = cgesvxx.o cgerfsx.o cla_gerfsx_extended.o cla_geamv.o \ @@ -316,7 +316,7 @@ DLASRC = \ dbbcsd.o dlapmr.o dorbdb.o dorbdb1.o dorbdb2.o dorbdb3.o dorbdb4.o \ dorbdb5.o dorbdb6.o dorcsd.o dorcsd2by1.o \ dgeqrt.o dgeqrt2.o dgeqrt3.o dgemqrt.o \ - dtpqrt.o dtpqrt2.o dtpmqrt.o dtprfb.o + dtpqrt.o dtpqrt2.o dtpmqrt.o dtprfb.o dpotri.o ifdef USEXBLAS DXLASRC = dgesvxx.o dgerfsx.o dla_gerfsx_extended.o dla_geamv.o \ @@ -400,7 +400,7 @@ ZLASRC = \ zbbcsd.o zlapmr.o zunbdb.o zunbdb1.o zunbdb2.o zunbdb3.o zunbdb4.o \ zunbdb5.o zunbdb6.o zuncsd.o zuncsd2by1.o \ zgeqrt.o zgeqrt2.o zgeqrt3.o zgemqrt.o \ - ztpqrt.o ztpqrt2.o ztpmqrt.o ztprfb.o + ztpqrt.o ztpqrt2.o ztpmqrt.o ztprfb.o zpotri.o ifdef USEXBLAS ZXLASRC = zgesvxx.o zgerfsx.o zla_gerfsx_extended.o zla_geamv.o \