From c5606c622cebf265ae0bb3ea32a9f2ebf2f3a79f Mon Sep 17 00:00:00 2001 From: Alberto Ruiz Date: Tue, 21 May 2013 13:30:45 +0200 Subject: merge develop, fix conflicts --- lib/Numeric/LinearAlgebra/LAPACK/lapack-aux.h | 71 --------------------------- 1 file changed, 71 deletions(-) (limited to 'lib/Numeric/LinearAlgebra/LAPACK/lapack-aux.h') diff --git a/lib/Numeric/LinearAlgebra/LAPACK/lapack-aux.h b/lib/Numeric/LinearAlgebra/LAPACK/lapack-aux.h index 9526583..a3f1899 100644 --- a/lib/Numeric/LinearAlgebra/LAPACK/lapack-aux.h +++ b/lib/Numeric/LinearAlgebra/LAPACK/lapack-aux.h @@ -36,10 +36,6 @@ typedef short ftnlen; /********************************************************/ -#include "clapack.h" - -/********************************************************/ - #define FVEC(A) int A##n, float*A##p #define DVEC(A) int A##n, double*A##p #define QVEC(A) int A##n, complex*A##p @@ -62,70 +58,3 @@ typedef short ftnlen; #define KCMAT(A) int A##r, int A##c, const doublecomplex* A##p #define KPMAT(A) int A##r, int A##c, const void* A##p, int A##s -/********************************************************/ - -int multiplyF(int ta, int tb, KFMAT(a),KFMAT(b),FMAT(r)); -int multiplyR(int ta, int tb, KDMAT(a),KDMAT(b),DMAT(r)); -int multiplyC(int ta, int tb, KCMAT(a),KCMAT(b),CMAT(r)); -int multiplyQ(int ta, int tb, KQMAT(a),KQMAT(b),QMAT(r)); - -int transF(KFMAT(x),FMAT(t)); -int transR(KDMAT(x),DMAT(t)); -int transQ(KQMAT(x),QMAT(t)); -int transC(KCMAT(x),CMAT(t)); -int transP(KPMAT(x),PMAT(t)); - -int constantF(float * pval, FVEC(r)); -int constantR(double * pval, DVEC(r)); -int constantQ(complex* pval, QVEC(r)); -int constantC(doublecomplex* pval, CVEC(r)); -int constantP(void* pval, PVEC(r)); - -int float2double(FVEC(x),DVEC(y)); -int double2float(DVEC(x),FVEC(y)); - -int conjugateQ(KQVEC(x),QVEC(t)); -int conjugateC(KCVEC(x),CVEC(t)); - -int stepF(FVEC(x),FVEC(y)); -int stepD(DVEC(x),DVEC(y)); - -int condF(FVEC(x),FVEC(y),FVEC(lt),FVEC(eq),FVEC(gt),FVEC(r)); -int condD(DVEC(x),DVEC(y),DVEC(lt),DVEC(eq),DVEC(gt),DVEC(r)); - -int svd_l_R(KDMAT(x),DMAT(u),DVEC(s),DMAT(v)); -int svd_l_Rdd(KDMAT(x),DMAT(u),DVEC(s),DMAT(v)); -int svd_l_C(KCMAT(a),CMAT(u),DVEC(s),CMAT(v)); - -int eig_l_C(KCMAT(a),CMAT(u),CVEC(s),CMAT(v)); -int eig_l_R(KDMAT(a),DMAT(u),CVEC(s),DMAT(v)); - -int eig_l_S(int,KDMAT(a),DVEC(s),DMAT(v)); -int eig_l_H(int,KCMAT(a),DVEC(s),CMAT(v)); - -int linearSolveR_l(KDMAT(a),KDMAT(b),DMAT(x)); -int linearSolveC_l(KCMAT(a),KCMAT(b),CMAT(x)); - -int linearSolveLSR_l(KDMAT(a),KDMAT(b),DMAT(x)); -int linearSolveLSC_l(KCMAT(a),KCMAT(b),CMAT(x)); - -int linearSolveSVDR_l(double,KDMAT(a),KDMAT(b),DMAT(x)); -int linearSolveSVDC_l(double,KCMAT(a),KCMAT(b),CMAT(x)); - -int chol_l_H(KCMAT(a),CMAT(r)); -int chol_l_S(KDMAT(a),DMAT(r)); - -int qr_l_R(KDMAT(a), DVEC(tau), DMAT(r)); -int qr_l_C(KCMAT(a), CVEC(tau), CMAT(r)); - -int hess_l_R(KDMAT(a), DVEC(tau), DMAT(r)); -int hess_l_C(KCMAT(a), CVEC(tau), CMAT(r)); - -int schur_l_R(KDMAT(a), DMAT(u), DMAT(s)); -int schur_l_C(KCMAT(a), CMAT(u), CMAT(s)); - -int lu_l_R(KDMAT(a), DVEC(ipiv), DMAT(r)); -int lu_l_C(KCMAT(a), DVEC(ipiv), CMAT(r)); - -int luS_l_R(KDMAT(a), KDVEC(ipiv), KDMAT(b), DMAT(x)); -int luS_l_C(KCMAT(a), KDVEC(ipiv), KCMAT(b), CMAT(x)); -- cgit v1.2.3