|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r64062 - in sandbox/numeric_bindings: boost/numeric/bindings/detail/config boost/numeric/bindings/traits libs/numeric/bindings/lapack/test
From: thomas.klimpel_at_[hidden]
Date: 2010-07-15 18:09:08
Author: klimpel
Date: 2010-07-15 18:09:03 EDT (Thu, 15 Jul 2010)
New Revision: 64062
URL: http://svn.boost.org/trac/boost/changeset/64062
Log:
Since integer_t is obsolete, used fortran_int_t instead.
Text files modified:
sandbox/numeric_bindings/boost/numeric/bindings/detail/config/fortran.hpp | 10 +++++++++-
sandbox/numeric_bindings/boost/numeric/bindings/traits/type.h | 12 ------------
sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/hseqr.cpp | 2 +-
sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_gbsv.cpp | 6 +++---
sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_gees.cpp | 12 ++++++------
sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_gelsd.cpp | 8 ++++----
sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_gelss.cpp | 8 ++++----
sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_geqrf.cpp | 8 ++++----
sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_gesdd.cc | 2 +-
sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_gesdd2.cc | 2 +-
sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_gesdd3.cc | 2 +-
sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_gesv2.cc | 2 +-
sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_getrf_getrs.cc | 2 +-
sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_getrf_getrs1.cpp | 2 +-
sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_hbev.cpp | 4 ++--
sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_hbevx.cpp | 10 +++++-----
sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_heevd.cpp | 8 ++++----
sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_heevx.cpp | 10 +++++-----
sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_hegv.cpp | 4 ++--
sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_hesv.cc | 2 +-
sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_hetrf_hetrs.cc | 2 +-
sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_hpsv.cc | 2 +-
sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_hptrf_hptrs.cc | 2 +-
sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_spsv.cc | 2 +-
sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_sptrf_sptrs.cc | 2 +-
sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_sysv.cc | 2 +-
sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_sytrf_sytrs.cc | 2 +-
27 files changed, 63 insertions(+), 67 deletions(-)
Modified: sandbox/numeric_bindings/boost/numeric/bindings/detail/config/fortran.hpp
==============================================================================
--- sandbox/numeric_bindings/boost/numeric/bindings/detail/config/fortran.hpp (original)
+++ sandbox/numeric_bindings/boost/numeric/bindings/detail/config/fortran.hpp 2010-07-15 18:09:03 EDT (Thu, 15 Jul 2010)
@@ -43,11 +43,19 @@
//#define BIND_FORTRAN_NO_F2C_RETURN_CONVENTIONS
// As long as f2c return conventions are the common case,
-// we turn them on unless requested otherwise
+// we turn them on unless requested otherwise.
#ifndef BIND_FORTRAN_NO_F2C_RETURN_CONVENTIONS
#define BIND_FORTRAN_F2C_RETURN_CONVENTIONS
#endif
+
+// "g77" or "gfortran" or mkl_intel_lp64
+//#undef BIND_FORTRAN_INTEGER_8
+// clapack or "gfortran -fdefault-integer-8" or mkl_intel_ilp64
+//#define BIND_FORTRAN_INTEGER_8
+
+// Most fortran compilers use fortran_int_t := int by default, so we follow
+// this default, even so f2c (=clapack) uses "typedef long int integer;"
#ifndef BIND_FORTRAN_INTEGER_8
typedef int fortran_int_t;
#else
Modified: sandbox/numeric_bindings/boost/numeric/bindings/traits/type.h
==============================================================================
--- sandbox/numeric_bindings/boost/numeric/bindings/traits/type.h (original)
+++ sandbox/numeric_bindings/boost/numeric/bindings/traits/type.h 2010-07-15 18:09:03 EDT (Thu, 15 Jul 2010)
@@ -10,18 +10,6 @@
#ifndef BOOST_NUMERIC_BINDINGS_TRAITS_TYPE_H
#define BOOST_NUMERIC_BINDINGS_TRAITS_TYPE_H
-// "g77" or "gfortran" or mkl_intel_ilp64
-//#undef BIND_FORTRAN_INTEGER_8
-// clapack or "gfortran -fdefault-integer-8" or mkl_intel_lp64
-//#define BIND_FORTRAN_INTEGER_8
-
-#ifndef BIND_FORTRAN_INTEGER_8
-typedef int integer_t ;
-#else
-typedef std::ptrdiff_t integer_t ;
-#endif
-
-
/*
* This header defines the C types that will be mapped to
* COMPLEX and COMPLEX*16 of Fortran
Modified: sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/hseqr.cpp
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/hseqr.cpp (original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/hseqr.cpp 2010-07-15 18:09:03 EDT (Thu, 15 Jul 2010)
@@ -103,7 +103,7 @@
boost::numeric::bindings::detail::array<complex<double> > work_c(2*n);
boost::numeric::bindings::detail::array<double> work_r(n);
ublas::vector<bool> select_dummy(n);
- integer_t m_info(n+1);
+ fortran_int_t m_info(n+1);
lapack::trevc( tag::both(),'B',select_dummy,G,cVL,cVR,n,m_info,lapack::workspace(work_c,work_r));
cout << "\n==================================" << endl;
Modified: sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_gbsv.cpp
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_gbsv.cpp (original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_gbsv.cpp 2010-07-15 18:09:03 EDT (Thu, 15 Jul 2010)
@@ -19,9 +19,9 @@
{
// if the matrix has kl lower and ku upper diagonals, then we should have
// allocated kl lower and kl+ku upper diagonals
- integer_t const kl = bindings::bandwidth_lower (a);
- integer_t const ku = bindings::bandwidth_upper (a) - kl;
- std::vector<integer_t> piv(a.size1());
+ fortran_int_t const kl = bindings::bandwidth_lower (a);
+ fortran_int_t const ku = bindings::bandwidth_upper (a) - kl;
+ std::vector<fortran_int_t> piv(a.size1());
int ret = lapack::gbtrf(/*kl, ku, */a, piv);
if (ret < 0) {
//CStdString err;
Modified: sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_gees.cpp
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_gees.cpp (original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_gees.cpp 2010-07-15 18:09:03 EDT (Thu, 15 Jul 2010)
@@ -31,13 +31,13 @@
struct apply_real {
template< typename MatrixA, typename VectorW, typename MatrixVS,
typename Workspace >
- static inline integer_t gees( const char jobvs, const char sort,
- logical_t* select, MatrixA& a, integer_t& sdim, VectorW& w,
+ static inline std::ptrdiff_t gees( const char jobvs, const char sort,
+ logical_t* select, MatrixA& a, fortran_int_t& sdim, VectorW& w,
MatrixVS& vs, Workspace work ) {
typedef typename bindings::value_type< MatrixA >::type value_type;
bindings::detail::array<value_type> wr(bindings::size(w));
bindings::detail::array<value_type> wi(bindings::size(w));
- integer_t info = lapack::gees( jobvs, sort, select, a, sdim, wr, wi, vs, work );
+ fortran_int_t info = lapack::gees( jobvs, sort, select, a, sdim, wr, wi, vs, work );
traits::detail::interlace(bindings::begin_value(wr),
bindings::begin_value(wr)+bindings::size(w),
bindings::begin_value(wi),
@@ -49,8 +49,8 @@
struct apply_complex {
template< typename MatrixA, typename VectorW, typename MatrixVS,
typename Workspace >
- static inline integer_t gees( const char jobvs, const char sort,
- logical_t* select, MatrixA& a, integer_t& sdim, VectorW& w,
+ static inline std::ptrdiff_t gees( const char jobvs, const char sort,
+ logical_t* select, MatrixA& a, fortran_int_t& sdim, VectorW& w,
MatrixVS& vs, Workspace work ) {
return lapack::gees( jobvs, sort, select, a, sdim, w, vs, work );
}
@@ -95,7 +95,7 @@
randomize( a );
matrix_type a2( a );
logical_t* select = 0;
- integer_t sdim_info(0);
+ fortran_int_t sdim_info(0);
// Compute Schur decomposition.
apply_t::gees( 'V', 'N', select, a, sdim_info, e1, z, workspace ) ;
Modified: sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_gelsd.cpp
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_gelsd.cpp (original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_gelsd.cpp 2010-07-15 18:09:03 EDT (Thu, 15 Jul 2010)
@@ -239,7 +239,7 @@
typedef typename bindings::value_type<MatType>::type val_t;
typedef typename bindings::remove_imaginary<val_t>::type real_t;
const real_t rcond = -1; // use machine precision
- integer_t rank;
+ fortran_int_t rank;
// return value
int err = 0;
@@ -300,7 +300,7 @@
typedef typename bindings::value_type<MatType>::type val_t;
typedef typename bindings::remove_imaginary<val_t>::type real_t;
const real_t rcond = -1; // use machine precision
- integer_t rank;
+ fortran_int_t rank;
// return value
int err = 0;
@@ -361,7 +361,7 @@
typedef typename bindings::value_type<MatType>::type val_t;
typedef typename bindings::remove_imaginary<val_t>::type real_t;
const real_t rcond = -1; // use machine precision
- integer_t rank;
+ fortran_int_t rank;
// return value
int err = 0;
@@ -422,7 +422,7 @@
typedef typename bindings::value_type<MatType>::type val_t;
typedef typename bindings::remove_imaginary<val_t>::type real_t;
const real_t rcond = -1; // use machine precision
- integer_t rank;
+ fortran_int_t rank;
// return value
int err = 0;
Modified: sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_gelss.cpp
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_gelss.cpp (original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_gelss.cpp 2010-07-15 18:09:03 EDT (Thu, 15 Jul 2010)
@@ -223,7 +223,7 @@
typedef typename bindings::value_type<MatType>::type val_t;
typedef typename bindings::remove_imaginary<val_t>::type real_t;
const real_t rcond = -1; // use machine precision
- integer_t rank;
+ fortran_int_t rank;
// return value
int err = 0;
@@ -284,7 +284,7 @@
typedef typename bindings::value_type<MatType>::type val_t;
typedef typename bindings::remove_imaginary<val_t>::type real_t;
const real_t rcond = -1; // use machine precision
- integer_t rank;
+ fortran_int_t rank;
// return value
int err = 0;
@@ -345,7 +345,7 @@
typedef typename bindings::value_type<MatType>::type val_t;
typedef typename bindings::remove_imaginary<val_t>::type real_t;
const real_t rcond = -1; // use machine precision
- integer_t rank;
+ fortran_int_t rank;
// return value
int err = 0;
@@ -406,7 +406,7 @@
typedef typename bindings::value_type<MatType>::type val_t;
typedef typename bindings::remove_imaginary<val_t>::type real_t;
const real_t rcond = -1; // use machine precision
- integer_t rank;
+ fortran_int_t rank;
// return value
int err = 0;
Modified: sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_geqrf.cpp
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_geqrf.cpp (original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_geqrf.cpp 2010-07-15 18:09:03 EDT (Thu, 15 Jul 2010)
@@ -34,12 +34,12 @@
struct apply_real {
template< typename MatrixA, typename VectorTAU, typename Workspace >
- static inline integer_t orgqr( MatrixA& a, const VectorTAU& tau, Workspace work ) {
+ static inline std::ptrdiff_t orgqr( MatrixA& a, const VectorTAU& tau, Workspace work ) {
return lapack::orgqr( a, tau, work );
}
template< typename Side, typename MatrixA, typename VectorTAU, typename MatrixC,
typename Workspace >
- static inline integer_t ormqr( const Side side,
+ static inline std::ptrdiff_t ormqr( const Side side,
const MatrixA& a, const VectorTAU& tau, MatrixC& c,
Workspace work ) {
return lapack::ormqr( side, a, tau, c, work );
@@ -48,12 +48,12 @@
struct apply_complex {
template< typename MatrixA, typename VectorTAU, typename Workspace >
- static inline integer_t orgqr( MatrixA& a, const VectorTAU& tau, Workspace work ) {
+ static inline std::ptrdiff_t orgqr( MatrixA& a, const VectorTAU& tau, Workspace work ) {
return lapack::ungqr( a, tau, work );
}
template< typename Side, typename MatrixA, typename VectorTAU, typename MatrixC,
typename Workspace >
- static inline integer_t ormqr( const Side side,
+ static inline std::ptrdiff_t ormqr( const Side side,
const MatrixA& a, const VectorTAU& tau, MatrixC& c,
Workspace work ) {
return lapack::unmqr( side, a, tau, c, work );
Modified: sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_gesdd.cc
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_gesdd.cc (original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_gesdd.cc 2010-07-15 18:09:03 EDT (Thu, 15 Jul 2010)
@@ -66,7 +66,7 @@
size_t liw = lapack::gesdd_iwork (a);
cout << "liw: " << liw << endl << endl;
- std::vector<integer_t> iw (liw);
+ std::vector<fortran_int_t> iw (liw);
lapack::gesdd ('A', a, s, u, vt, w, iw);
*/
Modified: sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_gesdd2.cc
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_gesdd2.cc (original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_gesdd2.cc 2010-07-15 18:09:03 EDT (Thu, 15 Jul 2010)
@@ -74,7 +74,7 @@
size_t liw = lapack::gesdd_iwork (a);
cout << "liw: " << liw << endl << endl;
- std::vector<integer_t> iw (liw);
+ std::vector<fortran_int_t> iw (liw);
lapack::gesdd ('A', a, s, u, vt, w, rw, iw);
*/
Modified: sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_gesdd3.cc
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_gesdd3.cc (original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_gesdd3.cc 2010-07-15 18:09:03 EDT (Thu, 15 Jul 2010)
@@ -70,7 +70,7 @@
size_t liw = lapack::gesdd_iwork (a);
cout << "liw: " << liw << endl << endl;
- std::vector<integer_t> iw (liw);
+ std::vector<fortran_int_t> iw (liw);
lapack::gesdd ('A', a, s, u, vt, w, iw);
*/
Modified: sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_gesv2.cc
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_gesv2.cc (original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_gesv2.cc 2010-07-15 18:09:03 EDT (Thu, 15 Jul 2010)
@@ -90,7 +90,7 @@
// lapack::gesv (a, b); // solving the system, b contains x
// no ipiv less version is currently provided, so fall back to using ipiv
- std::vector<integer_t> ipiv(n);
+ std::vector<fortran_int_t> ipiv(n);
lapack::gesv (a, ipiv, b); // solving the system, b contains x
print_m (b, "X");
Modified: sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_getrf_getrs.cc
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_getrf_getrs.cc (original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_getrf_getrs.cc 2010-07-15 18:09:03 EDT (Thu, 15 Jul 2010)
@@ -79,7 +79,7 @@
print_m (b, "B");
cout << endl;
- std::vector<integer_t> ipiv (n); // pivot vector
+ std::vector<fortran_int_t> ipiv (n); // pivot vector
lapack::getrf (a, ipiv); // factor a
m_t ia (a);
Modified: sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_getrf_getrs1.cpp
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_getrf_getrs1.cpp (original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_getrf_getrs1.cpp 2010-07-15 18:09:03 EDT (Thu, 15 Jul 2010)
@@ -12,7 +12,7 @@
numerics::matrix< value_type > a( lu ) ; // tmp to verify result
numerics::matrix< value_type > b( x ) ; // tmp to verify result
- std::vector< integer_t > ipiv( x.size1() ) ;
+ std::vector< fortran_int_t > ipiv( x.size1() ) ;
boost::numeric::bindings::lapack::getrf( lu, ipiv ) ;
matrix_type ia( lu );
Modified: sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_hbev.cpp
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_hbev.cpp (original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_hbev.cpp 2010-07-15 18:09:03 EDT (Thu, 15 Jul 2010)
@@ -30,7 +30,7 @@
struct apply_real {
template< typename MatrixAB, typename VectorW, typename MatrixZ,
typename Workspace >
- static inline integer_t hbev( const char jobz,
+ static inline std::ptrdiff_t hbev( const char jobz,
MatrixAB& ab, VectorW& w, MatrixZ& z,
Workspace work ) {
return lapack::sbev( jobz, ab, w, z, work );
@@ -40,7 +40,7 @@
struct apply_complex {
template< typename MatrixAB, typename VectorW, typename MatrixZ,
typename Workspace >
- static inline integer_t hbev( const char jobz,
+ static inline std::ptrdiff_t hbev( const char jobz,
MatrixAB& ab, VectorW& w, MatrixZ& z,
Workspace work ) {
return lapack::hbev( jobz, ab, w, z, work );
Modified: sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_hbevx.cpp
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_hbevx.cpp (original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_hbevx.cpp 2010-07-15 18:09:03 EDT (Thu, 15 Jul 2010)
@@ -103,8 +103,8 @@
ublas::hermitian_adaptor<banded_type, UPLO> h( a ), h2( a2 );
real_type vl = 0, vu = 1, abstol = 1e-28;
- integer_t il = 1, iu = n-1, m;
- ublas::vector<integer_t> ifail(n);
+ fortran_int_t il = 1, iu = n-1, m;
+ ublas::vector<fortran_int_t> ifail(n);
// Compute Schur decomposition.
@@ -127,7 +127,7 @@
ublas::hermitian_adaptor< banded_range, UPLO> h_r( a_r );
ublas::vector_range< vector_type> e_r( e1, r );
ublas::matrix_range< matrix_type> z_r( z, r, r );
- ublas::vector<integer_t> ifail_r(n-2);
+ ublas::vector<fortran_int_t> ifail_r(n-2);
apply_t::hbevx( 'V', 'A',
h_r, q, vl, vu, il, iu, abstol, m, e_r, z_r, ifail_r, workspace ) ;
@@ -152,7 +152,7 @@
template <typename T>
struct Workspace {
typedef ublas::vector< T > array_type ;
- typedef ublas::vector< integer_t > int_array_type ;
+ typedef ublas::vector< fortran_int_t > int_array_type ;
typedef lapack::detail::workspace2<array_type, int_array_type > type ;
Workspace(size_t n)
@@ -172,7 +172,7 @@
struct Workspace< std::complex<T> > {
typedef ublas::vector< std::complex<T> > complex_array_type ;
typedef ublas::vector< T > real_array_type ;
- typedef ublas::vector< integer_t > int_array_type ;
+ typedef ublas::vector< fortran_int_t > int_array_type ;
typedef lapack::detail::workspace3<
complex_array_type, real_array_type, int_array_type > type ;
Modified: sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_heevd.cpp
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_heevd.cpp (original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_heevd.cpp 2010-07-15 18:09:03 EDT (Thu, 15 Jul 2010)
@@ -29,7 +29,7 @@
struct apply_real {
template< typename MatrixA, typename VectorW, typename Workspace >
- static inline integer_t heevd( const char jobz, MatrixA& a, VectorW& w,
+ static inline std::ptrdiff_t heevd( const char jobz, MatrixA& a, VectorW& w,
Workspace work ) {
return lapack::syevd( jobz, a, w, work );
}
@@ -37,7 +37,7 @@
struct apply_complex {
template< typename MatrixA, typename VectorW, typename Workspace >
- static inline integer_t heevd( const char jobz, MatrixA& a, VectorW& w,
+ static inline std::ptrdiff_t heevd( const char jobz, MatrixA& a, VectorW& w,
Workspace work ) {
return lapack::heevd( jobz, a, w, work );
}
@@ -106,7 +106,7 @@
template <typename T>
struct Workspace {
typedef ublas::vector< T > array_type ;
- typedef ublas::vector< integer_t > int_array_type ;
+ typedef ublas::vector< fortran_int_t > int_array_type ;
typedef lapack::detail::workspace2< array_type, int_array_type > type ;
Workspace(size_t n)
@@ -126,7 +126,7 @@
struct Workspace< std::complex<T> > {
typedef ublas::vector< std::complex<T> > complex_array_type ;
typedef ublas::vector< T > real_array_type ;
- typedef ublas::vector< integer_t > int_array_type ;
+ typedef ublas::vector< fortran_int_t > int_array_type ;
typedef lapack::detail::workspace3<
complex_array_type, real_array_type, int_array_type > type ;
Modified: sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_heevx.cpp
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_heevx.cpp (original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_heevx.cpp 2010-07-15 18:09:03 EDT (Thu, 15 Jul 2010)
@@ -82,8 +82,8 @@
matrix_type z( a );
// Compute Schur decomposition.
- integer_t m;
- ublas::vector<integer_t> ifail(n);
+ fortran_int_t m;
+ ublas::vector<fortran_int_t> ifail(n);
hermitian_type h_a( a );
apply_t::heevx( 'V', 'A', h_a, real_type(0.0), real_type(1.0), 2, n-1, real_type(1e-28), m,
@@ -106,7 +106,7 @@
matrix_range a_r( a, r, r );
matrix_range z_r( z, r, r );
ublas::vector_range< vector_type> e_r( e1, r );
- ublas::vector<integer_t> ifail_r(n-2);
+ ublas::vector<fortran_int_t> ifail_r(n-2);
hermitian_range_type h_a_r( a_r );
apply_t::heevx( 'V', 'A', h_a_r, real_type(0.0), real_type(1.0), 2, n-1, real_type(1e-28), m,
@@ -132,7 +132,7 @@
template <typename T>
struct Workspace {
typedef ublas::vector< T > array_type ;
- typedef ublas::vector< integer_t > int_array_type ;
+ typedef ublas::vector< fortran_int_t > int_array_type ;
typedef lapack::detail::workspace2< array_type, int_array_type > type ;
Workspace(size_t n)
@@ -152,7 +152,7 @@
struct Workspace< std::complex<T> > {
typedef ublas::vector< std::complex<T> > complex_array_type ;
typedef ublas::vector< T > real_array_type ;
- typedef ublas::vector< integer_t > int_array_type ;
+ typedef ublas::vector< fortran_int_t > int_array_type ;
typedef lapack::detail::workspace3<
complex_array_type, real_array_type, int_array_type > type ;
Modified: sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_hegv.cpp
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_hegv.cpp (original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_hegv.cpp 2010-07-15 18:09:03 EDT (Thu, 15 Jul 2010)
@@ -29,7 +29,7 @@
struct apply_real {
template< typename MatrixA, typename MatrixB, typename VectorW,
typename Workspace >
- static inline integer_t hegv( const integer_t itype, const char jobz,
+ static inline std::ptrdiff_t hegv( const fortran_int_t itype, const char jobz,
MatrixA& a, MatrixB& b, VectorW& w,
Workspace work ) {
return lapack::sygv( itype, jobz, a, b, w, work );
@@ -39,7 +39,7 @@
struct apply_complex {
template< typename MatrixA, typename MatrixB, typename VectorW,
typename Workspace >
- static inline integer_t hegv( const integer_t itype, const char jobz,
+ static inline std::ptrdiff_t hegv( const fortran_int_t itype, const char jobz,
MatrixA& a, MatrixB& b, VectorW& w,
Workspace work ) {
return lapack::hegv( itype, jobz, a, b, w, work );
Modified: sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_hesv.cc
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_hesv.cc (original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_hesv.cc 2010-07-15 18:09:03 EDT (Thu, 15 Jul 2010)
@@ -36,7 +36,7 @@
cm_t cx (3, 1);
cm_t cbl (3, 1), cbu (3, 1); // RHS
- std::vector<integer_t> ipiv (3);
+ std::vector<fortran_int_t> ipiv (3);
hcal (0, 0) = cmplx_t (3, 0);
hcal (1, 0) = cmplx_t (4, -2);
Modified: sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_hetrf_hetrs.cc
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_hetrf_hetrs.cc (original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_hetrf_hetrs.cc 2010-07-15 18:09:03 EDT (Thu, 15 Jul 2010)
@@ -75,7 +75,7 @@
cm_t cal2 (hcal), cau2 (hcau); // for part 2
cm_t cbl2 (cbl), cbu2 (cbu);
- std::vector<integer_t> ipiv (3);
+ std::vector<fortran_int_t> ipiv (3);
int ierr = lapack::hetrf (hcal, ipiv);
if (ierr == 0) {
Modified: sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_hpsv.cc
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_hpsv.cc (original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_hpsv.cc 2010-07-15 18:09:03 EDT (Thu, 15 Jul 2010)
@@ -37,7 +37,7 @@
cm_t cx (3, 1);
cm_t cbl (3, 1), cbu (3, 1); // RHS
- std::vector<integer_t> ipiv (3);
+ std::vector<fortran_int_t> ipiv (3);
hcal (0, 0) = cmplx_t (3, 0);
hcal (1, 0) = cmplx_t (4, -2);
Modified: sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_hptrf_hptrs.cc
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_hptrf_hptrs.cc (original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_hptrf_hptrs.cc 2010-07-15 18:09:03 EDT (Thu, 15 Jul 2010)
@@ -67,7 +67,7 @@
print_m (cbu, "cbu");
cout << endl;
- std::vector<integer_t> ipiv (3);
+ std::vector<fortran_int_t> ipiv (3);
int ierr = lapack::hptrf (hcal, ipiv);
if (ierr == 0) {
Modified: sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_spsv.cc
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_spsv.cc (original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_spsv.cc 2010-07-15 18:09:03 EDT (Thu, 15 Jul 2010)
@@ -66,7 +66,7 @@
m_t x (n, nrhs);
m_t bl (n, nrhs), bu (n, nrhs); // RHS matrices
- std::vector<integer_t> ipiv (n);
+ std::vector<fortran_int_t> ipiv (n);
init_symm2 (sal);
print_m (sal, "sal");
Modified: sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_sptrf_sptrs.cc
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_sptrf_sptrs.cc (original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_sptrf_sptrs.cc 2010-07-15 18:09:03 EDT (Thu, 15 Jul 2010)
@@ -88,7 +88,7 @@
print_m (bu, "bu");
cout << endl;
- std::vector<integer_t> ipiv (n);
+ std::vector<fortran_int_t> ipiv (n);
int err = lapack::sptrf (sal, ipiv);
if (err == 0) {
Modified: sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_sysv.cc
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_sysv.cc (original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_sysv.cc 2010-07-15 18:09:03 EDT (Thu, 15 Jul 2010)
@@ -64,7 +64,7 @@
m_t x (n, nrhs);
m_t bl (n, nrhs), bu (n, nrhs); // RHS matrices
- std::vector<integer_t> ipiv (n);
+ std::vector<fortran_int_t> ipiv (n);
init_symm2 (al);
swap (row (al, 1), row (al, 4));
Modified: sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_sytrf_sytrs.cc
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_sytrf_sytrs.cc (original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_sytrf_sytrs.cc 2010-07-15 18:09:03 EDT (Thu, 15 Jul 2010)
@@ -98,7 +98,7 @@
m_t al1 (al), au1 (au); // for part 2
m_t bl1 (bl), bu1 (bu);
- std::vector<integer_t> ipiv (n);
+ std::vector<fortran_int_t> ipiv (n);
int err = lapack::sytrf (sal, ipiv);
if (err == 0) {
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