2013-07-17 19:24:07 +02:00
|
|
|
/*******************************************************************************
|
|
|
|
|
*
|
|
|
|
|
* TRIQS: a Toolbox for Research in Interacting Quantum Systems
|
|
|
|
|
*
|
|
|
|
|
* Copyright (C) 2011 by O. Parcollet
|
|
|
|
|
*
|
|
|
|
|
* TRIQS is free software: you can redistribute it and/or modify it under the
|
|
|
|
|
* terms of the GNU General Public License as published by the Free Software
|
|
|
|
|
* Foundation, either version 3 of the License, or (at your option) any later
|
|
|
|
|
* version.
|
|
|
|
|
*
|
|
|
|
|
* TRIQS is distributed in the hope that it will be useful, but WITHOUT ANY
|
|
|
|
|
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
|
|
|
|
|
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
|
|
|
|
|
* details.
|
|
|
|
|
*
|
|
|
|
|
* You should have received a copy of the GNU General Public License along with
|
|
|
|
|
* TRIQS. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
|
*
|
|
|
|
|
******************************************************************************/
|
|
|
|
|
#include "./common.hpp"
|
Fix matrix * alias issue and adapt det_manip
- The previous version of the * operator for matrix was too clever.
It was giving a lazy object and then rewriting C = A *B into gemm (a,A,B,0,C).
The pb was in case of aliasing : when e.g. C = A, or is a part of A.
gemm is not correct that case, and as a result generic code like
a = a *b
may not be correct in matrix case, which is unacceptable.
- So we revert to a simple * operator for matrix
that does immediate computation.
Same thing for matrix* vector
- we also suppress a_x_ty class.
-> for M = a * b,
when M is a matrix, there is no overhead due to move assignment
-> however, when M is a view, there is an additionnal copy.
-Correctness comes first, hence the fix.
However, if one wants more speed and one can guarantee that
there is no aliasing possible, then one has to write a direct gemm call.
-> det_manip class was adapted, since in that case, we can show there
no alias, and we want the speed gain, so the * ops where replaced
by direct blas call (using the array blas interface).
-> also gemm, gemv, ger were overloaded in the case the return
matrix/vector (i.e. last parameter of the function) is not an lvalue,
but a temporary view created on the fly.
2013-09-10 21:41:17 +02:00
|
|
|
#include <triqs/arrays.hpp>
|
2013-07-17 19:24:07 +02:00
|
|
|
#include <iostream>
|
|
|
|
|
using namespace triqs::arrays;
|
|
|
|
|
|
|
|
|
|
template<typename T, typename O1, typename O2, typename O3> void test(O1 o1, O2 o2, O3 o3,bool all =false) {
|
|
|
|
|
matrix<T> M1(2,3, o1);
|
|
|
|
|
matrix<T> M2(3,4, o2);
|
|
|
|
|
matrix<T> M3(o3), M4;
|
|
|
|
|
for (int i =0; i<2; ++i)
|
|
|
|
|
for (int j=0; j<3; ++j)
|
|
|
|
|
{ M1(i,j) = i +j ; }
|
|
|
|
|
for (int i =0; i<3; ++i)
|
|
|
|
|
for (int j=0; j<4; ++j)
|
|
|
|
|
{ M2(i,j) = 1 + i -j ; }
|
|
|
|
|
|
Fix matrix * alias issue and adapt det_manip
- The previous version of the * operator for matrix was too clever.
It was giving a lazy object and then rewriting C = A *B into gemm (a,A,B,0,C).
The pb was in case of aliasing : when e.g. C = A, or is a part of A.
gemm is not correct that case, and as a result generic code like
a = a *b
may not be correct in matrix case, which is unacceptable.
- So we revert to a simple * operator for matrix
that does immediate computation.
Same thing for matrix* vector
- we also suppress a_x_ty class.
-> for M = a * b,
when M is a matrix, there is no overhead due to move assignment
-> however, when M is a view, there is an additionnal copy.
-Correctness comes first, hence the fix.
However, if one wants more speed and one can guarantee that
there is no aliasing possible, then one has to write a direct gemm call.
-> det_manip class was adapted, since in that case, we can show there
no alias, and we want the speed gain, so the * ops where replaced
by direct blas call (using the array blas interface).
-> also gemm, gemv, ger were overloaded in the case the return
matrix/vector (i.e. last parameter of the function) is not an lvalue,
but a temporary view created on the fly.
2013-09-10 21:41:17 +02:00
|
|
|
M3 = M1 * M2; //matmul(M1,M2);
|
2013-07-17 19:24:07 +02:00
|
|
|
|
|
|
|
|
M4 = M3;
|
|
|
|
|
M4() = 0;
|
|
|
|
|
for (int i =0; i<2; ++i)
|
|
|
|
|
for (int k=0; k<3; ++k)
|
|
|
|
|
for (int j=0; j<4; ++j)
|
|
|
|
|
M4(i,j) += M1(i,k)*M2(k,j);
|
|
|
|
|
assert_all_close(M4,M3, 1.e-13,false);
|
|
|
|
|
|
|
|
|
|
// recheck gemm_generic
|
|
|
|
|
blas::gemm_generic(1, M1, M2, 0, M4);
|
|
|
|
|
assert_all_close(M4,M3, 1.e-13,false);
|
|
|
|
|
|
|
|
|
|
if (all) {
|
|
|
|
|
std::cerr<<"M1 = "<<M1<<std::endl;
|
|
|
|
|
std::cerr<<"M2 = "<<M2<<std::endl;
|
|
|
|
|
std::cerr<<"M3 = "<<M3<<std::endl;
|
Fix matrix * alias issue and adapt det_manip
- The previous version of the * operator for matrix was too clever.
It was giving a lazy object and then rewriting C = A *B into gemm (a,A,B,0,C).
The pb was in case of aliasing : when e.g. C = A, or is a part of A.
gemm is not correct that case, and as a result generic code like
a = a *b
may not be correct in matrix case, which is unacceptable.
- So we revert to a simple * operator for matrix
that does immediate computation.
Same thing for matrix* vector
- we also suppress a_x_ty class.
-> for M = a * b,
when M is a matrix, there is no overhead due to move assignment
-> however, when M is a view, there is an additionnal copy.
-Correctness comes first, hence the fix.
However, if one wants more speed and one can guarantee that
there is no aliasing possible, then one has to write a direct gemm call.
-> det_manip class was adapted, since in that case, we can show there
no alias, and we want the speed gain, so the * ops where replaced
by direct blas call (using the array blas interface).
-> also gemm, gemv, ger were overloaded in the case the return
matrix/vector (i.e. last parameter of the function) is not an lvalue,
but a temporary view created on the fly.
2013-09-10 21:41:17 +02:00
|
|
|
std::cerr<<"M4 = "<< M1*M2 <<std::endl;
|
|
|
|
|
std::cerr<<"M5 = "<< M1*M2 <<std::endl;
|
2013-07-17 19:24:07 +02:00
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
template<typename T> void all_tests() {
|
|
|
|
|
test<T>(C_LAYOUT , C_LAYOUT , C_LAYOUT , true);
|
|
|
|
|
test<T>(C_LAYOUT , C_LAYOUT , FORTRAN_LAYOUT);
|
|
|
|
|
test<T>(C_LAYOUT , FORTRAN_LAYOUT, FORTRAN_LAYOUT);
|
|
|
|
|
test<T>(C_LAYOUT , FORTRAN_LAYOUT, C_LAYOUT );
|
|
|
|
|
test<T>(FORTRAN_LAYOUT, FORTRAN_LAYOUT, FORTRAN_LAYOUT);
|
|
|
|
|
test<T>(FORTRAN_LAYOUT, C_LAYOUT , FORTRAN_LAYOUT);
|
|
|
|
|
test<T>(FORTRAN_LAYOUT, FORTRAN_LAYOUT, C_LAYOUT );
|
|
|
|
|
test<T>(FORTRAN_LAYOUT, C_LAYOUT , C_LAYOUT );
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int main(int argc, char **argv) {
|
|
|
|
|
all_tests<double>();
|
|
|
|
|
all_tests<std::complex<double>>();
|
|
|
|
|
all_tests<long>();
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|