Subject: [Boost-commit] svn:boost r59046 - sandbox/numeric_bindings/libs/numeric/bindings/atlas
From: rutger_at_[hidden]
Date: 2010-01-15 09:37:40
Author: rutger
Date: 2010-01-15 09:37:40 EST (Fri, 15 Jan 2010)
New Revision: 59046
URL: http://svn.boost.org/trac/boost/changeset/59046
Log:
ublas_cmatr2ger now passes regression (should use gerc, not ger in case of complex (and direct blas calls))
Text files modified:
sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_cmatr2ger.cc | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
Modified: sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_cmatr2ger.cc
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_cmatr2ger.cc (original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_cmatr2ger.cc 2010-01-15 09:37:40 EST (Fri, 15 Jan 2010)
@@ -6,18 +6,18 @@
#include <iostream>
#include <complex>
-#include <boost/numeric/bindings/atlas/cblas1.hpp>
-#include <boost/numeric/bindings/atlas/cblas2.hpp>
-#include <boost/numeric/bindings/traits/ublas_vector.hpp>
-#include <boost/numeric/bindings/traits/ublas_matrix.hpp>
+#include <boost/numeric/bindings/blas/level1.hpp>
+#include <boost/numeric/bindings/blas/level2.hpp>
+#include <boost/numeric/bindings/ublas/vector.hpp>
+#include <boost/numeric/bindings/ublas/matrix.hpp>
#ifdef F_USE_STD_VECTOR
#include <vector>
-#include <boost/numeric/bindings/traits/std_vector.hpp>
+#include <boost/numeric/bindings/std/vector.hpp>
#endif
#include "utils.h"
namespace ublas = boost::numeric::ublas;
-namespace atlas = boost::numeric::bindings::atlas;
+namespace blas = boost::numeric::bindings::blas;
using std::cout;
using std::endl;
@@ -40,8 +40,8 @@
vct_t vx (2);
vct_t vy (4); // vector size can be larger
// than corresponding matrix size
- atlas::set (cmplx_t (1., 0.), vx);
- atlas::set (cmplx_t (0., 2.), vy);
+ blas::set (cmplx_t (1., 0.), vx);
+ blas::set (cmplx_t (0., 2.), vy);
print_v (vx, "vx");
cout << endl;
print_v (vy, "vy");
@@ -53,7 +53,7 @@
cout << endl;
// m += x y^T
- atlas::ger (vx, vy, m); // bindings extension
+ blas::gerc (1.0, vx, vy, m); // bindings extension
print_m (m, "m += x y^T");
cout << endl << endl;
@@ -62,7 +62,7 @@
cout << endl;
// m += x y^T
- atlas::geru (vx, vy, m);
+ blas::geru ( 1.0+0.0i, vx, vy, m);
print_m (m, "m += x y^T");
cout << endl << endl;
@@ -76,7 +76,7 @@
cout << endl;
// m += 2 x y^T
- atlas::geru (cmplx_t (2., 0.), vx, vy, m);
+ blas::geru (cmplx_t (2., 0.), vx, vy, m);
print_m (m, "m += 2 x y^T");
cout << endl << endl;
@@ -90,7 +90,7 @@
cout << endl;
// m += x y^H
- atlas::gerc (cmplx_t (1., 0.), vx, vy, m); // bindings extension
+ blas::gerc (cmplx_t (1., 0.), vx, vy, m); // bindings extension
print_m (m, "m += x y^H");
cout << endl << endl;