[vsipl++] patch: fix merge conflicts

[Jules Bergmann]

Stefan Seefeld wrote:
> The attached patch fixes some conflicts seemingly introduced by two overlapping
> patches / commits last week.
> 
> (Assem: please be careful when applying 'svn resolved'. There were some artifacts
> (such as "<<<< .mine") as well as conflicting code checked in with the last commit.)
> 
> The new Create_plan harness uses Stride_unit_align everywhere (there was one place
> with Stride_unit_dense, that looked like a typo). I'm not sure this is required,
> as we only stipulate aligned input for 1D FFTs. Thus, the current code may require
> the data to be copied without need.
> Should I instead add an overload for Create_plan::create() for 1D FFTs and relax
> the alignment for non-1D cases to Stride_unit_dense ?

Stefan,

Thanks for fixing this.

Do you consider FFTM to be 1D or non-1D?

The reason I ask is ...

We implement FFTM by planning for a single 1D FFT (we do this, rather 
than planning for multiple 1D FFTs, because distributed data may cause 
the local multiple count to be different from the global multiple count).

Ideally this single 1D FFT should be planned for aligned data.

We can relax that when the FFT size is not a multiple of the alignment. 
  I.e. if we're doing multiple 257-point FFTs, we can plan for unaligned 
data.

Does that sound reasonable?

				-- Jules

-- 
Jules Bergmann
CodeSourcery
jules at codesourcery.com
(650) 331-3385 x705