LCPQ/dft_tools
3
0
Fork 0
mirror of https://github.com/triqs/dft_tools synced 2024-10-31 11:13:46 +01:00
Code Issues Releases Wiki Activity

arrays : rm linalg/determinant and inverse (links)

Browse Source 
It is clearer to have only one file :
det_and_inverse.hpp
changed the included in tests.
This commit is contained in:
Olivier Parcollet 2013-08-22 11:41:17 +02:00
parent 017394e17f
commit c8fcb40164
14 changed files with 18 additions and 394 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/speed/array1.cpp
View File

@ -22,8 +22,8 @@
#include <triqs/arrays/array.hpp>
#include <triqs/arrays/linalg/matmul.hpp>
#include <triqs/arrays/linalg/mat_vec_mul.hpp>
#include <triqs/arrays/linalg/inverse.hpp>
#include <triqs/arrays/linalg/determinant.hpp>
#include <triqs/arrays/linalg/det_and_inverse.hpp>
#include <triqs/arrays/linalg/det_and_inverse.hpp>
using namespace triqs::arrays;
using namespace triqs;

4
test/speed/array_short1.cpp
View File

@ -22,8 +22,8 @@
#include <triqs/arrays/array.hpp>
#include <triqs/arrays/linalg/matmul.hpp>
#include <triqs/arrays/linalg/mat_vec_mul.hpp>
#include <triqs/arrays/linalg/inverse.hpp>
#include <triqs/arrays/linalg/determinant.hpp>
#include <triqs/arrays/linalg/det_and_inverse.hpp>
#include <triqs/arrays/linalg/det_and_inverse.hpp>
using namespace triqs::arrays;
using namespace triqs;

4
test/triqs/arrays/a_x_ty.cpp
View File

@ -26,8 +26,8 @@
#include "./src/matrix.hpp"
#include "./src/linalg/matmul.hpp"
#include "./src/linalg/mat_vec_mul.hpp"
#include "./src/linalg/inverse.hpp"
#include "./src/linalg/determinant.hpp"
#include "./src/linalg/det_and_inverse.hpp"
#include "./src/linalg/det_and_inverse.hpp"
#include "./src/linalg/a_x_ty.hpp"
#include "./src/blas_lapack/dot.hpp"

4
test/triqs/arrays/blas_lapack.cpp
View File

@ -25,8 +25,8 @@
#include "./src/matrix.hpp"
#include "./src/linalg/matmul.hpp"
#include "./src/linalg/mat_vec_mul.hpp"
#include "./src/linalg/inverse.hpp"
#include "./src/linalg/determinant.hpp"
#include "./src/linalg/det_and_inverse.hpp"
#include "./src/linalg/det_and_inverse.hpp"
#include "./src/blas_lapack/gemm.hpp"
#include "./src/blas_lapack/gemv.hpp"

4
test/triqs/arrays/mat_vec_mul.cpp
View File

@ -23,8 +23,8 @@
#include "./src/array.hpp"
#include "./src/vector.hpp"
#include "./src/matrix.hpp"
#include "./src/linalg/inverse.hpp"
#include "./src/linalg/determinant.hpp"
#include "./src/linalg/det_and_inverse.hpp"
#include "./src/linalg/det_and_inverse.hpp"
#include <iostream>
using std::cout; using std::endl;

4
test/triqs/arrays/mat_vec_mul2.cpp
View File

@ -24,8 +24,8 @@
#include "./src/vector.hpp"
#include "./src/matrix.hpp"
#include "./src/asserts.hpp"
#include "./src/linalg/inverse.hpp"
#include "./src/linalg/determinant.hpp"
#include "./src/linalg/det_and_inverse.hpp"
#include "./src/linalg/det_and_inverse.hpp"
#include <iostream>
using std::cout; using std::endl;

3
triqs/arrays.hpp
View File

@ -34,8 +34,7 @@
#include <triqs/arrays/h5/simple_read_write.hpp>
// Linear algebra ?? Keep here ?
//#include <triqs/arrays/linalg/inverse.hpp>
//#include <triqs/arrays/linalg/determinant.hpp>
//#include <triqs/arrays/linalg/det_and_inverse.hpp>
#endif

2
triqs/arrays/expression_template/matrix_algebra.hpp
View File

