diff options
| author |   spiros <andyspiros@gmail.com> | 2011-06-15 19:53:55 +0200 |
|---|---|---|
| committer | spiros <andyspiros@gmail.com> | 2011-06-15 19:53:55 +0200 |
| commit | acf8d6ff64ae1b2dd7e5e1f3940a03086aa81065 (patch) | |
| tree | 906ad212f4da9796c70e18d1398580c1175c225f /btl | |
| parent | Introduced LAPACK, cleanup of btlbase (former blasbase). Some changes (diff) | |
| download | auto-numerical-bench-acf8d6ff64ae1b2dd7e5e1f3940a03086aa81065.tar.gz auto-numerical-bench-acf8d6ff64ae1b2dd7e5e1f3940a03086aa81065.tar.bz2 auto-numerical-bench-acf8d6ff64ae1b2dd7e5e1f3940a03086aa81065.zip | |
Bugfix. Script now is directory-independent.
Diffstat (limited to 'btl')
| -rw-r--r-- | btl/actions/action_lu_decomp.hh | 2 | ||||
| -rw-r--r-- | btl/libs/LAPACK/lapack_interface_impl.hh | 24 |
2 files changed, 13 insertions, 13 deletions
diff --git a/btl/actions/action_lu_decomp.hh b/btl/actions/action_lu_decomp.hh index 2448e82..18e9939 100644 --- a/btl/actions/action_lu_decomp.hh +++ b/btl/actions/action_lu_decomp.hh @@ -76,7 +76,7 @@ public : static inline std::string name( void ) { - return "complete_lu_decomp_"+Interface::name(); + return "lu_decomp_"+Interface::name(); } double nb_op_base( void ){ diff --git a/btl/libs/LAPACK/lapack_interface_impl.hh b/btl/libs/LAPACK/lapack_interface_impl.hh index 18ce305..a2bd299 100644 --- a/btl/libs/LAPACK/lapack_interface_impl.hh +++ b/btl/libs/LAPACK/lapack_interface_impl.hh @@ -1,4 +1,4 @@ -#define LPF(NAME) CAT(CAT(SCALAR_PREFIX,NAME),_) +#define LAPACKFUNC(NAME) CAT(CAT(SCALAR_PREFIX,NAME),_) template<> class lapack_interface<SCALAR> : public c_interface_base<SCALAR> { @@ -13,8 +13,8 @@ public: { int *ipiv = new int[N]; int info; - LPF(copy)(&N, b, &intone, x, &intone); - LPF(gesv)(&N, &intone, A, &N, ipiv, x, &N, &info); + LAPACKFUNC(copy)(&N, b, &intone, x, &intone); + LAPACKFUNC(gesv)(&N, &intone, A, &N, ipiv, x, &N, &info); delete[] ipiv; } @@ -22,13 +22,13 @@ public: { int *ipiv = new int[N]; int info; - LPF(copy)(&N, b, &intone, x, &intone); + LAPACKFUNC(copy)(&N, b, &intone, x, &intone); SCALAR work1; int MONE = -1; - LPF(gels)(¬rans, &N, &N, &intone, A, &N, x, &N, &work1, &MONE, &info); + LAPACKFUNC(gels)(¬rans, &N, &N, &intone, A, &N, x, &N, &work1, &MONE, &info); int lwork = (int)work1; SCALAR *work2 = new SCALAR[lwork]; - LPF(gels)(¬rans, &N, &N, &intone, A, &N, x, &N, work2, &lwork, &info); + LAPACKFUNC(gels)(¬rans, &N, &N, &intone, A, &N, x, &N, work2, &lwork, &info); delete[] work2; delete[] ipiv; } @@ -38,8 +38,8 @@ public: int N2 = N*N; int *ipiv = new int[N]; int info; - LPF(copy)(&N2, X, &intone, C, &intone); - LPF(getrf)(&N, &N, C, &N, ipiv, &info); + LAPACKFUNC(copy)(&N2, X, &intone, C, &intone); + LAPACKFUNC(getrf)(&N, &N, C, &N, ipiv, &info); delete[] ipiv; } @@ -47,8 +47,8 @@ public: { int N2 = N*N; int info; - LPF(copy)(&N2, X, &intone, C, &intone); - LPF(potrf)(&lower, &N, C, &N, &info); + LAPACKFUNC(copy)(&N2, X, &intone, C, &intone); + LAPACKFUNC(potrf)(&lower, &N, C, &N, &info); } static inline void symm_ev(const gene_matrix& X, gene_vector& W, int N) @@ -56,11 +56,11 @@ public: char jobz = 'N'; SCALAR *work = new SCALAR; int lwork = -1, info; - LPF(syev)(&jobz, &lower, &N, X, &N, W, work, &lwork, &info); + LAPACKFUNC(syev)(&jobz, &lower, &N, X, &N, W, work, &lwork, &info); lwork = *work; delete work; work = new SCALAR[lwork]; - LPF(syev)(&jobz, &lower, &N, X, &N, W, work, &lwork, &info); + LAPACKFUNC(syev)(&jobz, &lower, &N, X, &N, W, work, &lwork, &info); delete[] work; } |