Merged eigen/eigen into default

This commit is contained in:
Rasmus Larsen 2016-04-27 12:27:00 -07:00
commit ff33798acd

View File

@ -385,7 +385,7 @@ int EIGEN_BLAS_FUNC(syrk)(const char *uplo, const char *op, const int *n, const
int info = 0; int info = 0;
if(UPLO(*uplo)==INVALID) info = 1; if(UPLO(*uplo)==INVALID) info = 1;
else if(OP(*op)==INVALID) info = 2; else if(OP(*op)==INVALID || (ISCOMPLEX && OP(*op)==ADJ) ) info = 2;
else if(*n<0) info = 3; else if(*n<0) info = 3;
else if(*k<0) info = 4; else if(*k<0) info = 4;
else if(*lda<std::max(1,(OP(*op)==NOTR)?*n:*k)) info = 7; else if(*lda<std::max(1,(OP(*op)==NOTR)?*n:*k)) info = 7;
@ -447,7 +447,7 @@ int EIGEN_BLAS_FUNC(syr2k)(const char *uplo, const char *op, const int *n, const
int info = 0; int info = 0;
if(UPLO(*uplo)==INVALID) info = 1; if(UPLO(*uplo)==INVALID) info = 1;
else if(OP(*op)==INVALID) info = 2; else if(OP(*op)==INVALID || (ISCOMPLEX && OP(*op)==ADJ) ) info = 2;
else if(*n<0) info = 3; else if(*n<0) info = 3;
else if(*k<0) info = 4; else if(*k<0) info = 4;
else if(*lda<std::max(1,(OP(*op)==NOTR)?*n:*k)) info = 7; else if(*lda<std::max(1,(OP(*op)==NOTR)?*n:*k)) info = 7;