@ -24,7 +24,7 @@
#include "../matrix.hpp"
#include "../linalg/matmul.hpp"
#include "../linalg/mat_vec_mul.hpp"
#include "../linalg/inverse.hpp"
#include "../linalg/det_and_inverse.hpp"
namespace triqs { namespace arrays {
template<typename Tag, typename L, typename R, bool scalar_are_diagonal_matrices= false>

2
triqs/arrays/linalg/det_and_inverse.hpp
View File

@ -111,7 +111,7 @@ namespace triqs { namespace arrays {
// an implementation class to gather the common part to matrix and expression....
template<typename A> struct inverse_lazy_impl : TRIQS_MODEL_CONCEPT(ImmutableMatrix) {
typedef typename boost::remove_const<typename A::value_type>::type value_type;
typedef typename std::remove_const<typename A::value_type>::type value_type;
typedef typename A::domain_type domain_type;
typedef typename domain_type::index_value_type index_value_type;
typedef typename const_view_type_if_exists_else_type<A>::type A_type;

187
triqs/arrays/linalg/determinant.hpp
View File

@ -1,187 +0,0 @@
/*******************************************************************************
*
* 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/>.
*
******************************************************************************/
#ifndef TRIQS_ARRAYS_LINALG_DET_INV_H
#define TRIQS_ARRAYS_LINALG_DET_INV_H
#include <boost/type_traits/is_same.hpp>
#include <boost/typeof/typeof.hpp>
#include <boost/utility/enable_if.hpp>
#include "../impl/common.hpp"
#include "../matrix.hpp"
#include "../blas_lapack/getrf.hpp"
#include "../blas_lapack/getri.hpp"
namespace triqs { namespace arrays {
/// Error which occurs during the matrix inversion
class matrix_inverse_exception : public triqs::runtime_error {};
/**
* Lazy result of inverse(M) where M can be :
* * a matrix, a matrix_view
* * any matrix expression
* The object is lazy, it does not do any computation.
* It can be copied at no cost
* It keeps view of the object A if it a matrix, a copy if it is a formal expression.
*/
template<typename A, class Enable = void> struct inverse_lazy;
///
template<typename A> struct determinant_lazy;
/// Lazy inversion
template<class A> inverse_lazy<A> inverse (A const & a) { return inverse_lazy<A>(a); }
/// Lazy computation of det
template<typename A> determinant_lazy<A> determinant (A const & a) { return determinant_lazy<A>(a); }
// ----------------- implementation -----------------------------------------
//worker takes a contiguous view and compute the det and inverse in two steps.
//it is separated in case of multiple use (no reallocation of ipvi, etc...)
//NB a view does not resize, only its elements can be changed
template<typename ViewType> class det_and_inverse_worker {
static_assert ( (is_matrix_view<ViewType>::value),"class must have be a view");
typedef typename ViewType::value_type VT;
typedef matrix_view<VT> V_type;
ViewType V;
const size_t dim;
triqs::arrays::vector <int> ipiv;
short step;
public:
det_and_inverse_worker (ViewType const & a): V(a), dim(a.dim0()), ipiv(dim), step(0) {
if (a.dim0()!=a.dim1())
TRIQS_RUNTIME_ERROR<<"Inverse/Det error : non-square matrix. Dimensions are : ("<<a.dim0()<<","<<a.dim1()<<")"<<"\n ";
if (!(has_contiguous_data(a))) TRIQS_RUNTIME_ERROR<<"det_and_inverse_worker only takes a contiguous view";
}
VT det() { V_type W = fortran_view(V); _step1(W); _compute_det(W); return _det;}
ViewType const & inverse() { if (step<2) { V_type W = fortran_view(V); _step1(W); _step2(W);} return V;}
private:
int info; VT _det;
// no need of special traversal
template<typename MT> V_type fortran_view (MT const &x) { return (x.indexmap().memory_layout_is_c() ? x.transpose() : x);}
void _step1(V_type & W) {
if (step >0) return;
step=1;
info = lapack::getrf(W, ipiv);
if (info<0) throw matrix_inverse_exception() << "Inverse/Det error : failure of getrf lapack routine ";
}
void _compute_det(V_type const & W) {
if (step>1) return;
_det =1;
for (size_t i =0; i<dim; i++) _det *= W(i,i);
bool flip=false;// compute the sign of the permutation
for (size_t i=0; i<dim; i++) {if (ipiv(i)!=int(i)+1) flip = !(flip);}
_det= (flip ? - _det : _det) ;
}
void _step2(V_type & W) {
assert(step==1); //if (step==1) return;
step=2;
_compute_det(W);
info = lapack::getri(W, ipiv);
if (info!=0) throw matrix_inverse_exception() << "Inverse/Det error : matrix is not invertible";
}
};
//-----------------------------------------------------------
// an implementation class to gather the common part to matrix and expression....
template<typename A> struct inverse_lazy_impl : TRIQS_MODEL_CONCEPT(ImmutableMatrix) {
typedef typename boost::remove_const<typename A::value_type>::type value_type;
typedef typename A::domain_type domain_type;
typedef typename domain_type::index_value_type index_value_type;
typedef typename const_view_type_if_exists_else_type<A>::type A_type;
const A_type a;
inverse_lazy_impl(A const & a_):a (a_) {
if (a.dim0() != a.dim1()) TRIQS_RUNTIME_ERROR<< "Inverse : matrix is not square but of size "<< a.dim0()<<" x "<< a.dim1();
}
domain_type domain() const { return a.domain(); }
size_t dim0() const { return a.dim0();}
size_t dim1() const { return a.dim1();}
template<typename K0, typename K1> value_type operator() (K0 const & k0, K1 const & k1) const { activate(); return _id->M(k0,k1); }
friend std::ostream & operator<<(std::ostream & out,inverse_lazy_impl const&x){return out<<"inverse("<<x.a<<")";}
protected:
struct internal_data { // implementing the pattern LazyPreCompute
//typedef typename A_type::regular_type M_type;
typedef matrix<value_type> M_type;
typedef matrix_view<value_type> M_view_type;
M_type M;
internal_data(inverse_lazy_impl const & P):M(P.a){det_and_inverse_worker<M_view_type> worker(M); worker.inverse();}
};
friend struct internal_data;
mutable boost::shared_ptr<internal_data> _id;
void activate() const { if (!_id) _id= boost::make_shared<internal_data>(*this);}
};
// The general case
template<typename A>
struct inverse_lazy<A,typename boost::disable_if< is_matrix_or_view<A> >::type > : inverse_lazy_impl<A> {
inverse_lazy(A const & a):inverse_lazy_impl<A>(a) { }
};
// for matrix and matrix_views, we have more optimisation possible ....
template<typename A>
struct inverse_lazy<A,typename boost::enable_if< is_matrix_or_view<A> >::type >:inverse_lazy_impl<A>{
inverse_lazy(A const & a):inverse_lazy_impl<A>(a) { }
template<typename MT> // Optimized implementation of =
friend void triqs_arrays_assign_delegation (MT & lhs, inverse_lazy const & rhs) {
static_assert(is_matrix_or_view<MT>::value, "Internal error");
if ((lhs.indexmap().memory_indices_layout() !=rhs.a.indexmap().memory_indices_layout())||
(lhs.data_start() != rhs.a.data_start()) || !(has_contiguous_data(lhs))) { rhs.activate(); lhs = rhs._id->M;}
else {// if M = inverse(M) with the SAME object, then we do not need to copy the data
blas_lapack_tools::reflexive_qcache<MT> C(lhs);// a reflexive cache will use a temporary "regrouping" copy if and only if needed
det_and_inverse_worker<typename MT::view_type> W(C());// the worker to make the inversion of the lhs...
W.inverse(); // worker is working ...
}
}
friend std::ostream & operator<<(std::ostream & out,inverse_lazy const&x){return out<<"inverse("<<x.a<<")";}
};
//------------------- det ----------------------------------------
template<typename A> struct determinant_lazy { // : { Tag::expression_terminal, Tag::scalar_expression_terminal {
typedef typename A::value_type value_type;
typedef typename const_view_type_if_exists_else_type<A>::type A_type;
A_type a;
determinant_lazy(A const & a_):a(a_){}
operator value_type() { activate(); return _id->det; }
value_type const & operator()() { activate(); return _id->det; }
friend std::ostream & operator<<(std::ostream & out, determinant_lazy const & x){ return out<<"determinant("<<x.a<<")";}
protected:
struct internal_data {
typedef typename A_type::regular_type M_type;
M_type M; typename A::value_type det;
internal_data(determinant_lazy const & P):M(P.a){det_and_inverse_worker<A_type> worker(M); det = worker.det();}
};
friend struct internal_data;
mutable boost::shared_ptr<internal_data> _id;
void activate() const { if (!_id) _id= boost::make_shared<internal_data>(*this);}
};
}} // namespace triqs::arrays
#endif

187
triqs/arrays/linalg/inverse.hpp
View File

@ -1,187 +0,0 @@
/*******************************************************************************
*
* 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/>.
*
******************************************************************************/
#ifndef TRIQS_ARRAYS_LINALG_DET_INV_H
#define TRIQS_ARRAYS_LINALG_DET_INV_H
#include <boost/type_traits/is_same.hpp>
#include <boost/typeof/typeof.hpp>
#include <boost/utility/enable_if.hpp>
#include "../impl/common.hpp"
#include "../matrix.hpp"
#include "../blas_lapack/getrf.hpp"
#include "../blas_lapack/getri.hpp"
namespace triqs { namespace arrays {
/// Error which occurs during the matrix inversion
class matrix_inverse_exception : public triqs::runtime_error {};
/**
* Lazy result of inverse(M) where M can be :
* * a matrix, a matrix_view
* * any matrix expression
* The object is lazy, it does not do any computation.
* It can be copied at no cost
* It keeps view of the object A if it a matrix, a copy if it is a formal expression.
*/
template<typename A, class Enable = void> struct inverse_lazy;
///
template<typename A> struct determinant_lazy;
/// Lazy inversion
template<class A> inverse_lazy<A> inverse (A const & a) { return inverse_lazy<A>(a); }
/// Lazy computation of det
template<typename A> determinant_lazy<A> determinant (A const & a) { return determinant_lazy<A>(a); }
// ----------------- implementation -----------------------------------------
//worker takes a contiguous view and compute the det and inverse in two steps.
//it is separated in case of multiple use (no reallocation of ipvi, etc...)
//NB a view does not resize, only its elements can be changed
template<typename ViewType> class det_and_inverse_worker {
static_assert ( (is_matrix_view<ViewType>::value),"class must have be a view");
typedef typename ViewType::value_type VT;
typedef matrix_view<VT> V_type;
ViewType V;
const size_t dim;
triqs::arrays::vector <int> ipiv;
short step;
public:
det_and_inverse_worker (ViewType const & a): V(a), dim(a.dim0()), ipiv(dim), step(0) {
if (a.dim0()!=a.dim1())
TRIQS_RUNTIME_ERROR<<"Inverse/Det error : non-square matrix. Dimensions are : ("<<a.dim0()<<","<<a.dim1()<<")"<<"\n ";
if (!(has_contiguous_data(a))) TRIQS_RUNTIME_ERROR<<"det_and_inverse_worker only takes a contiguous view";
}
VT det() { V_type W = fortran_view(V); _step1(W); _compute_det(W); return _det;}
ViewType const & inverse() { if (step<2) { V_type W = fortran_view(V); _step1(W); _step2(W);} return V;}
private:
int info; VT _det;
// no need of special traversal
template<typename MT> V_type fortran_view (MT const &x) { return (x.indexmap().memory_layout_is_c() ? x.transpose() : x);}
void _step1(V_type & W) {
if (step >0) return;
step=1;
info = lapack::getrf(W, ipiv);
if (info<0) throw matrix_inverse_exception() << "Inverse/Det error : failure of getrf lapack routine ";
}
void _compute_det(V_type const & W) {
if (step>1) return;
_det =1;
for (size_t i =0; i<dim; i++) _det *= W(i,i);
bool flip=false;// compute the sign of the permutation
for (size_t i=0; i<dim; i++) {if (ipiv(i)!=int(i)+1) flip = !(flip);}
_det= (flip ? - _det : _det) ;
}
void _step2(V_type & W) {
assert(step==1); //if (step==1) return;
step=2;
_compute_det(W);
info = lapack::getri(W, ipiv);
if (info!=0) throw matrix_inverse_exception() << "Inverse/Det error : matrix is not invertible";
}
};
//-----------------------------------------------------------
// an implementation class to gather the common part to matrix and expression....
template<typename A> struct inverse_lazy_impl : TRIQS_MODEL_CONCEPT(ImmutableMatrix) {
typedef typename std::remove_const<typename A::value_type>::type value_type;
typedef typename A::domain_type domain_type;
typedef typename domain_type::index_value_type index_value_type;
typedef typename const_view_type_if_exists_else_type<A>::type A_type;
const A_type a;
inverse_lazy_impl(A const & a_):a (a_) {
if (a.dim0() != a.dim1()) TRIQS_RUNTIME_ERROR<< "Inverse : matrix is not square but of size "<< a.dim0()<<" x "<< a.dim1();
}
domain_type domain() const { return a.domain(); }
size_t dim0() const { return a.dim0();}
size_t dim1() const { return a.dim1();}
template<typename K0, typename K1> value_type operator() (K0 const & k0, K1 const & k1) const { activate(); return _id->M(k0,k1); }
friend std::ostream & operator<<(std::ostream & out,inverse_lazy_impl const&x){return out<<"inverse("<<x.a<<")";}
protected:
struct internal_data { // implementing the pattern LazyPreCompute
//typedef typename A_type::regular_type M_type;
typedef matrix<value_type> M_type;
typedef matrix_view<value_type> M_view_type;
M_type M;
internal_data(inverse_lazy_impl const & P):M(P.a){det_and_inverse_worker<M_view_type> worker(M); worker.inverse();}
};
friend struct internal_data;
mutable std::shared_ptr<internal_data> _id;
void activate() const { if (!_id) _id= std::make_shared<internal_data>(*this);}
};
// The general case
template<typename A>
struct inverse_lazy<A,typename boost::disable_if< is_matrix_or_view<A> >::type > : inverse_lazy_impl<A> {
inverse_lazy(A const & a):inverse_lazy_impl<A>(a) { }
};
// for matrix and matrix_views, we have more optimisation possible ....
template<typename A>
struct inverse_lazy<A,typename boost::enable_if< is_matrix_or_view<A> >::type >:inverse_lazy_impl<A>{
inverse_lazy(A const & a):inverse_lazy_impl<A>(a) { }
template<typename MT> // Optimized implementation of =
friend void triqs_arrays_assign_delegation (MT & lhs, inverse_lazy const & rhs) {
static_assert(is_matrix_or_view<MT>::value, "Internal error");
if ((lhs.indexmap().memory_indices_layout() !=rhs.a.indexmap().memory_indices_layout())||
(lhs.data_start() != rhs.a.data_start()) || !(has_contiguous_data(lhs))) { rhs.activate(); lhs = rhs._id->M;}
else {// if M = inverse(M) with the SAME object, then we do not need to copy the data
blas_lapack_tools::reflexive_qcache<MT> C(lhs);// a reflexive cache will use a temporary "regrouping" copy if and only if needed
det_and_inverse_worker<typename MT::view_type> W(C());// the worker to make the inversion of the lhs...
W.inverse(); // worker is working ...
}
}
friend std::ostream & operator<<(std::ostream & out,inverse_lazy const&x){return out<<"inverse("<<x.a<<")";}
};
//------------------- det ----------------------------------------
template<typename A> struct determinant_lazy { // : { Tag::expression_terminal, Tag::scalar_expression_terminal {
typedef typename A::value_type value_type;
typedef typename const_view_type_if_exists_else_type<A>::type A_type;
A_type a;
determinant_lazy(A const & a_):a(a_){}
operator value_type() { activate(); return _id->det; }
value_type const & operator()() { activate(); return _id->det; }
friend std::ostream & operator<<(std::ostream & out, determinant_lazy const & x){ return out<<"determinant("<<x.a<<")";}
protected:
struct internal_data {
typedef typename A_type::regular_type M_type;
M_type M; typename A::value_type det;
internal_data(determinant_lazy const & P):M(P.a){det_and_inverse_worker<A_type> worker(M); det = worker.det();}
};
friend struct internal_data;
mutable std::shared_ptr<internal_data> _id;
void activate() const { if (!_id) _id= std::make_shared<internal_data>(*this);}
};
}} // namespace triqs::arrays
#endif

2
triqs/arrays/matrix_stack_view.hpp
View File

@ -23,7 +23,7 @@
#include "./array.hpp"
#include "./matrix.hpp"
#include "./matrix_view_proxy.hpp"
#include <triqs/arrays/linalg/inverse.hpp>
#include <triqs/arrays/linalg/det_and_inverse.hpp>
namespace triqs { namespace arrays {

3
triqs/det_manip/det_manip.hpp
View File

@ -26,8 +26,7 @@
#include <triqs/arrays.hpp>
//#include <triqs/arrays/mapped_functions.hpp>
#include <triqs/arrays/algorithms.hpp>
#include <triqs/arrays/linalg/inverse.hpp>
#include <triqs/arrays/linalg/determinant.hpp>
#include <triqs/arrays/linalg/det_and_inverse.hpp>
#include <triqs/arrays/linalg/a_x_ty.hpp>
#include <triqs/arrays/linalg/matmul.hpp>
#include <triqs/arrays/linalg/mat_vec_mul.hpp>

2
triqs/lattice/bravais_lattice_and_brillouin_zone.cpp
View File

@ -20,7 +20,7 @@
******************************************************************************/
#include "bravais_lattice_and_brillouin_zone.hpp"
#include <triqs/arrays/blas_lapack/dot.hpp>
#include <triqs/arrays/linalg/inverse.hpp>
#include <triqs/arrays/linalg/det_and_inverse.hpp>
#include <triqs/arrays/linalg/cross_product.hpp>
namespace triqs { namespace lattice_tools {