*** empty log message ***
This commit is contained in:
parent
ea67e3065d
commit
ae79286413
32
mat.cc
32
mat.cc
@ -779,6 +779,7 @@ void NRMat< complex<double> >::diagmultr(const NRVec< complex<double> > &rhs)
|
||||
|
||||
|
||||
|
||||
#ifdef oldversion
|
||||
// Mat * Smat, decomposed to nn x Vec * Smat
|
||||
template<>
|
||||
const NRMat<double>
|
||||
@ -810,6 +811,37 @@ NRMat< complex<double> >::operator*(const NRSMat< complex<double> > &rhs) const
|
||||
return result;
|
||||
}
|
||||
|
||||
#else
|
||||
|
||||
// Mat * Smat
|
||||
template<>
|
||||
const NRMat<double>
|
||||
NRMat<double>::operator*(const NRSMat<double> &rhs) const
|
||||
{
|
||||
#ifdef DEBUG
|
||||
if (mm != rhs.nrows()) laerror("incompatible dimension in Mat*SMat");
|
||||
#endif
|
||||
NRMat<double> result(nn, rhs.ncols());
|
||||
cblas_dsymm(CblasRowMajor, CblasRight, CblasLower, nn, mm, 1., &rhs[0],mm,(*this)[0],mm,0.,result[0],mm);
|
||||
return result;
|
||||
}
|
||||
|
||||
template<>
|
||||
const NRMat< complex<double> >
|
||||
NRMat< complex<double> >::operator*(const NRSMat< complex<double> > &rhs) const
|
||||
{
|
||||
#ifdef DEBUG
|
||||
if (mm != rhs.nrows()) laerror("incompatible dimension in Mat*SMat");
|
||||
#endif
|
||||
NRMat< complex<double> > result(nn, rhs.ncols());
|
||||
cblas_zhemm(CblasRowMajor, CblasRight, CblasLower, nn, mm, (void *)&CONE, &rhs[0],mm,(*this)[0],mm,(void *)&CZERO,result[0],mm);
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
// sum of rows
|
||||
template<>
|
||||
|
31
smat.cc
31
smat.cc
@ -148,6 +148,7 @@ void NRSMat<T>::fscanf(FILE *f, const char *format)
|
||||
* BLAS specializations for double and complex<double>
|
||||
*/
|
||||
|
||||
#ifdef oldversion
|
||||
// SMat * Mat
|
||||
template<>
|
||||
const NRMat<double> NRSMat<double>::operator*(const NRMat<double> &rhs) const
|
||||
@ -177,6 +178,36 @@ NRSMat< complex<double> >::operator*(const NRMat< complex<double> > &rhs) const
|
||||
return result;
|
||||
}
|
||||
|
||||
#else
|
||||
|
||||
// SMat * Mat
|
||||
template<>
|
||||
const NRMat<double> NRSMat<double>::operator*(const NRMat<double> &rhs) const
|
||||
{
|
||||
#ifdef DEBUG
|
||||
if (nn != rhs.nrows()) laerror("incompatible dimensions in SMat*Mat");
|
||||
#endif
|
||||
NRMat<double> result(nn, rhs.ncols());
|
||||
cblas_dsymm(CblasRowMajor, CblasLeft, CblasLower, nn, rhs.ncols(), 1., (*this),nn, rhs[0],rhs.ncols(), 0.,result[0],rhs.ncols());
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
template<>
|
||||
const NRMat< complex<double> >
|
||||
NRSMat< complex<double> >::operator*(const NRMat< complex<double> > &rhs) const
|
||||
{
|
||||
#ifdef DEBUG
|
||||
if (nn != rhs.nrows()) laerror("incompatible dimensions in SMat*Mat");
|
||||
#endif
|
||||
NRMat< complex<double> > result(nn, rhs.ncols());
|
||||
cblas_zhemm(CblasRowMajor, CblasLeft, CblasLower, nn, rhs.ncols(), &CONE, (*this),nn, rhs[0],rhs.ncols(), &CZERO,result[0],rhs.ncols());
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
// SMat * SMat
|
||||
template<>
|
||||
|
Loading…
Reference in New Issue
Block a user