[clfft] 27/74: Merge remote-tracking branch 'upstream/develop' into develop

[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 d257f651934a24ece4ab44c0095001eeafdfbf2a
Merge: 141d644 e201a7f
Author: santanu-thangaraj <t.santanu at gmail.com>
Date:   Thu Dec 3 11:25:48 2015 +0530

    Merge remote-tracking branch 'upstream/develop' into develop
    
    Conflicts:
    	src/library/plan.cpp

 src/library/CMakeLists.txt               |  55 +-
 src/library/action.cpp                   |  12 -
 src/library/action.h                     |  55 --
 src/library/generator.h                  |   1 -
 src/library/generator.transpose.vliw.cpp | 906 -------------------------------
 src/library/generator.transpose.vliw.h   |  25 -
 src/library/plan.cpp                     |  47 +-
 src/library/transform.cpp                |   3 +-
 8 files changed, 38 insertions(+), 1066 deletions(-)

diff --cc src/library/generator.h
index 43522b4,b90090c..fbf5cce
--- a/src/library/generator.h
+++ b/src/library/generator.h
@@@ -23,10 -23,8 +23,9 @@@
  enum clfftGenerators
  {
      Stockham, // Using the Stockham autosort frameworks
-     Transpose_VLIW,
      Transpose_GCN,
      Transpose_SQUARE,
 +    Transpose_NONSQUARE,
      Copy,
      ENDGENERATORS			///< This value will always be last, and marks the length of clfftGenerators
  };
diff --cc src/library/plan.cpp
index bbe32d0,a5c605e..b4ee1ae
--- a/src/library/plan.cpp
+++ b/src/library/plan.cpp
@@@ -237,12 -237,10 +237,13 @@@ std::string getKernelName(const clfftGe
  
      switch( gen )
      {
 -    case Stockham:			generatorName = "Stockham"; break;
 -	case Transpose_GCN:		generatorName = "Transpose"; break;
 -	case Transpose_SQUARE:	generatorName = "Transpose"; break;
 -	case Copy:				generatorName = "Copy"; break;
++
 +    case Stockham:			    generatorName = "Stockham"; break;
 +	case Transpose_GCN:		    generatorName = "Transpose"; break;
 +	case Transpose_SQUARE:	    generatorName = "Transpose"; break;
 +    case Transpose_NONSQUARE:	generatorName = "TransposeNonSquare"; break;
-     case Transpose_VLIW:	    generatorName = "Transpose"; break;
 +	case Copy:				    generatorName = "Copy"; break;
++
      }
  
      kernelPath << kernelPrefix << generatorName ;
@@@ -1878,43 -1869,12 +1873,44 @@@ clfftStatus	clfftBakePlan( clfftPlanHan
                  clfftStatus err;
  				if(fftPlan->gen == Transpose_GCN)
  					fftPlan->action = new FFTGeneratedTransposeGCNAction(plHandle, fftPlan, *commQueueFFT, err);
 -				else if(fftPlan->gen == Transpose_SQUARE)
 -					fftPlan->action = new FFTGeneratedTransposeSquareAction(plHandle, fftPlan, *commQueueFFT, err);
 +                else if (fftPlan->gen == Transpose_SQUARE)
 +                {
 +                    static int test_performed = 0;
 +                    size_t backup_0 = fftPlan->length[0];
 +                    size_t backup_1 = fftPlan->length[1];
 +                    
 +                    clfftLayout  inputLayout_bckup = fftPlan->inputLayout;
 +                    clfftLayout  outputLayout_bckup = fftPlan->outputLayout;
 +                    clfftPrecision precision_bckup = fftPlan->precision;
 +
 +                    if (!test_performed)
 +                    {
 +                        //CLFFT_COMPLEX_PLANAR
 +                        fftPlan->inputLayout = CLFFT_REAL;
 +                        fftPlan->outputLayout = CLFFT_REAL;
 +                        if(fftPlan->inputLayout == CLFFT_REAL)
 +                            test_performed = 1;
 +                       // fftPlan->nonSquareKernelType = NON_SQUARE_SWAP;
 +                        fftPlan->precision = CLFFT_DOUBLE;
 +                        fftPlan->length[1] = 2048;// fftPlan->length[1];
 +                        fftPlan->length[0] = fftPlan->length[1] * 2;
 +                        fftPlan->action = new FFTGeneratedTransposeNonSquareAction(plHandle, fftPlan, *commQueueFFT, err);
 +                        OPENCL_V(err, "FFTGeneratedTransposeNonSquareAction() failed");
 +
 +                    }
 +
 +                    fftPlan->precision = precision_bckup;
 +                    fftPlan->inputLayout = inputLayout_bckup;
 +                    fftPlan->outputLayout = outputLayout_bckup;
 +                    fftPlan->length[0] = backup_0;
 +                    fftPlan->length[1] = backup_1;
 +
 +                    fftPlan->action = new FFTGeneratedTransposeSquareAction(plHandle, fftPlan, *commQueueFFT, err);
 +                }
  				else
- 					fftPlan->action = new FFTGeneratedTransposeVLIWAction(plHandle, fftPlan, *commQueueFFT, err);
-                 OPENCL_V( err, "FFTGeneratedTransposeVLIWAction failed");
+ 					fftPlan->action = new FFTGeneratedTransposeGCNAction(plHandle, fftPlan, *commQueueFFT, err);
+ 
+                 OPENCL_V( err, "FFTGeneratedTransposeXXXAction failed");
  
  				fftPlan->baked		= true;
  				return	CLFFT_SUCCESS;

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