|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r51529 - in sandbox/numeric_bindings: boost/numeric/bindings/traits boost/numeric/bindings/traits/detail libs/numeric/bindings/atlas libs/numeric/bindings/blas libs/numeric/bindings/lapack libs/numeric/bindings/lapack/test libs/numeric/bindings/mumps libs/numeric/bindings/mumps/test libs/numeric/bindings/traits libs/numeric/bindings/traits/doc libs/numeric/bindings/umfpack
From: karl.meerbergen_at_[hidden]
Date: 2009-03-02 10:47:12
Author: karlmeerbergen
Date: 2009-03-02 10:47:11 EST (Mon, 02 Mar 2009)
New Revision: 51529
URL: http://svn.boost.org/trac/boost/changeset/51529
Log:
copied from sandbox
Added:
sandbox/numeric_bindings/boost/numeric/bindings/traits/algorithm.hpp
- copied unchanged from r51526, /sandbox/boost/numeric/bindings/traits/algorithm.hpp
sandbox/numeric_bindings/boost/numeric/bindings/traits/boost_array.hpp
- copied unchanged from r51526, /sandbox/boost/numeric/bindings/traits/boost_array.hpp
sandbox/numeric_bindings/boost/numeric/bindings/traits/c_array.hpp
- copied unchanged from r51526, /sandbox/boost/numeric/bindings/traits/c_array.hpp
sandbox/numeric_bindings/boost/numeric/bindings/traits/c_array2.hpp
- copied unchanged from r51526, /sandbox/boost/numeric/bindings/traits/c_array2.hpp
sandbox/numeric_bindings/boost/numeric/bindings/traits/config.hpp
- copied unchanged from r51526, /sandbox/boost/numeric/bindings/traits/config.hpp
sandbox/numeric_bindings/boost/numeric/bindings/traits/dense_traits.hpp
- copied unchanged from r51526, /sandbox/boost/numeric/bindings/traits/dense_traits.hpp
sandbox/numeric_bindings/boost/numeric/bindings/traits/detail/
- copied from r51526, /sandbox/boost/numeric/bindings/traits/detail/
sandbox/numeric_bindings/boost/numeric/bindings/traits/fortran.h
- copied unchanged from r51526, /sandbox/boost/numeric/bindings/traits/fortran.h
sandbox/numeric_bindings/boost/numeric/bindings/traits/matrix_raw.hpp
- copied unchanged from r51526, /sandbox/boost/numeric/bindings/traits/matrix_raw.hpp
sandbox/numeric_bindings/boost/numeric/bindings/traits/matrix_traits.hpp
- copied unchanged from r51526, /sandbox/boost/numeric/bindings/traits/matrix_traits.hpp
sandbox/numeric_bindings/boost/numeric/bindings/traits/sparse_traits.hpp
- copied unchanged from r51526, /sandbox/boost/numeric/bindings/traits/sparse_traits.hpp
sandbox/numeric_bindings/boost/numeric/bindings/traits/std_valarray.hpp
- copied unchanged from r51526, /sandbox/boost/numeric/bindings/traits/std_valarray.hpp
sandbox/numeric_bindings/boost/numeric/bindings/traits/std_valarray2.hpp
- copied unchanged from r51526, /sandbox/boost/numeric/bindings/traits/std_valarray2.hpp
sandbox/numeric_bindings/boost/numeric/bindings/traits/std_vector.hpp
- copied unchanged from r51526, /sandbox/boost/numeric/bindings/traits/std_vector.hpp
sandbox/numeric_bindings/boost/numeric/bindings/traits/std_vector2.hpp
- copied unchanged from r51526, /sandbox/boost/numeric/bindings/traits/std_vector2.hpp
sandbox/numeric_bindings/boost/numeric/bindings/traits/symm_herm_raw.hpp
- copied unchanged from r51526, /sandbox/boost/numeric/bindings/traits/symm_herm_raw.hpp
sandbox/numeric_bindings/boost/numeric/bindings/traits/tnt.hpp
- copied unchanged from r51526, /sandbox/boost/numeric/bindings/traits/tnt.hpp
sandbox/numeric_bindings/boost/numeric/bindings/traits/traits.hpp
- copied unchanged from r51526, /sandbox/boost/numeric/bindings/traits/traits.hpp
sandbox/numeric_bindings/boost/numeric/bindings/traits/transpose.hpp
- copied unchanged from r51526, /sandbox/boost/numeric/bindings/traits/transpose.hpp
sandbox/numeric_bindings/boost/numeric/bindings/traits/type.h
- copied unchanged from r51526, /sandbox/boost/numeric/bindings/traits/type.h
sandbox/numeric_bindings/boost/numeric/bindings/traits/type.hpp
- copied unchanged from r51526, /sandbox/boost/numeric/bindings/traits/type.hpp
sandbox/numeric_bindings/boost/numeric/bindings/traits/type_traits.hpp
- copied unchanged from r51526, /sandbox/boost/numeric/bindings/traits/type_traits.hpp
sandbox/numeric_bindings/boost/numeric/bindings/traits/ublas_banded.hpp
- copied unchanged from r51526, /sandbox/boost/numeric/bindings/traits/ublas_banded.hpp
sandbox/numeric_bindings/boost/numeric/bindings/traits/ublas_hermitian.hpp
- copied unchanged from r51526, /sandbox/boost/numeric/bindings/traits/ublas_hermitian.hpp
sandbox/numeric_bindings/boost/numeric/bindings/traits/ublas_matrix.hpp
- copied unchanged from r51526, /sandbox/boost/numeric/bindings/traits/ublas_matrix.hpp
sandbox/numeric_bindings/boost/numeric/bindings/traits/ublas_sparse.hpp
- copied unchanged from r51526, /sandbox/boost/numeric/bindings/traits/ublas_sparse.hpp
sandbox/numeric_bindings/boost/numeric/bindings/traits/ublas_symmetric.hpp
- copied unchanged from r51526, /sandbox/boost/numeric/bindings/traits/ublas_symmetric.hpp
sandbox/numeric_bindings/boost/numeric/bindings/traits/ublas_vector.hpp
- copied unchanged from r51526, /sandbox/boost/numeric/bindings/traits/ublas_vector.hpp
sandbox/numeric_bindings/boost/numeric/bindings/traits/ublas_vector2.hpp
- copied unchanged from r51526, /sandbox/boost/numeric/bindings/traits/ublas_vector2.hpp
sandbox/numeric_bindings/boost/numeric/bindings/traits/vector_raw.hpp
- copied unchanged from r51526, /sandbox/boost/numeric/bindings/traits/vector_raw.hpp
sandbox/numeric_bindings/boost/numeric/bindings/traits/vector_traits.hpp
- copied unchanged from r51526, /sandbox/boost/numeric/bindings/traits/vector_traits.hpp
sandbox/numeric_bindings/libs/numeric/bindings/atlas/
- copied from r51526, /sandbox/libs/numeric/bindings/atlas/
sandbox/numeric_bindings/libs/numeric/bindings/blas/
- copied from r51526, /sandbox/libs/numeric/bindings/blas/
sandbox/numeric_bindings/libs/numeric/bindings/lapack/
- copied from r51526, /sandbox/libs/numeric/bindings/lapack/
sandbox/numeric_bindings/libs/numeric/bindings/mumps/
- copied from r51526, /sandbox/libs/numeric/bindings/mumps/
sandbox/numeric_bindings/libs/numeric/bindings/traits/
- copied from r51526, /sandbox/libs/numeric/bindings/traits/
sandbox/numeric_bindings/libs/numeric/bindings/umfpack/
- copied from r51526, /sandbox/libs/numeric/bindings/umfpack/
Removed:
sandbox/numeric_bindings/libs/numeric/bindings/mumps/test/makefile
Text files modified:
sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_hegv.cpp | 8 ++++----
sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_syev.cpp | 20 ++++++++++++++++++++
sandbox/numeric_bindings/libs/numeric/bindings/traits/doc/index.html | 4 ----
3 files changed, 24 insertions(+), 8 deletions(-)
Modified: sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_hegv.cpp
==============================================================================
--- /sandbox/libs/numeric/bindings/lapack/test/ublas_hegv.cpp (original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_hegv.cpp 2009-03-02 10:47:11 EST (Mon, 02 Mar 2009)
@@ -137,11 +137,11 @@
std::cout << "double\n" ;
if (do_value_type<double>()) return 255;
- std::cout << "complex<float>\n" ;
- if (do_value_type< std::complex<float> >()) return 255;
+// std::cout << "complex<float>\n" ;
+// if (do_value_type< std::complex<float> >()) return 255;
- std::cout << "complex<double>\n" ;
- if (do_value_type< std::complex<double> >()) return 255;
+// std::cout << "complex<double>\n" ;
+// if (do_value_type< std::complex<double> >()) return 255;
std::cout << "Regression test succeeded\n" ;
return 0;
Modified: sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_syev.cpp
==============================================================================
--- /sandbox/libs/numeric/bindings/lapack/test/ublas_syev.cpp (original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_syev.cpp 2009-03-02 10:47:11 EST (Mon, 02 Mar 2009)
@@ -10,6 +10,7 @@
#include <boost/numeric/bindings/lapack/syev.hpp>
#include <boost/numeric/bindings/traits/ublas_matrix.hpp>
+#include <boost/numeric/bindings/traits/ublas_symmetric.hpp>
#include <boost/numeric/bindings/traits/ublas_vector.hpp>
#include <boost/numeric/ublas/matrix_proxy.hpp>
#include <boost/numeric/ublas/vector_proxy.hpp>
@@ -21,6 +22,19 @@
namespace ublas = boost::numeric::ublas;
namespace lapack = boost::numeric::bindings::lapack;
+template <char UPLO>
+struct translate_uplo {
+} ;
+
+template <>
+struct translate_uplo<'U'> {
+ typedef ublas::upper_tag type ;
+} ;
+
+template <>
+struct translate_uplo<'L'> {
+ typedef ublas::lower_tag type ;
+} ;
template <typename T, typename W, char UPLO>
int do_memory_uplo(int n, W& workspace ) {
@@ -59,6 +73,12 @@
matrix_range a2_r( a2, r, r );
if (check_residual( a2_r, e_r, a_r )) return 255 ;
+ // Test for symmetric_adaptor
+ fill( a ); a2.assign( a );
+ ublas::symmetric_adaptor< matrix_type, typename translate_uplo<UPLO>::type > a_uplo( a ) ;
+ lapack::syev( 'V', a_uplo, e1, workspace ) ;
+ if (check_residual( a2, e1, a )) return 255 ;
+
return 0 ;
} // do_memory_uplo()
Deleted: /sandbox/libs/numeric/bindings/mumps/test/makefile
==============================================================================
--- /sandbox/libs/numeric/bindings/mumps/test/makefile 2009-03-02 10:47:11 EST (Mon, 02 Mar 2009)
+++ (empty file)
@@ -1,18 +0,0 @@
-CXXFLAGS = -I/home/karlm/local_disk/svn/glas/trunk/glas -I/home/karlm/local_disk/svn/boost/ -I/home/karlm/local_disk/svn/boost-sandbox/ -I/home/karlm/local_disk/ext/mumps/MUMPS_4.6.4/include
-LDFLAGS =
-LIBS = -L/home/karlm/local_disk/svn/glas/trunk/glas/libs/ -lglas -L/home/karlm/local_disk/svn/boost/libs/ -lboost_programoptions -lboost_system -lboost_filesystem -L/home/karlm/local_disk/ext/mumps/MUMPS_4.6.4/lib -lsmumps -lcmumps -ldmumps -lzmumps -lpord -L/home/karlm/local_disk/ext/mumps/MUMPS_4.6.4/libseq -lmpiseq -lpthread -L/home/karlm/local_disk/ext/lapack/ -llapack-gfortran.4.2 -llapack_tools-gfortran.4.2 -L/home/karlm/local_disk/ext/lib -lf77blas -latlas -lg2c -L/cw/cc/gcc/lib -lstdc++ -lgfortran
-
-MUMPS_UBLAS_DEPS =
-
-mumps_ublas_d.o : mumps_ublas.cpp $(MUMPS_UBLAS_DEPS)
- @/cw/cc/gcc/bin/g++-4.2 -c -g $(CXXFLAGS) -o mumps_ublas_d.o mumps_ublas.cpp
-
-mumps_ublas.o : mumps_ublas.cpp $(MUMPS_UBLAS_DEPS)
- @/cw/cc/gcc/bin/g++-4.2 -c -DNDEBUG -O3 $(CXXFLAGS) -o mumps_ublas.o mumps_ublas.cpp
-
-
-mumps_ublas_d: mumps_ublas_d.o
- @/cw/cc/gcc/bin/g++-4.2 -o mumps_ublas_d $(LDFLAGS) mumps_ublas_d.o $(LIBS)
-
-mumps_ublas: mumps_ublas.o
- @/cw/cc/gcc/bin/g++-4.2 -o mumps_ublas $(LDFLAGS) mumps_ublas.o $(LIBS)
Modified: sandbox/numeric_bindings/libs/numeric/bindings/traits/doc/index.html
==============================================================================
--- /sandbox/libs/numeric/bindings/traits/doc/index.html (original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/traits/doc/index.html 2009-03-02 10:47:11 EST (Mon, 02 Mar 2009)
@@ -377,7 +377,6 @@
<tr><th>Name<th>Expression<th>Semantics
<tr><td>Beginning of storage<td><code>storage(m)</code><td>Returns a pointer to the
beginning of the storage of matrix <code>m</code>
-<tr><td>Size of storage<td><code>storage_size(m)</code><td>Returns the size of the storage
<tr><td>Number of rows<td><code>num_rows(m)</code><td>Returns the number of rows of matrix <code>m</code>
<tr><td>Number of columns<td><code>num_columns(m)</code><td>Returns the number of
columns matrix <code>m</code>
@@ -433,7 +432,6 @@
}
static std::ptrdiff_t num_rows (MType& m) { return m.size1(); }
static std::ptrdiff_t num_columns (MType& m) { return m.size2(); }
- static std::ptrdiff_t storage_size (MType& m) { return num_rows (m) * size2 (m); }
static std::ptrdiff_t leading_dimension (MType& m) { return F::size2 (m.size1(), m.size2()); }
static std::ptrdiff_t stride1 (MType& m) { return F::one1 (m.size1(), m.size2()); }
@@ -484,7 +482,6 @@
}
static std::ptrdiff_t num_rows (MType& sm) { return sm.size1(); }
static std::ptrdiff_t num_columns (MType& sm) { return sm.size2(); }
- static std::ptrdiff_t storage_size (MType& sm) { return (num_rows (sm) + 1) * num_columns (sm) / 2; }
};
</pre>
@@ -635,7 +632,6 @@
<tr><th>Expression<th>Semantics
<tr><td><code>matrix_storage(m)</code><td>Returns a pointer to the
beginning of the storage of matrix <code>m</code>
-<tr><td><code>matrix_storage_size(m)</code><td>Returns the size of the storage
<tr><td><code>matrix_num_rows(m)</code><td>Returns the number of rows of matrix <code>m</code>
<tr><td><code>matrix_num_columns(m)</code><td>Returns the number of
columns matrix <code>m</code>
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