[clfft] 94/107: fixing more issues

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to branch master
in repository clfft.

commit 3c4ebf6db176f85069dc76e7832eefcdb7456e60
Author: bragadeesh <bragadeesh.natarajan at amd>
Date:   Mon Jun 22 14:49:54 2015 -0500

    fixing more issues
---
 src/library/generator.stockham.cpp | 9 +++++++--
 src/library/plan.cpp               | 9 ++++++---
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/library/generator.stockham.cpp b/src/library/generator.stockham.cpp
index 3229e98..b14ca8c 100644
--- a/src/library/generator.stockham.cpp
+++ b/src/library/generator.stockham.cpp
@@ -2891,6 +2891,11 @@ namespace StockhamGenerator
 					}
 
 					str += SztToStr(params.fft_N[1]); str += ";\n\n";
+
+					if(params.fft_realSpecial)
+					{
+						str += "\tuint bt = b;\n\n";
+					}
 				}
 				else
 				{
@@ -3212,11 +3217,11 @@ namespace StockhamGenerator
 				if(realSpecial)
 				{
 					size_t Nt = 1 + length/2;
-					str += 	"\n\t\tif( (batch == 0) || (2*batch == ";
+					str += 	"\n\t\tif( (bt == 0) || (2*bt == ";
 					str += SztToStr(params.fft_realSpecial_Nr); str += ") ) break;\n";
 
 					str += "\t\tlwbOut += ("; str += SztToStr(params.fft_realSpecial_Nr);
-					str += " - 2*batch)*"; str += SztToStr(Nt); str += ";\n";
+					str += " - 2*bt)*"; str += SztToStr(Nt); str += ";\n";
 					str += "\t\tb = "; str += SztToStr(params.fft_realSpecial_Nr);
 					str += " - b;\n\n";
 				}
diff --git a/src/library/plan.cpp b/src/library/plan.cpp
index 013ade0..62004e4 100644
--- a/src/library/plan.cpp
+++ b/src/library/plan.cpp
@@ -818,7 +818,7 @@ clfftStatus	clfftBakePlan( clfftPlanHandle plHandle, cl_uint numQueues, cl_comma
 
 						for (size_t index=1; index < fftPlan->length.size(); index++)
 						{
-							fftPlan->tmpBufSizeRC *= fftPlan->length[index];
+							fftPlan->tmpBufSize *= fftPlan->length[index];
 						}
 					}
 
@@ -886,7 +886,7 @@ clfftStatus	clfftBakePlan( clfftPlanHandle plHandle, cl_uint numQueues, cl_comma
 					row1Plan->inStride.push_back(clLengths[1]+padding);
 					row1Plan->outStride.push_back(1 + clLengths[1]/2);
 					row1Plan->iDist         = clLengths[0] * row1Plan->inStride[1];
-					row1Plan->oDist         = clLengths[0] * row1Plan->outStride[1]; // tmp buf distance fix
+					row1Plan->oDist         = clLengths[0] * row1Plan->outStride[1]; 
 
 
 					OPENCL_V(clfftBakePlan(fftPlan->planX, numQueues, commQueueFFT, NULL, NULL ),
@@ -924,7 +924,7 @@ clfftStatus	clfftBakePlan( clfftPlanHandle plHandle, cl_uint numQueues, cl_comma
 					trans2Plan->outStride[0]  = 1;
 					trans2Plan->outStride[1]  = clLengths[0];
 					trans2Plan->iDist         = clLengths[0] * trans2Plan->inStride[1];
-					trans2Plan->oDist         = fftPlan->oDist;
+					trans2Plan->oDist         = (1 + clLengths[1]/2) * trans2Plan->outStride[1];
                     trans2Plan->gen           = Transpose_GCN;
 					trans2Plan->transflag     = true;
 					trans2Plan->transOutHorizontal = true;
@@ -963,6 +963,9 @@ clfftStatus	clfftBakePlan( clfftPlanHandle plHandle, cl_uint numQueues, cl_comma
 					row2Plan->iDist         = (1 + clLengths[1]/2) * row2Plan->inStride[1];
 					row2Plan->oDist         = clLengths[1] * row2Plan->outStride[1];
 
+					row2Plan->large1D		= fftPlan->length[0];
+					row2Plan->twiddleFront  = true;
+
 					row2Plan->realSpecial = true;
 					row2Plan->realSpecial_Nr = clLengths[1];
 

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