From f75419c711b3df73ca1e9b5af94db28d437a0698 Mon Sep 17 00:00:00 2001 From: Gael Guennebaud Date: Wed, 12 Jun 2013 17:56:15 +0200 Subject: Add missing changes. --- blas/PackedSelfadjointProduct.h | 5 ++--- blas/Rank2Update.h | 10 +++++----- blas/level1_cplx_impl.h | 2 +- blas/level1_impl.h | 4 ++-- blas/level3_impl.h | 14 +++++++------- 5 files changed, 17 insertions(+), 18 deletions(-) (limited to 'blas') diff --git a/blas/PackedSelfadjointProduct.h b/blas/PackedSelfadjointProduct.h index f7c9b9341..07327a246 100644 --- a/blas/PackedSelfadjointProduct.h +++ b/blas/PackedSelfadjointProduct.h @@ -30,10 +30,9 @@ struct selfadjoint_packed_rank1_update >(mat, UpLo==Lower ? size-i : (i+1)) - += alpha * cj(vec[i]) * ConjRhsType(OtherMap(vec+(UpLo==Lower ? i : 0), UpLo==Lower ? size-i : (i+1))); + Map >(mat, UpLo==Lower ? size-i : (i+1)) += alpha * cj(vec[i]) * ConjRhsType(OtherMap(vec+(UpLo==Lower ? i : 0), UpLo==Lower ? size-i : (i+1))); //FIXME This should be handled outside. - mat[UpLo==Lower ? 0 : i] = real(mat[UpLo==Lower ? 0 : i]); + mat[UpLo==Lower ? 0 : i] = numext::real(mat[UpLo==Lower ? 0 : i]); mat += UpLo==Lower ? size-i : (i+1); } } diff --git a/blas/Rank2Update.h b/blas/Rank2Update.h index 8e1a676ee..138d70fd6 100644 --- a/blas/Rank2Update.h +++ b/blas/Rank2Update.h @@ -24,8 +24,8 @@ struct rank2_update_selector for (Index i=0; i >(mat+stride*i+(UpLo==Lower ? i : 0), UpLo==Lower ? size-i : (i+1)) += - conj(alpha) * conj(u[i]) * OtherMap(v+(UpLo==Lower ? i : 0), UpLo==Lower ? size-i : (i+1)) - + alpha * conj(v[i]) * OtherMap(u+(UpLo==Lower ? i : 0), UpLo==Lower ? size-i : (i+1)); + numext::conj(alpha) * numext::conj(u[i]) * OtherMap(v+(UpLo==Lower ? i : 0), UpLo==Lower ? size-i : (i+1)) + + alpha * numext::conj(v[i]) * OtherMap(u+(UpLo==Lower ? i : 0), UpLo==Lower ? size-i : (i+1)); } } }; @@ -43,10 +43,10 @@ struct packed_rank2_update_selector for (Index i=0; i >(mat+offset, UpLo==Lower ? size-i : (i+1)) += - conj(alpha) * conj(u[i]) * OtherMap(v+(UpLo==Lower ? i : 0), UpLo==Lower ? size-i : (i+1)) - + alpha * conj(v[i]) * OtherMap(u+(UpLo==Lower ? i : 0), UpLo==Lower ? size-i : (i+1)); + numext::conj(alpha) * numext::conj(u[i]) * OtherMap(v+(UpLo==Lower ? i : 0), UpLo==Lower ? size-i : (i+1)) + + alpha * numext::conj(v[i]) * OtherMap(u+(UpLo==Lower ? i : 0), UpLo==Lower ? size-i : (i+1)); //FIXME This should be handled outside. - mat[offset+(UpLo==Lower ? 0 : i)] = real(mat[offset+(UpLo==Lower ? 0 : i)]); + mat[offset+(UpLo==Lower ? 0 : i)] = numext::real(mat[offset+(UpLo==Lower ? 0 : i)]); offset += UpLo==Lower ? size-i : (i+1); } } diff --git a/blas/level1_cplx_impl.h b/blas/level1_cplx_impl.h index 8d6b92829..283b9f827 100644 --- a/blas/level1_cplx_impl.h +++ b/blas/level1_cplx_impl.h @@ -12,7 +12,7 @@ struct scalar_norm1_op { typedef RealScalar result_type; EIGEN_EMPTY_STRUCT_CTOR(scalar_norm1_op) - inline RealScalar operator() (const Scalar& a) const { return internal::norm1(a); } + inline RealScalar operator() (const Scalar& a) const { return numext::norm1(a); } }; namespace Eigen { namespace internal { diff --git a/blas/level1_impl.h b/blas/level1_impl.h index c73f4d4f9..b08c2f6be 100644 --- a/blas/level1_impl.h +++ b/blas/level1_impl.h @@ -120,10 +120,10 @@ int EIGEN_BLAS_FUNC(rotg)(RealScalar *pa, RealScalar *pb, RealScalar *pc, RealSc else { scale = abs(a) + abs(b); - norm = scale*sqrt((internal::abs2(a/scale))+ (internal::abs2(b/scale))); + norm = scale*sqrt((numext::abs2(a/scale)) + (numext::abs2(b/scale))); alpha = a/abs(a); *c = abs(a)/norm; - *s = alpha*internal::conj(b)/norm; + *s = alpha*numext::conj(b)/norm; a = alpha*norm; } #endif diff --git a/blas/level3_impl.h b/blas/level3_impl.h index a57189f53..07dbc22ff 100644 --- a/blas/level3_impl.h +++ b/blas/level3_impl.h @@ -608,24 +608,24 @@ int EIGEN_BLAS_FUNC(her2k)(char *uplo, char *op, int *n, int *k, RealScalar *pal if(UPLO(*uplo)==UP) { matrix(c, *n, *n, *ldc).triangularView() - += alpha *matrix(a, *n, *k, *lda)*matrix(b, *n, *k, *ldb).adjoint() - + internal::conj(alpha)*matrix(b, *n, *k, *ldb)*matrix(a, *n, *k, *lda).adjoint(); + += alpha *matrix(a, *n, *k, *lda)*matrix(b, *n, *k, *ldb).adjoint() + + numext::conj(alpha)*matrix(b, *n, *k, *ldb)*matrix(a, *n, *k, *lda).adjoint(); } else if(UPLO(*uplo)==LO) matrix(c, *n, *n, *ldc).triangularView() += alpha*matrix(a, *n, *k, *lda)*matrix(b, *n, *k, *ldb).adjoint() - + internal::conj(alpha)*matrix(b, *n, *k, *ldb)*matrix(a, *n, *k, *lda).adjoint(); + + numext::conj(alpha)*matrix(b, *n, *k, *ldb)*matrix(a, *n, *k, *lda).adjoint(); } else if(OP(*op)==ADJ) { if(UPLO(*uplo)==UP) matrix(c, *n, *n, *ldc).triangularView() - += alpha*matrix(a, *k, *n, *lda).adjoint()*matrix(b, *k, *n, *ldb) - + internal::conj(alpha)*matrix(b, *k, *n, *ldb).adjoint()*matrix(a, *k, *n, *lda); + += alpha*matrix(a, *k, *n, *lda).adjoint()*matrix(b, *k, *n, *ldb) + + numext::conj(alpha)*matrix(b, *k, *n, *ldb).adjoint()*matrix(a, *k, *n, *lda); else if(UPLO(*uplo)==LO) matrix(c, *n, *n, *ldc).triangularView() - += alpha*matrix(a, *k, *n, *lda).adjoint()*matrix(b, *k, *n, *ldb) - + internal::conj(alpha)*matrix(b, *k, *n, *ldb).adjoint()*matrix(a, *k, *n, *lda); + += alpha*matrix(a, *k, *n, *lda).adjoint()*matrix(b, *k, *n, *ldb) + + numext::conj(alpha)*matrix(b, *k, *n, *ldb).adjoint()*matrix(a, *k, *n, *lda); } return 1; -- cgit v1.2.3