[clfft] 35/128: fixing INPLACE addition framework code, gen work to follow next

[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 15be25dd11f5045ff403ec4fe05b9db7fea53631
Author: bragadeesh <bragadeesh.natarajan at amd>
Date:   Fri Aug 21 11:52:33 2015 -0500

    fixing INPLACE addition framework code, gen work to follow next
---
 src/library/plan.cpp | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/library/plan.cpp b/src/library/plan.cpp
index 084cf72..390049d 100644
--- a/src/library/plan.cpp
+++ b/src/library/plan.cpp
@@ -648,7 +648,7 @@ clfftStatus	clfftBakePlan( clfftPlanHandle plHandle, cl_uint numQueues, cl_comma
 					trans1Plan->outStride[1]  = clLengths[1] + padding;
 					trans1Plan->iDist         = fftPlan->iDist;
 					trans1Plan->oDist         = clLengths[0] * trans1Plan->outStride[1];
-					trans1Plan->gen           = Transpose_GCN;
+					trans1Plan->gen           = Transpose_INPLACE;
 					trans1Plan->transflag     = true;
 
 					OPENCL_V(clfftBakePlan(fftPlan->planTX, numQueues, commQueueFFT, NULL, NULL ),
@@ -714,7 +714,7 @@ clfftStatus	clfftBakePlan( clfftPlanHandle plHandle, cl_uint numQueues, cl_comma
 					trans2Plan->outStride[1]  = clLengths[0] + padding;
 					trans2Plan->iDist         = fftPlan->oDist;
 					trans2Plan->oDist         = clLengths[1] * trans2Plan->outStride[1];
-                    trans2Plan->gen           = Transpose_GCN;
+                    trans2Plan->gen           = Transpose_INPLACE;
 					trans2Plan->large1D			= fftPlan->length[0];
 					trans2Plan->transflag     = true;
 
@@ -778,7 +778,7 @@ clfftStatus	clfftBakePlan( clfftPlanHandle plHandle, cl_uint numQueues, cl_comma
 					trans3Plan->outStride[1]  = clLengths[1];
 					trans3Plan->iDist         = clLengths[1] * trans3Plan->inStride[1];
 					trans3Plan->oDist         = fftPlan->oDist;
-                    trans3Plan->gen           = Transpose_GCN;
+                    trans3Plan->gen           = Transpose_INPLACE;
 					trans3Plan->transflag     = true;
 					trans3Plan->transOutHorizontal = true;
 
@@ -1754,6 +1754,8 @@ clfftStatus	clfftBakePlan( clfftPlanHandle plHandle, cl_uint numQueues, cl_comma
                 clfftStatus err;
 				if(fftPlan->gen == Transpose_GCN)
 					fftPlan->action = new FFTGeneratedTransposeGCNAction(plHandle, fftPlan, *commQueueFFT, err);
+				else if(fftPlan->gen == Transpose_INPLACE)
+					fftPlan->action = new FFTGeneratedTransposeInplaceAction(plHandle, fftPlan, *commQueueFFT, err);
 				else
 					fftPlan->action = new FFTGeneratedTransposeVLIWAction(plHandle, fftPlan, *commQueueFFT, err);
                 OPENCL_V( err, "FFTGeneratedTransposeVLIWAction failed");
@@ -3966,9 +3968,10 @@ clfftStatus FFTPlan::GetMax1DLength (size_t *longest ) const
 	{
 	case Stockham:		return GetMax1DLengthStockham(longest);
 	//No restriction for Transpose_VLIW kernel
-	case Transpose_VLIW:     *longest = 4096; return CLFFT_SUCCESS;
-    case Transpose_GCN:     *longest = 4096; return CLFFT_SUCCESS;
-    case Copy:			*longest = 4096; return CLFFT_SUCCESS;
+	case Transpose_VLIW:		*longest = 4096; return CLFFT_SUCCESS;
+    case Transpose_GCN:			*longest = 4096; return CLFFT_SUCCESS;
+    case Transpose_INPLACE:     *longest = 4096; return CLFFT_SUCCESS;
+    case Copy:					*longest = 4096; return CLFFT_SUCCESS;
 	default:			assert(false); return CLFFT_NOTIMPLEMENTED;
 	}
 }

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