|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r60735 - in sandbox/numeric_bindings: boost/numeric/bindings/traits libs/numeric/bindings/atlas
From: thomas.klimpel_at_[hidden]
Date: 2010-03-20 10:18:09
Author: klimpel
Date: 2010-03-20 10:18:06 EDT (Sat, 20 Mar 2010)
New Revision: 60735
URL: http://svn.boost.org/trac/boost/changeset/60735
Log:
removed BOOST_NUMERIC_BINDINGS_POOR_MANS_TRAITS
Removed:
sandbox/numeric_bindings/boost/numeric/bindings/traits/config.hpp
Text files modified:
sandbox/numeric_bindings/boost/numeric/bindings/traits/type_traits.hpp | 5 -----
sandbox/numeric_bindings/libs/numeric/bindings/atlas/tnt_gesv.cc | 1 -
sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_cmatr2ger.cc | 1 -
sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_cmatr3.cc | 1 -
sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_cvct.cc | 7 -------
sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_gesv.cc | 1 -
sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_gesv2.cc | 1 -
sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_gesv3.cc | 1 -
sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_gesv5.cc | 4 ----
sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_getrf_getrs.cc | 1 -
sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_getri.cc | 1 -
sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_herm3.cc | 8 --------
sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_matr1.cc | 1 -
sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_matr2.cc | 1 -
sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_matr22.cc | 1 -
sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_matr2_bench.cc | 5 -----
sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_matr2ger.cc | 1 -
sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_matr3.cc | 1 -
sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_posv.cc | 5 -----
sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_potrf_potrs.cc | 5 -----
sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_potri.cc | 21 ---------------------
sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_symm2.cc | 1 -
sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_symm2syr.cc | 1 -
sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_symm3.cc | 8 --------
sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_symm32.cc | 1 -
sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_symm33.cc | 1 -
sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_symmc3.cc | 8 --------
sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_vct.cc | 1 -
sandbox/numeric_bindings/libs/numeric/bindings/atlas/utils.h | 36 ------------------------------------
29 files changed, 0 insertions(+), 130 deletions(-)
Deleted: sandbox/numeric_bindings/boost/numeric/bindings/traits/config.hpp
==============================================================================
--- sandbox/numeric_bindings/boost/numeric/bindings/traits/config.hpp 2010-03-20 10:18:06 EDT (Sat, 20 Mar 2010)
+++ (empty file)
@@ -1,52 +0,0 @@
-//
-// Copyright (c) 2002-2003
-// Toon Knapen, Kresimir Fresl, Joerg Walter
-//
-// Distributed under the Boost Software License, Version 1.0.
-// (See accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//
-
-#ifndef BOOST_NUMERIC_BINDINGS_CONFIG_HPP
-#define BOOST_NUMERIC_BINDINGS_CONFIG_HPP
-
-#include <boost/config.hpp>
-
-// Microsoft Visual C++
-#if defined (BOOST_MSVC)
-// .. version 6.0 & 7.0
-# if BOOST_MSVC <= 1300
-# define BOOST_NUMERIC_BINDINGS_POOR_MANS_TRAITS
-# endif
-
-#elif defined(__INTEL_COMPILER) || defined(__ICL) || defined(__ICC) || defined(__ECC)
-
-#elif defined(__IBMCPP__)
-
-#elif defined(__GNUC__)
-
-#elif defined(__COMO__)
-
-#elif defined(__KCC)
-
-#elif defined(__sgi)
-
-#else
-// temporarily deactivate error message,
-// because the checks above are no longer in sync with "boost/config/select_compiler_config.hpp"
-//#error bindings do not recognise compiler
-#endif
-
-
-#if defined (BOOST_NUMERIC_BINDINGS_POOR_MANS_TRAITS)
-
-// structure checks require proper traits
-# define BOOST_NUMERIC_BINDINGS_NO_STRUCTURE_CHECK
-
-// type checks require proper traits
-# define BOOST_NUMERIC_BINDINGS_NO_TYPE_CHECK
-
-#endif
-
-#endif
-
Modified: sandbox/numeric_bindings/boost/numeric/bindings/traits/type_traits.hpp
==============================================================================
--- sandbox/numeric_bindings/boost/numeric/bindings/traits/type_traits.hpp (original)
+++ sandbox/numeric_bindings/boost/numeric/bindings/traits/type_traits.hpp 2010-03-20 10:18:06 EDT (Sat, 20 Mar 2010)
@@ -14,7 +14,6 @@
#ifndef BOOST_NUMERIC_BINDINGS_TRAITS_TYPE_TRAITS_HPP
#define BOOST_NUMERIC_BINDINGS_TRAITS_TYPE_TRAITS_HPP
-#include <boost/numeric/bindings/traits/config.hpp>
#include <boost/numeric/bindings/traits/type.h>
#include <boost/numeric/bindings/traits/type.hpp>
@@ -22,10 +21,6 @@
template <typename Real>
struct type_traits {
-#ifdef BOOST_NUMERIC_BINDINGS_POOR_MANS_TRAITS
- typedef Real type;
- typedef Real real_type;
-#endif
};
template<>
struct type_traits<float> {
Modified: sandbox/numeric_bindings/libs/numeric/bindings/atlas/tnt_gesv.cc
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/atlas/tnt_gesv.cc (original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/atlas/tnt_gesv.cc 2010-03-20 10:18:06 EDT (Sat, 20 Mar 2010)
@@ -2,7 +2,6 @@
// solving A * X = B
// using driver function gesv()
-//#define BOOST_NUMERIC_BINDINGS_POOR_MANS_TRAITS
//#define BOOST_NO_FUNCTION_TEMPLATE_ORDERING
#include <cstddef>
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-03-20 10:18:06 EDT (Sat, 20 Mar 2010)
@@ -1,7 +1,6 @@
// BLAS level 2 -- complex numbers
-//#define BOOST_NUMERIC_BINDINGS_POOR_MANS_TRAITS
//#define BOOST_NO_FUNCTION_TEMPLATE_ORDERING
#include <iostream>
Modified: sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_cmatr3.cc
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_cmatr3.cc (original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_cmatr3.cc 2010-03-20 10:18:06 EDT (Sat, 20 Mar 2010)
@@ -1,7 +1,6 @@
// BLAS level 3 -- complex numbers
-//#define BOOST_NUMERIC_BINDINGS_POOR_MANS_TRAITS
//#define BOOST_NO_FUNCTION_TEMPLATE_ORDERING
#include <iostream>
Modified: sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_cvct.cc
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_cvct.cc (original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_cvct.cc 2010-03-20 10:18:06 EDT (Sat, 20 Mar 2010)
@@ -5,7 +5,6 @@
#include <cmath>
#include <complex>
-//#define BOOST_NUMERIC_BINDINGS_POOR_MANS_TRAITS
//#define BOOST_NO_FUNCTION_TEMPLATE_ORDERING
#include <boost/numeric/bindings/ublas/vector.hpp>
@@ -22,12 +21,6 @@
typedef std::complex<real_t> cmplx_t;
typedef ublas::vector<cmplx_t> vct_t;
-#ifdef BOOST_NUMERIC_BINDINGS_POOR_MANS_TRAITS
-using ublas::inner_prod;
-using ublas::norm_2;
-using ublas::conj;
-#endif
-
int main() {
int n = 6;
Modified: sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_gesv.cc
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_gesv.cc (original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_gesv.cc 2010-03-20 10:18:06 EDT (Sat, 20 Mar 2010)
@@ -2,7 +2,6 @@
// solving A * X = B
// using driver function gesv()
-//#define BOOST_NUMERIC_BINDINGS_POOR_MANS_TRAITS
//#define BOOST_NO_FUNCTION_TEMPLATE_ORDERING
#include <cstddef>
Modified: sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_gesv2.cc
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_gesv2.cc (original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_gesv2.cc 2010-03-20 10:18:06 EDT (Sat, 20 Mar 2010)
@@ -2,7 +2,6 @@
// solving A * X = B
// using driver function gesv()
-//#define BOOST_NUMERIC_BINDINGS_POOR_MANS_TRAITS
//#define BOOST_NO_FUNCTION_TEMPLATE_ORDERING
#include <cstddef>
Modified: sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_gesv3.cc
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_gesv3.cc (original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_gesv3.cc 2010-03-20 10:18:06 EDT (Sat, 20 Mar 2010)
@@ -2,7 +2,6 @@
// solving A * X = B
// using driver function gesv()
-//#define BOOST_NUMERIC_BINDINGS_POOR_MANS_TRAITS
//#define BOOST_NO_FUNCTION_TEMPLATE_ORDERING
#include <cstddef>
Modified: sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_gesv5.cc
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_gesv5.cc (original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_gesv5.cc 2010-03-20 10:18:06 EDT (Sat, 20 Mar 2010)
@@ -55,12 +55,10 @@
b(0,1) = 9.; b(1,1) = 11.;
b(0,2) = -2.; b(1,2) = 12.;
-#ifndef BOOST_NUMERIC_BINDINGS_POOR_MANS_TRAITS
m3x3_t a2; // for part 2
a2 = project (a, ublas::range (0,3), ublas::range (0,3));
v5_t b2 (n);
b2 = row (b, 0);
-#endif
// part 1:
cout << "A: " << a << endl;
@@ -77,7 +75,6 @@
cout << endl;
-#ifndef BOOST_NUMERIC_BINDINGS_POOR_MANS_TRAITS
// part 2:
cout << "A: " << a2 << endl;
cout << "B: " << b2 << endl;
@@ -87,6 +84,5 @@
cout << "X: " << b2 << endl;
cout << endl;
-#endif
}
Modified: sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_getrf_getrs.cc
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_getrf_getrs.cc (original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_getrf_getrs.cc 2010-03-20 10:18:06 EDT (Sat, 20 Mar 2010)
@@ -2,7 +2,6 @@
// solving A * X = B
// in two steps -- factor (getrf()) and solve (getrs())
-//#define BOOST_NUMERIC_BINDINGS_POOR_MANS_TRAITS
//#define BOOST_NO_FUNCTION_TEMPLATE_ORDERING
#include <cstddef>
Modified: sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_getri.cc
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_getri.cc (original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_getri.cc 2010-03-20 10:18:06 EDT (Sat, 20 Mar 2010)
@@ -2,7 +2,6 @@
// inverting A
// using getrf() & getri()
-//#define BOOST_NUMERIC_BINDINGS_POOR_MANS_TRAITS
//#define BOOST_NO_FUNCTION_TEMPLATE_ORDERING
#include <cstddef>
Modified: sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_herm3.cc
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_herm3.cc (original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_herm3.cc 2010-03-20 10:18:06 EDT (Sat, 20 Mar 2010)
@@ -31,8 +31,6 @@
typedef ublas::hermitian_adaptor<rm_t, ublas::lower> lrhemm_t;
int main() {
-
-#ifndef BOOST_NUMERIC_BINDINGS_POOR_MANS_TRAITS
cout << endl;
@@ -135,10 +133,4 @@
cout << endl;
-#else // BOOST_NUMERIC_BINDINGS_POOR_MANS_TRAITS
-
- cout << "requires proper traits classes :o(" << endl;
-
-#endif // BOOST_NUMERIC_BINDINGS_POOR_MANS_TRAITS
-
}
Modified: sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_matr1.cc
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_matr1.cc (original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_matr1.cc 2010-03-20 10:18:06 EDT (Sat, 20 Mar 2010)
@@ -1,7 +1,6 @@
// BLAS level 1 (matrix rows and columns)
-//#define BOOST_NUMERIC_BINDINGS_POOR_MANS_TRAITS
//#define BOOST_NO_FUNCTION_TEMPLATE_ORDERING
#include <iostream>
Modified: sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_matr2.cc
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_matr2.cc (original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_matr2.cc 2010-03-20 10:18:06 EDT (Sat, 20 Mar 2010)
@@ -1,7 +1,6 @@
// BLAS level 2
-//#define BOOST_NUMERIC_BINDINGS_POOR_MANS_TRAITS
//#define BOOST_NO_FUNCTION_TEMPLATE_ORDERING
#include <iostream>
Modified: sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_matr22.cc
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_matr22.cc (original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_matr22.cc 2010-03-20 10:18:06 EDT (Sat, 20 Mar 2010)
@@ -1,7 +1,6 @@
// BLAS level 2
-//#define BOOST_NUMERIC_BINDINGS_POOR_MANS_TRAITS
//#define BOOST_NO_FUNCTION_TEMPLATE_ORDERING
#include <iostream>
Modified: sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_matr2_bench.cc
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_matr2_bench.cc (original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_matr2_bench.cc 2010-03-20 10:18:06 EDT (Sat, 20 Mar 2010)
@@ -2,7 +2,6 @@
// BLAS level 2
// benchmarks
-//#define BOOST_NUMERIC_BINDINGS_POOR_MANS_TRAITS
//#define BOOST_NO_FUNCTION_TEMPLATE_ORDERING
//#define USE_STD_VECTOR
@@ -71,10 +70,6 @@
real_t, ublas::lower, ublas::row_major
> lrsymm_t;
-#ifdef BOOST_NUMERIC_BINDINGS_POOR_MANS_TRAITS
-using ublas::prod;
-#endif
-
////////////////////////////////////////////////////
// general matrix: gemv()
Modified: sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_matr2ger.cc
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_matr2ger.cc (original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_matr2ger.cc 2010-03-20 10:18:06 EDT (Sat, 20 Mar 2010)
@@ -1,7 +1,6 @@
// BLAS level 2
-//#define BOOST_NUMERIC_BINDINGS_POOR_MANS_TRAITS
//#define BOOST_NO_FUNCTION_TEMPLATE_ORDERING
#include <iostream>
Modified: sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_matr3.cc
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_matr3.cc (original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_matr3.cc 2010-03-20 10:18:06 EDT (Sat, 20 Mar 2010)
@@ -3,7 +3,6 @@
//#define F_USE_STD_VECTOR
-//#define BOOST_NUMERIC_BINDINGS_POOR_MANS_TRAITS
//#define BOOST_NO_FUNCTION_TEMPLATE_ORDERING
#include <iostream>
Modified: sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_posv.cc
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_posv.cc (original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_posv.cc 2010-03-20 10:18:06 EDT (Sat, 20 Mar 2010)
@@ -6,7 +6,6 @@
// #define BOOST_UBLAS_STRICT_HERMITIAN
// .. doesn't work (yet?)
-//#define BOOST_NUMERIC_BINDINGS_POOR_MANS_TRAITS
//#define BOOST_NO_FUNCTION_TEMPLATE_ORDERING
#include <cstddef>
@@ -94,12 +93,8 @@
blas::set (1., xc0); // x[.,0] = 1
blas::set (2., xc1); // x[.,1] = 2
#ifndef F_ROW_MAJOR
-#ifndef BOOST_NUMERIC_BINDINGS_POOR_MANS_TRAITS
blas::symm ( tag::left(), 1.0, sa, x, 0.0, b); // b = a x, so we know the result ;o)
#else
- blas::symm (CblasLeft, 1.0, sa, x, 0.0, b);
-#endif
-#else
// see leading comments for `gesv()' in clapack.hpp
ublas::matrix_row<m_t> br0 (b, 0), br1 (b, 1);
blas::symv (sa, xc0, br0); // b[0,.] = a x[.,0]
Modified: sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_potrf_potrs.cc
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_potrf_potrs.cc (original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_potrf_potrs.cc 2010-03-20 10:18:06 EDT (Sat, 20 Mar 2010)
@@ -6,7 +6,6 @@
// #define BOOST_UBLAS_STRICT_HERMITIAN
// .. doesn't work (yet?)
-//#define BOOST_NUMERIC_BINDINGS_POOR_MANS_TRAITS
//#define BOOST_NO_FUNCTION_TEMPLATE_ORDERING
#include <cstddef>
@@ -78,12 +77,8 @@
blas::set (1., xc0);
blas::set (2., xc1);
#ifndef F_ROW_MAJOR
-#ifndef BOOST_NUMERIC_BINDINGS_POOR_MANS_TRAITS
blas::symm ( bindings::tag::left(), 1.0, sa, x, 0.0, b);
#else
- blas::symm ( bindings::tag::left(), 1.0, sa, x, 0.0, b);
-#endif
-#else
ublas::matrix_row<m_t> br0 (b, 0), br1 (b, 1);
blas::symv (sa, xc0, br0);
blas::symv (sa, xc1, br1);
Modified: sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_potri.cc
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_potri.cc (original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_potri.cc 2010-03-20 10:18:06 EDT (Sat, 20 Mar 2010)
@@ -5,7 +5,6 @@
// #define BOOST_UBLAS_STRICT_HERMITIAN
// .. doesn't work (yet?)
-//#define BOOST_NUMERIC_BINDINGS_POOR_MANS_TRAITS
//#define BOOST_NO_FUNCTION_TEMPLATE_ORDERING
#include <cstddef>
@@ -87,18 +86,10 @@
lapack::potri (sa);
// ri should be (almost) identity matrix:
m_t ri (n, n);
-#ifndef BOOST_NUMERIC_BINDINGS_POOR_MANS_TRAITS
blas::symm ( bindings::tag::right(), 1.0, sa, a2, 0.0, ri);
-#else
- blas::symm (bindings::tag::right(), 1.0, sa, a2, 0.0, ri);
-#endif
print_m (ri, "I = A * A^(-1)");
cout << endl;
-#ifndef BOOST_NUMERIC_BINDINGS_POOR_MANS_TRAITS
blas::symm ( bindings::tag::left(), 1.0, sa, a2, 0.0, ri);
-#else
- blas::symm (CblasLeft, 1.0, sa, a2, 0.0, ri);
-#endif
print_m (ri, "I = A^(-1) * A");
cout << endl;
}
@@ -135,11 +126,7 @@
if (ierr == 0) {
lapack::potri (ha); // potri()
cm_t ic (3, 3);
-#ifndef BOOST_NUMERIC_BINDINGS_POOR_MANS_TRAITS
blas::hemm ( bindings::tag::right(), 1.0, ha, ca2, 0.0, ic);
-#else
- blas::hemm (CblasRight, 1.0, ha, ca2, 0.0, ic);
-#endif
print_m (ic, "I = A * A^(-1)");
cout << endl;
}
@@ -175,18 +162,10 @@
if (ierr == 0) {
lapack::potri (ha);
cm_t ic (3, 3);
-#ifndef BOOST_NUMERIC_BINDINGS_POOR_MANS_TRAITS
blas::hemm ( bindings::tag::right(), 1.0, ha, ca2, 0.0, ic);
-#else
- blas::hemm (CblasRight, 1.0, ha, ca2, 0.0, ic);
-#endif
print_m (ic, "I = A * A^(-1)");
cout << endl;
-#ifndef BOOST_NUMERIC_BINDINGS_POOR_MANS_TRAITS
blas::hemm ( bindings::tag::left(), 1.0, ha, ca2, 0.0, ic);
-#else
- blas::hemm (CblasLeft, 1.0, ha, ca2, 0.0, ic);
-#endif
print_m (ic, "I = A^(-1) * A");
cout << endl;
}
Modified: sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_symm2.cc
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_symm2.cc (original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_symm2.cc 2010-03-20 10:18:06 EDT (Sat, 20 Mar 2010)
@@ -2,7 +2,6 @@
// BLAS level 2
// symmetric & hermitian matrices
-//#define BOOST_NUMERIC_BINDINGS_POOR_MANS_TRAITS
//#define BOOST_NO_FUNCTION_TEMPLATE_ORDERING
#include <stddef.h>
Modified: sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_symm2syr.cc
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_symm2syr.cc (original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_symm2syr.cc 2010-03-20 10:18:06 EDT (Sat, 20 Mar 2010)
@@ -2,7 +2,6 @@
// BLAS level 2
// symmetric matrices
-//#define BOOST_NUMERIC_BINDINGS_POOR_MANS_TRAITS
//#define BOOST_NO_FUNCTION_TEMPLATE_ORDERING
#include <stddef.h>
Modified: sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_symm3.cc
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_symm3.cc (original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_symm3.cc 2010-03-20 10:18:06 EDT (Sat, 20 Mar 2010)
@@ -30,8 +30,6 @@
int main() {
-#ifndef BOOST_NUMERIC_BINDINGS_POOR_MANS_TRAITS
-
cout << endl;
size_t n;
@@ -133,10 +131,4 @@
cout << endl;
-#else // BOOST_NUMERIC_BINDINGS_POOR_MANS_TRAITS
-
- cout << "requires proper traits classes :o(" << endl;
-
-#endif // BOOST_NUMERIC_BINDINGS_POOR_MANS_TRAITS
-
}
Modified: sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_symm32.cc
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_symm32.cc (original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_symm32.cc 2010-03-20 10:18:06 EDT (Sat, 20 Mar 2010)
@@ -2,7 +2,6 @@
// BLAS level 3
// symmetric matrix (with adaptor)
-//#define BOOST_NUMERIC_BINDINGS_POOR_MANS_TRAITS
//#define BOOST_NO_FUNCTION_TEMPLATE_ORDERING
#include <stddef.h>
Modified: sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_symm33.cc
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_symm33.cc (original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_symm33.cc 2010-03-20 10:18:06 EDT (Sat, 20 Mar 2010)
@@ -2,7 +2,6 @@
// BLAS level 3
// symmetric matrix (without adaptor)
-//#define BOOST_NUMERIC_BINDINGS_POOR_MANS_TRAITS
//#define BOOST_NO_FUNCTION_TEMPLATE_ORDERING
#include <stddef.h>
Modified: sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_symmc3.cc
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_symmc3.cc (original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_symmc3.cc 2010-03-20 10:18:06 EDT (Sat, 20 Mar 2010)
@@ -32,8 +32,6 @@
int main() {
-#ifndef BOOST_NUMERIC_BINDINGS_POOR_MANS_TRAITS
-
cout << endl;
size_t n;
@@ -135,10 +133,4 @@
cout << endl;
-#else // BOOST_NUMERIC_BINDINGS_POOR_MANS_TRAITS
-
- cout << "requires proper traits classes :o(" << endl;
-
-#endif // BOOST_NUMERIC_BINDINGS_POOR_MANS_TRAITS
-
}
Modified: sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_vct.cc
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_vct.cc (original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_vct.cc 2010-03-20 10:18:06 EDT (Sat, 20 Mar 2010)
@@ -1,7 +1,6 @@
// BLAS level 1 (vectors)
-//#define BOOST_NUMERIC_BINDINGS_POOR_MANS_TRAITS
//#define BOOST_NO_FUNCTION_TEMPLATE_ORDERING
#include <iostream>
Modified: sandbox/numeric_bindings/libs/numeric/bindings/atlas/utils.h
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/atlas/utils.h (original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/atlas/utils.h 2010-03-20 10:18:06 EDT (Sat, 20 Mar 2010)
@@ -15,7 +15,6 @@
///////////////////////////////
// vectors
-#ifndef BOOST_NUMERIC_BINDINGS_POOR_MANS_TRAITS
// element access:
template <typename V>
struct vct_access_traits {
@@ -45,7 +44,6 @@
typename vct_access_traits<V>::ref_t elem_v (V& v, size_t i) {
return vct_access_traits<V>::elem (v, i);
}
-#endif
// initialization:
struct ident {
@@ -91,11 +89,7 @@
void init_v (V& v, F f = F()) {
size_t sz = bindings::size (v);
for (std::size_t i = 0; i < sz; ++i) {
-#ifndef BOOST_NUMERIC_BINDINGS_POOR_MANS_TRAITS
elem_v (v, i) = f (i);
-#else
- v[i] = f (i);
-#endif
}
}
@@ -106,11 +100,7 @@
std::cout << ch << ": ";
size_t sz = bindings::size (v);
for (std::size_t i = 0; i < sz; ++i) {
-#ifndef BOOST_NUMERIC_BINDINGS_POOR_MANS_TRAITS
std::cout << elem_v (v, i) << " ";
-#else
- std::cout << v[i] << " ";
-#endif
}
std::cout << std::endl;
}
@@ -119,7 +109,6 @@
/////////////////////////////////////
// matrices
-#ifndef BOOST_NUMERIC_BINDINGS_POOR_MANS_TRAITS
// element access:
/*template <typename M>
struct matr_access_traits {
@@ -141,7 +130,6 @@
typename matr_access_traits<M>::ref_t bindings::at(M& m, size_t i, size_t j) {
return matr_access_traits<M>::elem (m, i, j);
}*/
-#endif
// initialization:
struct rws {
@@ -163,11 +151,7 @@
size_t sz2 = bindings::size2 (m);
for (std::size_t i = 0; i < sz1; ++i)
for (std::size_t j = 0; j < sz2; ++j) {
-#ifndef BOOST_NUMERIC_BINDINGS_POOR_MANS_TRAITS
bindings::at( m, i, j ) = f (i, j);
-#else
- m(i,j) = f (i, j);
-#endif
}
}
@@ -175,30 +159,14 @@
void init_symm (M& m, char uplo = 'f') {
size_t n = bindings::size1 (m);
for (size_t i = 0; i < n; ++i) {
-#ifndef BOOST_NUMERIC_BINDINGS_POOR_MANS_TRAITS
bindings::at (m, i, i) = n;
-#else
- m(i,i) = n;
-#endif
for (size_t j = i + 1; j < n; ++j) {
if (uplo == 'u' || uplo == 'U') {
-#ifndef BOOST_NUMERIC_BINDINGS_POOR_MANS_TRAITS
bindings::at(m, i, j) = n - (j - i);
-#else
- m(i,j) = n - (j - i);
-#endif
} else if (uplo == 'l' || uplo == 'L') {
-#ifndef BOOST_NUMERIC_BINDINGS_POOR_MANS_TRAITS
bindings::at(m, j, i) = n - (j - i);
-#else
- m(j,i) = n - (j - i);
-#endif
} else {
-#ifndef BOOST_NUMERIC_BINDINGS_POOR_MANS_TRAITS
bindings::at(m, i, j) = bindings::at(m, j, i) = n - (j - i);
-#else
- m(i,j) = m(j,i) = n - (j - i);
-#endif
}
}
}
@@ -214,11 +182,7 @@
for (std::size_t i = 0 ; i < sz1 ; ++i) {
for (std::size_t j = 0 ; j < sz2 ; ++j) {
std::cout << i << " " << j << " " << std::endl;
-#ifndef BOOST_NUMERIC_BINDINGS_POOR_MANS_TRAITS
std::cout << bindings::at(m, i, j) << " ";
-#else
- std::cout << m(i,j) << " ";
-#endif
}
std::cout << std::endl;
}
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk