GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-06-04 18:54:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixes related to ei_ -> internal change

Browse Source
This commit is contained in:
Gael Guennebaud 2010-11-04 08:38:16 +01:00
parent 62a51184d7
commit 20fcef9656
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
blas/level1_impl.h
View File

@ -55,16 +55,18 @@ RealScalar EIGEN_BLAS_FUNC(asum)(int *n, RealScalar *px, int *incx)
} }
#else #else
struct internal::scalar_norm1_op { struct scalar_norm1_op {
typedef RealScalar result_type; typedef RealScalar result_type;
EIGEN_EMPTY_STRUCT_CTOR(internal::scalar_norm1_op) 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 internal::norm1(a); }
}; };
namespace Eigen { namespace Eigen {
template<> struct internal::functor_traits<internal::scalar_norm1_op > namespace internal {
{ template<> struct functor_traits<scalar_norm1_op >
enum { Cost = 3 * NumTraits<Scalar>::AddCost, PacketAccess = 0 }; {
}; enum { Cost = 3 * NumTraits<Scalar>::AddCost, PacketAccess = 0 };
};
}
} }
RealScalar EIGEN_CAT(EIGEN_CAT(REAL_SCALAR_SUFFIX,SCALAR_SUFFIX),asum_)(int *n, RealScalar *px, int *incx) RealScalar EIGEN_CAT(EIGEN_CAT(REAL_SCALAR_SUFFIX,SCALAR_SUFFIX),asum_)(int *n, RealScalar *px, int *incx)
@ -75,8 +77,8 @@ RealScalar EIGEN_CAT(EIGEN_CAT(REAL_SCALAR_SUFFIX,SCALAR_SUFFIX),asum_)(int *n,
if(*n<=0) return 0; if(*n<=0) return 0;
if(*incx==1) return vector(x,*n).unaryExpr<internal::scalar_norm1_op>().sum(); if(*incx==1) return vector(x,*n).unaryExpr<scalar_norm1_op>().sum();
else return vector(x,*n,std::abs(*incx)).unaryExpr<internal::scalar_norm1_op>().sum(); else return vector(x,*n,std::abs(*incx)).unaryExpr<scalar_norm1_op>().sum();
} }
#endif #endif

2
blas/level3_impl.h
View File

@ -27,7 +27,7 @@
int EIGEN_BLAS_FUNC(gemm)(char *opa, char *opb, int *m, int *n, int *k, RealScalar *palpha, RealScalar *pa, int *lda, RealScalar *pb, int *ldb, RealScalar *pbeta, RealScalar *pc, int *ldc) int EIGEN_BLAS_FUNC(gemm)(char *opa, char *opb, int *m, int *n, int *k, RealScalar *palpha, RealScalar *pa, int *lda, RealScalar *pb, int *ldb, RealScalar *pbeta, RealScalar *pc, int *ldc)
{ {
// std::cerr << "in gemm " << *opa << " " << *opb << " " << *m << " " << *n << " " << *k << " " << *lda << " " << *ldb << " " << *ldc << " " << *palpha << " " << *pbeta << "\n"; // std::cerr << "in gemm " << *opa << " " << *opb << " " << *m << " " << *n << " " << *k << " " << *lda << " " << *ldb << " " << *ldc << " " << *palpha << " " << *pbeta << "\n";
typedef void (*functype)(DenseIndex, DenseIndex, DenseIndex, const Scalar *, DenseIndex, const Scalar *, DenseIndex, Scalar *, DenseIndex, Scalar, internal::level3_blocking<Scalar,Scalar>&, Eigen::GemmParallelInfo<DenseIndex>*); typedef void (*functype)(DenseIndex, DenseIndex, DenseIndex, const Scalar *, DenseIndex, const Scalar *, DenseIndex, Scalar *, DenseIndex, Scalar, internal::level3_blocking<Scalar,Scalar>&, Eigen::internal::GemmParallelInfo<DenseIndex>*);
static functype func[12]; static functype func[12];
static bool init = false; static bool init = false;