mirror of
https://gitlab.com/libeigen/eigen.git
synced 2025-08-14 04:35:57 +08:00
some cleaning in blas level 2
This commit is contained in:
parent
94f59a92cb
commit
8ad1f64e0a
@ -140,6 +140,17 @@ T* get_compact_vector(T* x, int n, int incx)
|
|||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
template<typename T>
|
||||||
|
T* copy_back(T* x_cpy, T* x, int n, int incx)
|
||||||
|
{
|
||||||
|
if(x_cpy==x)
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
if(incx<0) vector(x,n,-incx).reverse() = vector(x_cpy,n);
|
||||||
|
else vector(x,n, incx) = vector(x_cpy,n);
|
||||||
|
return x_cpy;
|
||||||
|
}
|
||||||
|
|
||||||
#define EIGEN_BLAS_FUNC(X) EIGEN_CAT(SCALAR_SUFFIX,X##_)
|
#define EIGEN_BLAS_FUNC(X) EIGEN_CAT(SCALAR_SUFFIX,X##_)
|
||||||
|
|
||||||
#endif // EIGEN_BLAS_COMMON_H
|
#endif // EIGEN_BLAS_COMMON_H
|
||||||
|
@ -24,21 +24,6 @@
|
|||||||
|
|
||||||
#include "common.h"
|
#include "common.h"
|
||||||
|
|
||||||
#define MAKE_ACTUAL_VECTOR(X,INCX,N,COND) \
|
|
||||||
Scalar* actual_##X = X; \
|
|
||||||
if(COND) { \
|
|
||||||
actual_##X = new Scalar[N]; \
|
|
||||||
if((INCX)<0) vector(actual_##X,(N)) = vector(X,(N),-(INCX)).reverse(); \
|
|
||||||
else vector(actual_##X,(N)) = vector(X,(N), (INCX)); \
|
|
||||||
}
|
|
||||||
|
|
||||||
#define RELEASE_ACTUAL_VECTOR(X,INCX,N,COND) \
|
|
||||||
if(COND) { \
|
|
||||||
if((INCX)<0) vector(X,(N),-(INCX)).reverse() = vector(actual_##X,(N)); \
|
|
||||||
else vector(X,(N), (INCX)) = vector(actual_##X,(N)); \
|
|
||||||
delete[] actual_##X; \
|
|
||||||
}
|
|
||||||
|
|
||||||
int EIGEN_BLAS_FUNC(gemv)(char *opa, int *m, int *n, RealScalar *palpha, RealScalar *pa, int *lda, RealScalar *pb, int *incb, RealScalar *pbeta, RealScalar *pc, int *incc)
|
int EIGEN_BLAS_FUNC(gemv)(char *opa, int *m, int *n, RealScalar *palpha, RealScalar *pa, int *lda, RealScalar *pb, int *incb, RealScalar *pbeta, RealScalar *pc, int *incc)
|
||||||
{
|
{
|
||||||
typedef void (*functype)(int, int, const Scalar *, int, const Scalar *, int , Scalar *, int, Scalar);
|
typedef void (*functype)(int, int, const Scalar *, int, const Scalar *, int , Scalar *, int, Scalar);
|
||||||
@ -82,8 +67,8 @@ int EIGEN_BLAS_FUNC(gemv)(char *opa, int *m, int *n, RealScalar *palpha, RealSca
|
|||||||
if(OP(*opa)!=NOTR)
|
if(OP(*opa)!=NOTR)
|
||||||
std::swap(actual_m,actual_n);
|
std::swap(actual_m,actual_n);
|
||||||
|
|
||||||
MAKE_ACTUAL_VECTOR(b,*incb,actual_n,*incb!=1)
|
Scalar* actual_b = get_compact_vector(b,actual_n,*incb);
|
||||||
MAKE_ACTUAL_VECTOR(c,*incc,actual_m,*incc!=1)
|
Scalar* actual_c = get_compact_vector(c,actual_m,*incc);
|
||||||
|
|
||||||
if(beta!=Scalar(1))
|
if(beta!=Scalar(1))
|
||||||
vector(actual_c, actual_m, 1) *= beta;
|
vector(actual_c, actual_m, 1) *= beta;
|
||||||
@ -91,8 +76,8 @@ int EIGEN_BLAS_FUNC(gemv)(char *opa, int *m, int *n, RealScalar *palpha, RealSca
|
|||||||
int code = OP(*opa);
|
int code = OP(*opa);
|
||||||
func[code](actual_m, actual_n, a, *lda, actual_b, 1, actual_c, 1, alpha);
|
func[code](actual_m, actual_n, a, *lda, actual_b, 1, actual_c, 1, alpha);
|
||||||
|
|
||||||
RELEASE_ACTUAL_VECTOR(b,*incb,actual_n,*incb!=1)
|
if(actual_b!=b) delete[] actual_b;
|
||||||
RELEASE_ACTUAL_VECTOR(c,*incc,actual_m,*incc!=1)
|
if(actual_c!=c) delete[] copy_back(actual_c,c,actual_m,*incc);
|
||||||
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
@ -140,12 +125,12 @@ int EIGEN_BLAS_FUNC(trsv)(char *uplo, char *opa, char *diag, int *n, RealScalar
|
|||||||
if(info)
|
if(info)
|
||||||
return xerbla_(SCALAR_SUFFIX_UP"TRSV ",&info,6);
|
return xerbla_(SCALAR_SUFFIX_UP"TRSV ",&info,6);
|
||||||
|
|
||||||
MAKE_ACTUAL_VECTOR(b,*incb,*n,*incb!=1)
|
Scalar* actual_b = get_compact_vector(b,*n,*incb);
|
||||||
|
|
||||||
int code = OP(*opa) | (UPLO(*uplo) << 2) | (DIAG(*diag) << 3);
|
int code = OP(*opa) | (UPLO(*uplo) << 2) | (DIAG(*diag) << 3);
|
||||||
func[code](*n, a, *lda, actual_b);
|
func[code](*n, a, *lda, actual_b);
|
||||||
|
|
||||||
RELEASE_ACTUAL_VECTOR(b,*incb,*n,*incb!=1)
|
if(actual_b!=b) delete[] copy_back(actual_b,b,*n,*incb);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user