aboutsummaryrefslogtreecommitdiffhomepage
path: root/blas
diff options
context:
space:
mode:
authorGravatar Chen-Pang He <jdh8@ms63.hinet.net>2012-09-07 15:21:57 +0800
committerGravatar Chen-Pang He <jdh8@ms63.hinet.net>2012-09-07 15:21:57 +0800
commit145f89cd5f8872bfe8bceae127a2421576767e08 (patch)
tree3cd2f3ac2aa1412b9a9ebafe3248a4884f8c0c89 /blas
parentc86d047c2f83d335d2d126079d53d6925db01740 (diff)
Fix memory leak in DSDOT.
Diffstat (limited to 'blas')
-rw-r--r--blas/double.cpp7
-rw-r--r--blas/single.cpp18
2 files changed, 14 insertions, 11 deletions
diff --git a/blas/double.cpp b/blas/double.cpp
index 9b53be484..8a3b00175 100644
--- a/blas/double.cpp
+++ b/blas/double.cpp
@@ -31,8 +31,13 @@ double* cast_vector_to_double(float* x, int n, int incx)
double BLASFUNC(dsdot)(int* n, float* px, int* incx, float* py, int* incy)
{
if(*n <= 0) return 0;
+
double* x = cast_vector_to_double(px, *n, *incx);
double* y = cast_vector_to_double(py, *n, *incy);
- return vector(x,*n).cwiseProduct(vector(y,*n)).sum();
+ double res = vector(x,*n).cwiseProduct(vector(y,*n)).sum();
+
+ delete[] x;
+ delete[] y;
+ return res;
}
diff --git a/blas/single.cpp b/blas/single.cpp
index d549a906e..9516398ba 100644
--- a/blas/single.cpp
+++ b/blas/single.cpp
@@ -19,18 +19,16 @@
#include "level2_real_impl.h"
#include "level3_impl.h"
-float BLASFUNC(sdsdot)(int* n, float* alpha, float* px, int* incx, float* py, int* incy)
+float BLASFUNC(sdsdot)(int* n, float* alpha, float* x, int* incx, float* y, int* incy)
{
- float* x = reinterpret_cast<float*>(px);
- float* y = reinterpret_cast<float*>(py);
- float ret = *alpha;
+ float res = *alpha;
if(*n>0) {
- if(*incx==1 && *incy==1) ret += (vector(x,*n).cwiseProduct(vector(y,*n))).sum();
- else if(*incx>0 && *incy>0) ret += (vector(x,*n,*incx).cwiseProduct(vector(y,*n,*incy))).sum();
- else if(*incx<0 && *incy>0) ret += (vector(x,*n,-*incx).reverse().cwiseProduct(vector(y,*n,*incy))).sum();
- else if(*incx>0 && *incy<0) ret += (vector(x,*n,*incx).cwiseProduct(vector(y,*n,-*incy).reverse())).sum();
- else if(*incx<0 && *incy<0) ret += (vector(x,*n,-*incx).reverse().cwiseProduct(vector(y,*n,-*incy).reverse())).sum();
+ if(*incx==1 && *incy==1) res += (vector(x,*n).cwiseProduct(vector(y,*n))).sum();
+ else if(*incx>0 && *incy>0) res += (vector(x,*n,*incx).cwiseProduct(vector(y,*n,*incy))).sum();
+ else if(*incx<0 && *incy>0) res += (vector(x,*n,-*incx).reverse().cwiseProduct(vector(y,*n,*incy))).sum();
+ else if(*incx>0 && *incy<0) res += (vector(x,*n,*incx).cwiseProduct(vector(y,*n,-*incy).reverse())).sum();
+ else if(*incx<0 && *incy<0) res += (vector(x,*n,-*incx).reverse().cwiseProduct(vector(y,*n,-*incy).reverse())).sum();
}
- return ret;
+ return res;
}