From 9bae50f700dbea9ddf4cd932cdc905785dbeb890 Mon Sep 17 00:00:00 2001 From: wernsaar Date: Sun, 11 May 2014 09:30:18 +0200 Subject: [PATCH] checked, that zscal and zswap are OK --- interface/zscal.c | 6 +++--- interface/zswap.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/interface/zscal.c b/interface/zscal.c index 5c894d778..ad99874dc 100644 --- a/interface/zscal.c +++ b/interface/zscal.c @@ -68,7 +68,7 @@ void CNAME(blasint n, FLOAT alpha_r, FLOAT *x, blasint incx){ #endif #endif -#ifdef SMPTEST +#ifdef SMP int mode; int nthreads; #endif @@ -87,7 +87,7 @@ void CNAME(blasint n, FLOAT alpha_r, FLOAT *x, blasint incx){ FUNCTION_PROFILE_START(); -#ifdef SMPTEST +#ifdef SMP nthreads = num_cpu_avail(1); if (nthreads == 1) { @@ -95,7 +95,7 @@ void CNAME(blasint n, FLOAT alpha_r, FLOAT *x, blasint incx){ SCAL_K(n, 0, 0, alpha[0], alpha[1], x, incx, NULL, 0, NULL, 0); -#ifdef SMPTEST +#ifdef SMP } else { #ifdef DOUBLE mode = BLAS_DOUBLE | BLAS_COMPLEX; diff --git a/interface/zswap.c b/interface/zswap.c index ef35f107f..06a889204 100644 --- a/interface/zswap.c +++ b/interface/zswap.c @@ -56,7 +56,7 @@ void CNAME(blasint n, FLOAT *x, blasint incx, FLOAT *y, blasint incy){ #endif -#ifdef SMPTEST +#ifdef SMP int mode; FLOAT dummyalpha[2] = {ZERO, ZERO}; int nthreads; @@ -77,7 +77,7 @@ void CNAME(blasint n, FLOAT *x, blasint incx, FLOAT *y, blasint incy){ if (incx < 0) x -= (n - 1) * incx * 2; if (incy < 0) y -= (n - 1) * incy * 2; -#ifdef SMPTEST +#ifdef SMP nthreads = num_cpu_avail(1); //disable multi-thread when incx==0 or incy==0 @@ -90,7 +90,7 @@ void CNAME(blasint n, FLOAT *x, blasint incx, FLOAT *y, blasint incy){ SWAP_K(n, 0, 0, ZERO, ZERO, x, incx, y, incy, NULL, 0); -#ifdef SMPTEST +#ifdef SMP } else { #ifdef XDOUBLE