boost/ublas
2
0
Fork 0
mirror of https://github.com/boostorg/ublas.git synced 2026-02-22 03:42:19 +00:00
Code Issues Projects Releases Wiki Activity

Many bugfixes and improvements, especially related to sparse matrices.

Browse Source 
Thanks namely to Kresimir Fresl and Michael Stevens this time.
This commit is contained in:
Jörg Walter
2002-11-10 10:38:54 +00:00
parent 36bd1471d6
commit d4535394ee
72 changed files with 5430 additions and 6236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
bench2/bench22.cpp
View File

@@ -333,6 +333,7 @@ void bench_2<T, N>::operator () (int runs) {
header ("C array");
bench_c_outer_prod<T, N> () (runs);
#ifdef USE_SPARSE_MATRIX
#ifdef USE_MAP_ARRAY
header ("sparse_matrix<map_array>, sparse_vector<map_array> safe");
bench_my_outer_prod<ublas::sparse_matrix<T, ublas::row_major, ublas::map_array<std::size_t, T> >,
@@ -352,24 +353,46 @@ void bench_2<T, N>::operator () (int runs) {
bench_my_outer_prod<ublas::sparse_matrix<T, ublas::row_major, std::map<std::size_t, T> >,
ublas::sparse_vector<T, std::map<std::size_t, T> >, N> () (runs, fast_tag ());
#endif
#endif
#ifdef USE_COMPRESSED_MATRIX
header ("compressed_matrix, compressed_vector safe");
bench_my_outer_prod<ublas::compressed_matrix<T, ublas::row_major>,
ublas::compressed_vector<T>, N> () (runs, safe_tag ());
header ("compressed_matrix, compressed_vector fast");
bench_my_outer_prod<ublas::compressed_matrix<T, ublas::row_major>,
ublas::compressed_vector<T>, N> () (runs, fast_tag ());
#endif
#ifdef USE_COORDINATE_MATRIX
header ("coordinate_matrix, coordinate_vector safe");
bench_my_outer_prod<ublas::coordinate_matrix<T, ublas::row_major>,
ublas::coordinate_vector<T>, N> () (runs, safe_tag ());
header ("coordinate_matrix, coordinate_vector fast");
bench_my_outer_prod<ublas::coordinate_matrix<T, ublas::row_major>,
ublas::coordinate_vector<T>, N> () (runs, fast_tag ());
#endif
#ifdef USE_STD_VALARRAY
header ("std::valarray");
bench_cpp_outer_prod<std::valarray<T>, std::valarray<T>, N> () (runs);
#endif
header ("prod (sparse_matrix, sparse_vector)");
header ("prod (matrix, vector)");
header ("C array");
bench_c_matrix_vector_prod<T, N> () (runs);
#ifdef USE_SPARSE_MATRIX
#ifdef USE_MAP_ARRAY
header ("sparse_matrix<map_array>, sparse_vector<map_array> safe");
bench_my_matrix_vector_prod<ublas::sparse_matrix<T, ublas::row_major, ublas::map_array<std::size_t, T> >,
ublas::sparse_vector<T, ublas::map_array<std::size_t, T> >, N> () (runs, safe_tag ());
header ("sparse_matrix<map_array>, sparse_vector<map_array> fast");
bench_my_matrix_vector_prod<ublas::sparse_matrix<T, ublas::row_major, ublas::map_array<std::size_t, T> >,
bench_my_matrix_vector_prod<ublas::sparse_matrix<T, ublas::row_major, ublas::map_array<std::size_t, T> >,
ublas::sparse_vector<T, ublas::map_array<std::size_t, T> >, N> () (runs, fast_tag ());
#endif
@@ -379,20 +402,42 @@ void bench_2<T, N>::operator () (int runs) {
ublas::sparse_vector<T, std::map<std::size_t, T> >, N> () (runs, safe_tag ());
header ("sparse_matrix<std::map>, sparse_vector<std::map> fast");
bench_my_matrix_vector_prod<ublas::sparse_matrix<T, ublas::row_major, std::map<std::size_t, T> >,
bench_my_matrix_vector_prod<ublas::sparse_matrix<T, ublas::row_major, std::map<std::size_t, T> >,
ublas::sparse_vector<T, std::map<std::size_t, T> >, N> () (runs, fast_tag ());
#endif
#endif
#ifdef USE_COMPRESSED_MATRIX
header ("compressed_matrix, compressed_vector safe");
bench_my_matrix_vector_prod<ublas::compressed_matrix<T, ublas::row_major>,
ublas::compressed_vector<T>, N> () (runs, safe_tag ());
header ("compressed_matrix, compressed_vector fast");
bench_my_matrix_vector_prod<ublas::compressed_matrix<T, ublas::row_major>,
ublas::compressed_vector<T>, N> () (runs, fast_tag ());
#endif
#ifdef USE_COORDINATE_MATRIX
header ("coordinate_matrix, coordinate_vector safe");
bench_my_matrix_vector_prod<ublas::coordinate_matrix<T, ublas::row_major>,
ublas::coordinate_vector<T>, N> () (runs, safe_tag ());
header ("coordinate_matrix, coordinate_vector fast");
bench_my_matrix_vector_prod<ublas::coordinate_matrix<T, ublas::row_major>,
ublas::coordinate_vector<T>, N> () (runs, fast_tag ());
#endif
#ifdef USE_STD_VALARRAY
header ("std::valarray");
bench_cpp_matrix_vector_prod<std::valarray<T>, std::valarray<T>, N> () (runs);
#endif
header ("sparse_matrix + sparse_matrix");
header ("matrix + matrix");
header ("C array");
bench_c_matrix_add<T, N> () (runs);
#ifdef USE_SPARSE_MATRIX
#ifdef USE_MAP_ARRAY
header ("sparse_matrix<map_array> safe");
bench_my_matrix_add<ublas::sparse_matrix<T, ublas::row_major, ublas::map_array<std::size_t, T> >, N> () (runs, safe_tag ());
@@ -408,6 +453,23 @@ void bench_2<T, N>::operator () (int runs) {
header ("sparse_matrix<std::map> fast");
bench_my_matrix_add<ublas::sparse_matrix<T, ublas::row_major, std::map<std::size_t, T> >, N> () (runs, fast_tag ());
#endif
#endif
#ifdef USE_COMPRESSED_MATRIX
header ("compressed_matrix safe");
bench_my_matrix_add<ublas::compressed_matrix<T, ublas::row_major>, N> () (runs, safe_tag ());
header ("compressed_matrix fast");
bench_my_matrix_add<ublas::compressed_matrix<T, ublas::row_major>, N> () (runs, fast_tag ());
#endif
#ifdef USE_COORDINATE_MATRIX
header ("coordinate_matrix safe");
bench_my_matrix_add<ublas::coordinate_matrix<T, ublas::row_major>, N> () (runs, safe_tag ());
header ("coordinate_matrix fast");
bench_my_matrix_add<ublas::coordinate_matrix<T, ublas::row_major>, N> () (runs, fast_tag ());
#endif
#ifdef USE_STD_VALARRAY
header ("std::valarray");
@@ -415,28 +477,34 @@ void bench_2<T, N>::operator () (int runs) {
#endif
}
#ifdef USE_FLOAT
template struct bench_2<float, 3>;
template struct bench_2<float, 10>;
template struct bench_2<float, 30>;
template struct bench_2<float, 100>;
#endif
#ifdef USE_DOUBLE
template struct bench_2<double, 3>;
template struct bench_2<double, 10>;
template struct bench_2<double, 30>;
template struct bench_2<double, 100>;
#endif
#ifdef USE_STD_COMPLEX
#ifdef USE_FLOAT
template struct bench_2<std::complex<float>, 3>;
template struct bench_2<std::complex<float>, 10>;
template struct bench_2<std::complex<float>, 30>;
template struct bench_2<std::complex<float>, 100>;
#endif
#ifdef USE_DOUBLE
template struct bench_2<std::complex<double>, 3>;
template struct bench_2<std::complex<double>, 10>;
template struct bench_2<std::complex<double>, 30>;
template struct bench_2<std::complex<double>, 100>;
#endif
#endif