12345qiupeng
/
gtsam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added mechanism to check for blas functionality.

release/4.3a0
Alex Cunningham 2010-03-16 13:06:24 +00:00
parent ae98bb72fe
commit 276c027ef3
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cpp/Matrix.cpp
View File

@ -154,6 +154,10 @@ bool assert_equal(const std::list<Matrix>& As, const std::list<Matrix>& Bs, doub
/* ************************************************************************* */ /* ************************************************************************* */
void multiplyAdd(double alpha, const Matrix& A, const Vector& x, Vector& e) { void multiplyAdd(double alpha, const Matrix& A, const Vector& x, Vector& e) {
#if defined CBLAS #if defined CBLAS
// uncomment and run tests to verify blas is enabled
// throw runtime_error("You are in multiplyAdd!");
// get sizes // get sizes
const size_t m = A.size1(), n = A.size2(); const size_t m = A.size1(), n = A.size2();
@ -519,9 +523,11 @@ void householder_update(Matrix &A, int j, double beta, const Vector& vjm) {
// cblas_dger(CblasRowMajor, mj, n, 1.0, vptr, 1, wptr, 1, Aptr, n); // not correct // cblas_dger(CblasRowMajor, mj, n, 1.0, vptr, 1, wptr, 1, Aptr, n); // not correct
// //
// // Execute second step using alternate code // // Execute second step using alternate code
// // rank 1 update A(j:m,:) -= v(j:m)*w'
// for( size_t c = 0 ; c < n; c++) { // for( size_t c = 0 ; c < n; c++) {
// double wc = aw(c); // double wc = aw(c);
// double *a = &aA(j,c); const double * const v =&avjm(0); // double *a = &aA(j,c);
// const double * const v =&avjm(0);
// for( size_t r=j, s=0 ; r < m ; r++, s++, a+=n ) // for( size_t r=j, s=0 ; r < m ; r++, s++, a+=n )
// // A(r,c) -= vjm(r-j) * wjn(c-j); // // A(r,c) -= vjm(r-j) * wjn(c-j);
// (*a) -= v[s] * wc; // (*a) -= v[s] * wc;