[clfft] 44/74: fixing the bug that caused hangs/crashes with incorrect use of inplace transposes in 3d plans

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch debian/sid
in repository clfft.

commit 7b0103f91c7650915cedc827d067b32bd8ea5d23
Author: bragadeesh <bragadeesh.natarajan at amd>
Date:   Tue Dec 15 17:59:57 2015 -0800

    fixing the bug that caused hangs/crashes with incorrect use of inplace transposes in 3d plans
---
 src/library/plan.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/library/plan.cpp b/src/library/plan.cpp
index 9b5f6c4..309df31 100644
--- a/src/library/plan.cpp
+++ b/src/library/plan.cpp
@@ -541,7 +541,7 @@ clfftStatus	clfftBakePlan( clfftPlanHandle plHandle, cl_uint numQueues, cl_comma
 					}
 					else
 					{
-						if( clfftGetRequestLibNoMemAlloc() )
+						if( clfftGetRequestLibNoMemAlloc() && !rc && (fftPlan->placeness == CLFFT_INPLACE) )
 						{
 							in_x = BitScanF(fftPlan->length[0]);
 							in_x /= 2;
@@ -620,7 +620,7 @@ clfftStatus	clfftBakePlan( clfftPlanHandle plHandle, cl_uint numQueues, cl_comma
 
 					if ( IsPo2(fftPlan->length[0]) &&
 						 (fftPlan->length[0] <= 262144/PrecisionWidth(fftPlan->precision)) &&
-						 (!clfftGetRequestLibNoMemAlloc()) ) break;
+						 (!clfftGetRequestLibNoMemAlloc() || (fftPlan->placeness == CLFFT_OUTOFPLACE)) ) break;
 
 					if ( clLengths[0]<=32 && clLengths[1]<=32) break;
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/clfft.git