*** empty log message ***

This commit is contained in:
jiri
2010-09-08 13:30:20 +00:00
parent 074c943862
commit 1b85da3291
10 changed files with 49 additions and 19 deletions

11
mat.cc
View File

@@ -355,24 +355,29 @@ NRMat<T> & NRMat<T>::operator-=(const T &a)
return *this;
}
template <>
const NRMat<double> NRMat<double>::operator-() const
{
NRMat<double> result(nn, mm);
#ifdef CUDALA
NRMat<double> result(nn, mm, location);
if(location==cpu)
{
#else
NRMat<double> result(nn, mm);
#endif
#ifdef MATPTR
for (int i=0; i<nn*mm; i++) result.v[0][i]= -v[0][i];
#else
cblas_dscal(nn*mm, -1., v, 1);
memcpy(result.v,v,nn*mm*sizeof(double));
cblas_dscal(nn*mm, -1., result.v, 1);
#endif
#ifdef CUDALA
}
else
{
cublasDscal(nn*mm, -1., v, 1);
cublasDcopy(nn*mm, v, 1, result.v, 1);
cublasDscal(nn*mm, -1., result.v, 1);
}
#endif
return result;