|
|
Boost-Commit : |
From: karl.meerbergen_at_[hidden]
Date: 2007-09-12 03:13:45
Author: karlmeerbergen
Date: 2007-09-12 03:13:41 EDT (Wed, 12 Sep 2007)
New Revision: 39207
URL: http://svn.boost.org/trac/boost/changeset/39207
Log:
cleaner situation for different versions of mumps
Added:
sandbox/boost/numeric/bindings/mumps/mumps_driver_4_6_4.hpp (contents, props changed)
Text files modified:
sandbox/boost/numeric/bindings/mumps/mumps_driver.hpp | 248 ---------------------------------------
1 files changed, 3 insertions(+), 245 deletions(-)
Modified: sandbox/boost/numeric/bindings/mumps/mumps_driver.hpp
==============================================================================
--- sandbox/boost/numeric/bindings/mumps/mumps_driver.hpp (original)
+++ sandbox/boost/numeric/bindings/mumps/mumps_driver.hpp 2007-09-12 03:13:41 EDT (Wed, 12 Sep 2007)
@@ -6,251 +6,9 @@
// http://www.boost.org/LICENSE_1_0.txt)
//
-#ifndef mumps_mumps_driver_hpp
-#define mumps_mumps_driver_hpp
+#ifndef BOOST_NUMERIC_BINDINGS_MUMPS_MUMPS_DRIVER_HPP
+#define BOOST_NUMERIC_BINDINGS_MUMPS_MUMPS_DRIVER_HPP
-#include <boost/numeric/bindings/mumps/4.6.4/smumps_c.hpp>
-#include <boost/numeric/bindings/mumps/4.6.4/cmumps_c.hpp>
-#include <boost/numeric/bindings/mumps/4.6.4/dmumps_c.hpp>
-#include <boost/numeric/bindings/mumps/4.6.4/zmumps_c.hpp>
-#include <boost/numeric/bindings/traits/sparse_traits.hpp>
-#include <boost/numeric/bindings/traits/matrix_traits.hpp>
-#include <boost/numeric/bindings/traits/type_traits.hpp>
-#include <boost/static_assert.hpp>
-#include <complex>
-#include <cassert>
-
-//
-// This file contains a C++ driver for MUMPS
-//
-// The templated class mumps<M> is a wrapper for the corresponding C struct.
-// The class contains constructor and destructor that call mumps with JOB=-1 and JOB=-2
-// respectively.
-//
-// The function driver() calls MUMPS. The user must set the parameters of the data manually.
-//
-// The following functions are very helpful in this respect, since they extract pointer and size
-// data using the Boost Bindings.
-//
-// void matrix_integer_data() : to set the integer data of the matrix.
-// void matrix_value_data() : to set the values of the matrix.
-// void rhs_sol_value_data() : to set the right-hand side and solution vectors in the case of a dense solution vector.
-//
-
-namespace boost { namespace numeric { namespace bindings { namespace mumps {
-
- namespace detail {
- //
- // Type and Driver
- //
- template <class T>
- struct mumps_type {
- } ;
-
- template <class T>
- struct mumps_call {
- } ;
-
- template <class T>
- struct mumps_internal_value_type {
- typedef T type ;
- } ;
-
- //
- // Specialization for float
- //
-
- template <>
- struct mumps_type< float > {
- typedef SMUMPS_STRUC_C type ;
- } ;
-
- template <>
- struct mumps_call< float > {
- void operator() ( SMUMPS_STRUC_C& struc ) const {
- smumps_c( &struc ) ;
- }
- } ;
-
- //
- // Specialization for double
- //
-
- template <>
- struct mumps_type< double > {
- typedef DMUMPS_STRUC_C type ;
- } ;
-
- template <>
- struct mumps_call< double > {
- void operator() ( DMUMPS_STRUC_C& struc ) const {
- dmumps_c( &struc ) ;
- }
- } ;
-
- //
- // Specialization for complex<float>
- //
-
- template <>
- struct mumps_type< std::complex< float > > {
- typedef CMUMPS_STRUC_C type ;
- } ;
-
- template <>
- struct mumps_call< std::complex< float > > {
- void operator() ( CMUMPS_STRUC_C& struc ) const {
- cmumps_c( &struc ) ;
- }
- } ;
-
- template <>
- struct mumps_internal_value_type< std::complex<float> > {
- typedef mumps_complex type ;
- } ;
-
- //
- // Specialization for complex<double>
- //
-
- template <>
- struct mumps_type< std::complex< double > > {
- typedef ZMUMPS_STRUC_C type ;
- } ;
-
- template <>
- struct mumps_call< std::complex< double > > {
- void operator() ( ZMUMPS_STRUC_C& struc ) const {
- zmumps_c( &struc ) ;
- }
- } ;
-
- template <>
- struct mumps_internal_value_type< std::complex<double> > {
- typedef mumps_double_complex type ;
- } ;
-
- //
- // Symmetry map
- //
-
- template <class T>
- struct mumps_sym {
- } ;
-
- template <>
- struct mumps_sym< boost::numeric::bindings::traits::symmetric_t > {
- static int const value = 2 ;
- } ;
-
- template <>
- struct mumps_sym< boost::numeric::bindings::traits::general_t > {
- static int const value = 0 ;
- } ;
-
- //
- // Get index pointers
- //
- template <typename M>
- void indices( boost::numeric::bindings::traits::row_major_t, int*& rows, int*& cols, M const& m ) {
- rows = const_cast<int*>( boost::numeric::bindings::traits::spmatrix_index1_storage( m ) ) ;
- cols = const_cast<int*>( boost::numeric::bindings::traits::spmatrix_index2_storage( m ) ) ;
- }
-
- template <typename M>
- void indices( boost::numeric::bindings::traits::column_major_t, int*& rows, int*& cols, M const& m ) {
- cols = const_cast<int*>( boost::numeric::bindings::traits::spmatrix_index1_storage( m ) ) ;
- rows = const_cast<int*>( boost::numeric::bindings::traits::spmatrix_index2_storage( m ) ) ;
- }
-
- } // namespace detail
-
-
-
- //
- // Generic MUMPS data for any value_type
- //
- template <typename M>
- struct mumps
- : detail::mumps_type< typename boost::numeric::bindings::traits::sparse_matrix_traits<M>::value_type >::type
- {
- typedef typename boost::numeric::bindings::traits::sparse_matrix_traits<M>::value_type value_type ;
- typedef typename detail::mumps_type< typename boost::numeric::bindings::traits::sparse_matrix_traits<M>::value_type >::type c_struct_type ;
-
- //
- // Initialize MUMPS solver
- // Pass a communicator (comm=-987654 means choose default)
- // Pass 'par': default = 1: host is involved in factorization
- //
- mumps( int comm_fortran=-987654, int par=1 )
- {
- this->job = -1 ;
- this->par = par ;
- this->comm_fortran = comm_fortran ;
- this->sym = detail::mumps_sym< typename boost::numeric::bindings::traits::sparse_matrix_traits<M>::matrix_structure >::value ;
- detail::mumps_call<value_type>() ( *this ) ;
- }
-
- // Destroy the solver
- ~mumps() {
- this->job = -2 ;
- detail::mumps_call<value_type>() ( *this ) ;
- }
- } ;
-
-
- //
- // Copy the matrix integer data (matrix order, structure) to the MUMPS struct
- //
- template <typename M>
- void matrix_integer_data( mumps<M>& data, M& m ) {
- BOOST_STATIC_ASSERT( (1 == boost::numeric::bindings::traits::sparse_matrix_traits<M>::index_base) ) ;
- data.n = boost::numeric::bindings::traits::spmatrix_size1( m ) ;
- assert( boost::numeric::bindings::traits::spmatrix_size2( m ) == data.n ) ;
-
- data.nz = boost::numeric::bindings::traits::spmatrix_num_nonzeros( m ) ;
- detail::indices( typename boost::numeric::bindings::traits::sparse_matrix_traits<M>::ordering_type(), data.irn, data.jcn, m ) ;
-
- data.nz_loc = boost::numeric::bindings::traits::spmatrix_num_nonzeros( m ) ;
- detail::indices( typename boost::numeric::bindings::traits::sparse_matrix_traits<M>::ordering_type(), data.irn_loc, data.jcn_loc, m ) ;
- } // matrix_integer_data()
-
-
- //
- // Copy the values pointer to the MUMPS struct
- //
- template <typename M>
- void matrix_value_data( mumps<M>& data, M& m ) {
- data.a = boost::numeric::bindings::traits::spmatrix_value_storage( m ) ;
- data.a_loc = boost::numeric::bindings::traits::spmatrix_value_storage( m ) ;
- } // matrix_value_data()
-
-
- //
- // Copy the right-hand side / solution pointer to the MUMPS struct
- // in case of a dense undistributed right-hand side and solution.
- //
- template <typename M, typename X>
- void rhs_sol_value_data( mumps<M>& data, X& x ) {
- data.rhs = boost::numeric::bindings::traits::matrix_storage( x ) ;
- data.nrhs = boost::numeric::bindings::traits::matrix_size2( x ) ;
- data.lrhs = boost::numeric::bindings::traits::leading_dimension( x ) ;
- } // matrix_rhs_sol_value_data()
-
-
- //
- // Call the MUMPS driver for the given MUMPS struct.
- //
- template <typename M>
- int driver( mumps<M>& data ) {
- assert( data.job>=1 ? data.irn!=0 : true ) ;
- assert( data.job>=1 ? data.jcn!=0 : true ) ;
- assert( data.job>=2 ? data.a!=0 : true ) ;
- assert( data.job>=3 ? data.rhs!=0 : true ) ;
- detail::mumps_call<typename M::value_type>() ( static_cast<typename mumps<M>::c_struct_type&>( data ) ) ;
- return data.info[0] ;
- } // driver()
-
-} } } } // namespace boost::numeric::bindings::mumps
+#include <boost/numeric/bindings/mumps/mumps_driver_4_6_4.hpp>
#endif
Added: sandbox/boost/numeric/bindings/mumps/mumps_driver_4_6_4.hpp
==============================================================================
--- (empty file)
+++ sandbox/boost/numeric/bindings/mumps/mumps_driver_4_6_4.hpp 2007-09-12 03:13:41 EDT (Wed, 12 Sep 2007)
@@ -0,0 +1,256 @@
+//
+// Copyright Karl Meerbergen 2007
+//
+// 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_MUMPS_MUMPS_DRIVER_4_6_4_HPP
+#define BOOST_NUMERIC_BINDINGS_MUMPS_MUMPS_DRIVER_4_6_4_HPP
+
+#include <boost/numeric/bindings/mumps/4.6.4/smumps_c.hpp>
+#include <boost/numeric/bindings/mumps/4.6.4/cmumps_c.hpp>
+#include <boost/numeric/bindings/mumps/4.6.4/dmumps_c.hpp>
+#include <boost/numeric/bindings/mumps/4.6.4/zmumps_c.hpp>
+#include <boost/numeric/bindings/traits/sparse_traits.hpp>
+#include <boost/numeric/bindings/traits/matrix_traits.hpp>
+#include <boost/numeric/bindings/traits/type_traits.hpp>
+#include <boost/static_assert.hpp>
+#include <complex>
+#include <cassert>
+
+//
+// This file contains a C++ driver for MUMPS
+//
+// The templated class mumps<M> is a wrapper for the corresponding C struct.
+// The class contains constructor and destructor that call mumps with JOB=-1 and JOB=-2
+// respectively.
+//
+// The function driver() calls MUMPS. The user must set the parameters of the data manually.
+//
+// The following functions are very helpful in this respect, since they extract pointer and size
+// data using the Boost Bindings.
+//
+// void matrix_integer_data() : to set the integer data of the matrix.
+// void matrix_value_data() : to set the values of the matrix.
+// void rhs_sol_value_data() : to set the right-hand side and solution vectors in the case of a dense solution vector.
+//
+
+namespace boost { namespace numeric { namespace bindings { namespace mumps {
+
+ namespace detail {
+ //
+ // Type and Driver
+ //
+ template <class T>
+ struct mumps_type {
+ } ;
+
+ template <class T>
+ struct mumps_call {
+ } ;
+
+ template <class T>
+ struct mumps_internal_value_type {
+ typedef T type ;
+ } ;
+
+ //
+ // Specialization for float
+ //
+
+ template <>
+ struct mumps_type< float > {
+ typedef SMUMPS_STRUC_C type ;
+ } ;
+
+ template <>
+ struct mumps_call< float > {
+ void operator() ( SMUMPS_STRUC_C& struc ) const {
+ smumps_c( &struc ) ;
+ }
+ } ;
+
+ //
+ // Specialization for double
+ //
+
+ template <>
+ struct mumps_type< double > {
+ typedef DMUMPS_STRUC_C type ;
+ } ;
+
+ template <>
+ struct mumps_call< double > {
+ void operator() ( DMUMPS_STRUC_C& struc ) const {
+ dmumps_c( &struc ) ;
+ }
+ } ;
+
+ //
+ // Specialization for complex<float>
+ //
+
+ template <>
+ struct mumps_type< std::complex< float > > {
+ typedef CMUMPS_STRUC_C type ;
+ } ;
+
+ template <>
+ struct mumps_call< std::complex< float > > {
+ void operator() ( CMUMPS_STRUC_C& struc ) const {
+ cmumps_c( &struc ) ;
+ }
+ } ;
+
+ template <>
+ struct mumps_internal_value_type< std::complex<float> > {
+ typedef mumps_complex type ;
+ } ;
+
+ //
+ // Specialization for complex<double>
+ //
+
+ template <>
+ struct mumps_type< std::complex< double > > {
+ typedef ZMUMPS_STRUC_C type ;
+ } ;
+
+ template <>
+ struct mumps_call< std::complex< double > > {
+ void operator() ( ZMUMPS_STRUC_C& struc ) const {
+ zmumps_c( &struc ) ;
+ }
+ } ;
+
+ template <>
+ struct mumps_internal_value_type< std::complex<double> > {
+ typedef mumps_double_complex type ;
+ } ;
+
+ //
+ // Symmetry map
+ //
+
+ template <class T>
+ struct mumps_sym {
+ } ;
+
+ template <>
+ struct mumps_sym< boost::numeric::bindings::traits::symmetric_t > {
+ static int const value = 2 ;
+ } ;
+
+ template <>
+ struct mumps_sym< boost::numeric::bindings::traits::general_t > {
+ static int const value = 0 ;
+ } ;
+
+ //
+ // Get index pointers
+ //
+ template <typename M>
+ void indices( boost::numeric::bindings::traits::row_major_t, int*& rows, int*& cols, M const& m ) {
+ rows = const_cast<int*>( boost::numeric::bindings::traits::spmatrix_index1_storage( m ) ) ;
+ cols = const_cast<int*>( boost::numeric::bindings::traits::spmatrix_index2_storage( m ) ) ;
+ }
+
+ template <typename M>
+ void indices( boost::numeric::bindings::traits::column_major_t, int*& rows, int*& cols, M const& m ) {
+ cols = const_cast<int*>( boost::numeric::bindings::traits::spmatrix_index1_storage( m ) ) ;
+ rows = const_cast<int*>( boost::numeric::bindings::traits::spmatrix_index2_storage( m ) ) ;
+ }
+
+ } // namespace detail
+
+
+
+ //
+ // Generic MUMPS data for any value_type
+ //
+ template <typename M>
+ struct mumps
+ : detail::mumps_type< typename boost::numeric::bindings::traits::sparse_matrix_traits<M>::value_type >::type
+ {
+ typedef typename boost::numeric::bindings::traits::sparse_matrix_traits<M>::value_type value_type ;
+ typedef typename detail::mumps_type< typename boost::numeric::bindings::traits::sparse_matrix_traits<M>::value_type >::type c_struct_type ;
+
+ //
+ // Initialize MUMPS solver
+ // Pass a communicator (comm=-987654 means choose default)
+ // Pass 'par': default = 1: host is involved in factorization
+ //
+ mumps( int comm_fortran=-987654, int par=1 )
+ {
+ this->job = -1 ;
+ this->par = par ;
+ this->comm_fortran = comm_fortran ;
+ this->sym = detail::mumps_sym< typename boost::numeric::bindings::traits::sparse_matrix_traits<M>::matrix_structure >::value ;
+ detail::mumps_call<value_type>() ( *this ) ;
+ }
+
+ // Destroy the solver
+ ~mumps() {
+ this->job = -2 ;
+ detail::mumps_call<value_type>() ( *this ) ;
+ }
+ } ;
+
+
+ //
+ // Copy the matrix integer data (matrix order, structure) to the MUMPS struct
+ //
+ template <typename M>
+ void matrix_integer_data( mumps<M>& data, M& m ) {
+ BOOST_STATIC_ASSERT( (1 == boost::numeric::bindings::traits::sparse_matrix_traits<M>::index_base) ) ;
+ data.n = boost::numeric::bindings::traits::spmatrix_size1( m ) ;
+ assert( boost::numeric::bindings::traits::spmatrix_size2( m ) == data.n ) ;
+
+ data.nz = boost::numeric::bindings::traits::spmatrix_num_nonzeros( m ) ;
+ detail::indices( typename boost::numeric::bindings::traits::sparse_matrix_traits<M>::ordering_type(), data.irn, data.jcn, m ) ;
+
+ data.nz_loc = boost::numeric::bindings::traits::spmatrix_num_nonzeros( m ) ;
+ detail::indices( typename boost::numeric::bindings::traits::sparse_matrix_traits<M>::ordering_type(), data.irn_loc, data.jcn_loc, m ) ;
+ } // matrix_integer_data()
+
+
+ //
+ // Copy the values pointer to the MUMPS struct
+ //
+ template <typename M>
+ void matrix_value_data( mumps<M>& data, M& m ) {
+ data.a = boost::numeric::bindings::traits::spmatrix_value_storage( m ) ;
+ data.a_loc = boost::numeric::bindings::traits::spmatrix_value_storage( m ) ;
+ } // matrix_value_data()
+
+
+ //
+ // Copy the right-hand side / solution pointer to the MUMPS struct
+ // in case of a dense undistributed right-hand side and solution.
+ //
+ template <typename M, typename X>
+ void rhs_sol_value_data( mumps<M>& data, X& x ) {
+ data.rhs = boost::numeric::bindings::traits::matrix_storage( x ) ;
+ data.nrhs = boost::numeric::bindings::traits::matrix_size2( x ) ;
+ data.lrhs = boost::numeric::bindings::traits::leading_dimension( x ) ;
+ } // matrix_rhs_sol_value_data()
+
+
+ //
+ // Call the MUMPS driver for the given MUMPS struct.
+ //
+ template <typename M>
+ int driver( mumps<M>& data ) {
+ assert( data.job>=1 ? data.irn!=0 : true ) ;
+ assert( data.job>=1 ? data.jcn!=0 : true ) ;
+ assert( data.job>=2 ? data.a!=0 : true ) ;
+ assert( data.job>=3 ? data.rhs!=0 : true ) ;
+ detail::mumps_call<typename M::value_type>() ( static_cast<typename mumps<M>::c_struct_type&>( data ) ) ;
+ return data.info[0] ;
+ } // driver()
+
+} } } } // namespace boost::numeric::bindings::mumps
+
+#endif
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