mirror of
https://github.com/triqs/dft_tools
synced 2024-12-27 23:03:51 +01:00
b534936589
- 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.
51 lines
1.4 KiB
C++
51 lines
1.4 KiB
C++
/*******************************************************************************
|
|
*
|
|
* 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"
|
|
#include <triqs/arrays.hpp>
|
|
#include <iostream>
|
|
using namespace triqs::arrays;
|
|
|
|
int main(int argc, char **argv) {
|
|
|
|
#ifndef TRIQS_WORKAROUND_INTEL_COMPILER_BUGS
|
|
|
|
matrix<double> C, A= {{ 1.0,2.3}, {3.1,4.3}};
|
|
matrix<int> B= {{ 1,2}, {3,4}};
|
|
matrix<double> Bd= {{ 1,2}, {3,4}};
|
|
|
|
C = A*B;
|
|
std::cout << C<< std::endl ;
|
|
|
|
C = A*Bd;
|
|
std::cout << C<< std::endl ;
|
|
|
|
// check A*B is indeed in double...
|
|
//static_assert( std::is_same<decltype(A*B), matrix<double>>::value, "oops");
|
|
|
|
assert_all_close(A*B, A*Bd, 1.e-13);
|
|
|
|
#endif
|
|
|
|
return 0;
|
|
}
|
|
|
|
|